summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/source/abl-show.cc19
-rw-r--r--crawl-ref/source/chardump.cc6
-rw-r--r--crawl-ref/source/clua.cc4
-rw-r--r--crawl-ref/source/enum.h3
-rw-r--r--crawl-ref/source/fight.cc21
-rw-r--r--crawl-ref/source/item_use.cc2
-rw-r--r--crawl-ref/source/items.cc20
-rw-r--r--crawl-ref/source/misc.cc12
-rw-r--r--crawl-ref/source/output.cc6
-rw-r--r--crawl-ref/source/player.cc99
-rw-r--r--crawl-ref/source/spells4.cc2
-rw-r--r--crawl-ref/source/spl-mis.cc5
-rw-r--r--crawl-ref/source/transfor.cc58
-rw-r--r--crawl-ref/source/transfor.h2
-rw-r--r--crawl-ref/source/traps.cc6
-rw-r--r--crawl-ref/source/xom.cc5
16 files changed, 18 insertions, 252 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 86f4050413..c847f74068 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -298,7 +298,6 @@ static const ability_def Ability_List[] =
// These six are unused "evil" god abilities:
{ ABIL_CHARM_SNAKE, "Charm Snake", 6, 0, 200, 5, ABFLAG_NONE },
- { ABIL_TRAN_SERPENT_OF_HELL, "Turn into Demonic Serpent", 16, 0, 600, 8, ABFLAG_NONE },
{ ABIL_BREATHE_HELLFIRE, "Breathe Hellfire", 0, 8, 200, 0, ABFLAG_BREATH },
{ ABIL_ROTTING, "Rotting", 4, 4, 0, 2, ABFLAG_NONE },
@@ -760,11 +759,6 @@ static talent _get_talent(ability_type ability, bool check_confused)
failure = 40 - (you.piety / 20) - (3 * you.skills[SK_INVOCATIONS]);
break;
- case ABIL_TRAN_SERPENT_OF_HELL:
- invoc = true;
- failure = 80 - (you.piety / 25) - (you.skills[SK_INVOCATIONS] * 4);
- break;
-
case ABIL_ROTTING:
invoc = true;
failure = 60 - (you.piety / 20) - (5 * you.skills[SK_INVOCATIONS]);
@@ -1886,13 +1880,6 @@ static bool _do_ability(const ability_def& abil)
exercise(SK_INVOCATIONS, 2 + random2(4));
break;
- case ABIL_TRAN_SERPENT_OF_HELL:
- transform(10 + (you.experience_level * 2) +
- (you.skills[SK_INVOCATIONS] * 3), TRAN_SERPENT_OF_HELL);
-
- exercise(SK_INVOCATIONS, 6 + random2(9));
- break;
-
case ABIL_BREATHE_HELLFIRE:
if (you.duration[DUR_BREATH_WEAPON])
{
@@ -2247,10 +2234,8 @@ std::vector<talent> your_talents( bool check_confused )
//jmf: Check for breath weapons -- they're exclusive of each other, I hope!
// Make better come ones first.
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_SERPENT_OF_HELL)
- _add_talent(talents, ABIL_BREATHE_HELLFIRE, check_confused );
- else if (you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
- || player_mutation_level(MUT_BREATHE_FLAMES))
+ if (you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
+ || player_mutation_level(MUT_BREATHE_FLAMES))
{
_add_talent(talents, ABIL_BREATHE_FIRE, check_confused );
}
diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc
index 0eeacc8e8d..06881f394a 100644
--- a/crawl-ref/source/chardump.cc
+++ b/crawl-ref/source/chardump.cc
@@ -251,12 +251,6 @@ static void _sdump_transform(dump_params &par)
case TRAN_LICH:
text += "You " + verb + " in lich-form.";
break;
- case TRAN_SERPENT_OF_HELL:
- text += "You " + verb + " a huge, demonic serpent!";
- break;
- case TRAN_AIR:
- text += "You " + verb + " a cloud of diffuse gas.";
- break;
}
text += "\n\n";
diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc
index f3acf7d44f..de1f5cb040 100644
--- a/crawl-ref/source/clua.cc
+++ b/crawl-ref/source/clua.cc
@@ -752,10 +752,6 @@ static const char *transform_name()
return "dragon";
case TRAN_LICH:
return "lich";
- case TRAN_SERPENT_OF_HELL:
- return "serpent";
- case TRAN_AIR:
- return "air";
default:
return "";
}
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 1613a6f968..9a43428ade 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -104,11 +104,10 @@ enum ability_type
ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS,
ABIL_CHARM_SNAKE, // 237
- ABIL_TRAN_SERPENT_OF_HELL,
ABIL_ROTTING,
ABIL_TORMENT_II,
ABIL_TRAN_BAT,
- ABIL_HARM_PROTECTION,
+ ABIL_HARM_PROTECTION, // 240
ABIL_HARM_PROTECTION_II,
ABIL_RENOUNCE_RELIGION = 250 // 250
};
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index ff7975a267..7426654299 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1000,8 +1000,7 @@ bool melee_attack::player_aux_unarmed()
}
}
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_SERPENT_OF_HELL
- || you.attribute[ATTR_TRANSFORMATION] == TRAN_ICE_BEAST
+ if (you.attribute[ATTR_TRANSFORMATION] == TRAN_ICE_BEAST
|| you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
|| you.attribute[ATTR_TRANSFORMATION] == TRAN_SPIDER
|| you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
@@ -1036,8 +1035,7 @@ bool melee_attack::player_aux_unarmed()
}
}
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_SERPENT_OF_HELL
- || you.attribute[ATTR_TRANSFORMATION] == TRAN_SPIDER
+ if (you.attribute[ATTR_TRANSFORMATION] == TRAN_SPIDER
|| you.attribute[ATTR_TRANSFORMATION] == TRAN_ICE_BEAST
|| you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
|| you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
@@ -1118,8 +1116,7 @@ bool melee_attack::player_aux_unarmed()
if (uattack != UNAT_PUNCH)
continue;
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_SERPENT_OF_HELL
- || you.attribute[ATTR_TRANSFORMATION] == TRAN_SPIDER
+ if (you.attribute[ATTR_TRANSFORMATION] == TRAN_SPIDER
|| you.attribute[ATTR_TRANSFORMATION] == TRAN_ICE_BEAST
|| you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
|| you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
@@ -1718,7 +1715,6 @@ int melee_attack::player_weapon_type_modify(int damage)
attack_verb = "pummel";
break;
case TRAN_DRAGON:
- case TRAN_SERPENT_OF_HELL:
if (damage < HIT_MED)
attack_verb = "claw";
else if (damage < HIT_STRONG)
@@ -1730,9 +1726,6 @@ int melee_attack::player_weapon_type_modify(int damage)
attack_verb = "trample on";
}
break;
- case TRAN_AIR:
- attack_verb = "buffet";
- break;
} // transformations
return (damage);
@@ -3541,16 +3534,12 @@ int melee_attack::player_to_hit(bool random_factor)
case TRAN_STATUE:
your_to_hit += maybe_random2(9, random_factor);
break;
- case TRAN_SERPENT_OF_HELL:
case TRAN_DRAGON:
your_to_hit += maybe_random2(10, random_factor);
break;
case TRAN_LICH:
your_to_hit += maybe_random2(10, random_factor);
break;
- case TRAN_AIR:
- your_to_hit = 0;
- break;
case TRAN_NONE:
default:
break;
@@ -3742,16 +3731,12 @@ int melee_attack::player_calc_base_unarmed_damage()
case TRAN_STATUE:
damage = 12 + you.strength;
break;
- case TRAN_SERPENT_OF_HELL:
case TRAN_DRAGON:
damage = 20 + you.strength;
break;
case TRAN_LICH:
damage = 5;
break;
- case TRAN_AIR:
- damage = 0;
- break;
}
}
else if (you.equip[ EQ_GLOVES ] == -1)
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 41fdf840c1..aead71c75a 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1487,8 +1487,6 @@ static bool _fire_warn_if_impossible()
|| trans == TRAN_BLADE_HANDS
|| trans == TRAN_ICE_BEAST
|| trans == TRAN_DRAGON
- || trans == TRAN_SERPENT_OF_HELL
- || trans == TRAN_AIR
|| trans == TRAN_BAT)
{
canned_msg(MSG_PRESENT_FORM);
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 481952398f..32fd5bb188 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -1175,13 +1175,6 @@ std::string origin_desc(const item_def &item)
bool pickup_single_item(int link, int qty)
{
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR
- && you.duration[DUR_TRANSFORMATION] > 0)
- {
- mpr("You can't pick up anything in this form!");
- return (false);
- }
-
if (you.flight_mode() == FL_LEVITATE)
{
mpr("You can't reach the floor from up here.");
@@ -1217,13 +1210,6 @@ void pickup()
{
int keyin = 'x';
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR
- && you.duration[DUR_TRANSFORMATION] > 0)
- {
- mpr("You can't pick up anything in this form!");
- return;
- }
-
if (you.flight_mode() == FL_LEVITATE)
{
mpr("You can't reach the floor from up here.");
@@ -2358,12 +2344,6 @@ bool can_autopickup()
if (!Options.autopickup_on)
return (false);
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR
- && you.duration[DUR_TRANSFORMATION] > 0)
- {
- return (false);
- }
-
if (you.flight_mode() == FL_LEVITATE)
return (false);
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index b67114cf6d..21df67c186 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2974,7 +2974,6 @@ std::string your_hand(bool plural)
case TRAN_SPIDER:
result = "front leg";
break;
- case TRAN_SERPENT_OF_HELL:
case TRAN_DRAGON:
case TRAN_BAT:
result = "foreclaw";
@@ -2982,9 +2981,6 @@ std::string your_hand(bool plural)
case TRAN_BLADE_HANDS:
result = "scythe-like blade";
break;
- case TRAN_AIR:
- result = "misty tendril";
- break;
}
if (plural)
@@ -3084,11 +3080,9 @@ bool is_dragonkind(const actor *act)
}
if (act->atype() == ACT_PLAYER)
- {
- return (you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
- || you.attribute[ATTR_TRANSFORMATION] == TRAN_SERPENT_OF_HELL);
- }
- // else the actor is a monster
+ return (you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON);
+
+ // Else the actor is a monster.
const monsters* mon = dynamic_cast<const monsters*>(act);
if (mon->type == MONS_SERPENT_OF_HELL)
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index d80d3c4c96..04a17159f5 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -2482,12 +2482,6 @@ std::string _status_mut_abilities()
case TRAN_LICH:
text += "\nYou are in lich-form.";
break;
- case TRAN_SERPENT_OF_HELL:
- text += "\nYou are a huge demonic serpent.";
- break;
- case TRAN_AIR:
- text += "\nYou are a cloud of diffuse gas.";
- break;
}
if ((you.species != SP_VAMPIRE
|| you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT)
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 04bc706d77..eb90d61174 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -474,15 +474,11 @@ bool is_player_same_species(const int mon, bool transform)
{
switch (you.attribute[ATTR_TRANSFORMATION])
{
- case TRAN_AIR:
- return (false);
// Unique monsters.
case TRAN_BAT:
return (mon == MONS_GIANT_BAT);
case TRAN_ICE_BEAST:
return (mon == MONS_ICE_BEAST);
- case TRAN_SERPENT_OF_HELL:
- return (mon == MONS_SERPENT_OF_HELL);
// Compare with monster *species*.
case TRAN_LICH:
return (mons_species(mon) == MONS_LICH);
@@ -689,10 +685,6 @@ bool you_tran_can_wear(int eq, bool check_mutation)
const int transform = you.attribute[ATTR_TRANSFORMATION];
- // Clouds cannot wear anything.
- if (transform == TRAN_AIR)
- return (false);
-
// Everybody else can wear at least some type of armour.
if (eq == EQ_ALL_ARMOUR)
return (true);
@@ -725,11 +717,8 @@ bool you_tran_can_wear(int eq, bool check_mutation)
return (true);
// These cannot use anything but jewellery.
- if (transform == TRAN_SPIDER || transform == TRAN_DRAGON
- || transform == TRAN_SERPENT_OF_HELL)
- {
+ if (transform == TRAN_SPIDER || transform == TRAN_DRAGON)
return (false);
- }
if (transform == TRAN_BLADE_HANDS)
{
@@ -1053,10 +1042,6 @@ int player_regen()
// Fast heal mutation.
rr += player_mutation_level(MUT_REGENERATION) * 20;
- // Dematerialised people heal slowly.
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
- rr /= 2;
-
// Before applying other effects, make sure that there's something
// to heal.
if (rr < 1)
@@ -1098,11 +1083,6 @@ int player_hunger_rate(void)
if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
return 1;
- // jmf: Hunger isn't fair while you can't eat.
- // Actually, it is since you can detransform any time you like -- bwr
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
- return 0;
-
if (you.species == SP_TROLL)
hunger += 3; // in addition to the +3 for fast metabolism
@@ -1356,12 +1336,6 @@ int player_res_fire(bool calc_unid, bool temp, bool items)
case TRAN_DRAGON:
rf += 2;
break;
- case TRAN_SERPENT_OF_HELL:
- rf += 2;
- break;
- case TRAN_AIR:
- rf -= 2;
- break;
}
}
@@ -1411,9 +1385,6 @@ int player_res_cold(bool calc_unid, bool temp, bool items)
case TRAN_LICH:
rc++;
break;
- case TRAN_AIR:
- rc -= 2;
- break;
}
if (you.species == SP_VAMPIRE)
@@ -1516,9 +1487,6 @@ int player_res_electricity(bool calc_unid, bool temp, bool items)
if (you.attribute[ATTR_TRANSFORMATION] == TRAN_STATUE)
re += 1;
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
- re += 2; // multiple levels currently meaningless
-
if (you.attribute[ATTR_DIVINE_LIGHTNING_PROTECTION])
re = 3;
else if (re > 1)
@@ -1559,8 +1527,6 @@ bool player_res_asphyx()
{
case TRAN_LICH:
case TRAN_STATUE:
- case TRAN_SERPENT_OF_HELL:
- case TRAN_AIR:
return (true);
}
@@ -1635,8 +1601,6 @@ int player_res_poison(bool calc_unid, bool temp, bool items)
case TRAN_ICE_BEAST:
case TRAN_STATUE:
case TRAN_DRAGON:
- case TRAN_SERPENT_OF_HELL:
- case TRAN_AIR:
rp++;
break;
}
@@ -1734,9 +1698,6 @@ int player_spec_earth()
// Staves
se += player_equip( EQ_STAFF, STAFF_EARTH );
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
- se--;
-
return se;
}
@@ -1747,9 +1708,6 @@ int player_spec_air()
// Staves
sa += player_equip( EQ_STAFF, STAFF_AIR );
- //jmf: this was too good
- //if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
- // sa++;
return sa;
}
@@ -1864,9 +1822,6 @@ int player_prot_life(bool calc_unid, bool temp, bool items)
case TRAN_STATUE:
pl++;
break;
- case TRAN_SERPENT_OF_HELL:
- pl += 2;
- break;
case TRAN_LICH:
pl += 3;
break;
@@ -2015,11 +1970,6 @@ int player_speed(void)
ps /= 10;
break;
- case TRAN_SERPENT_OF_HELL:
- ps *= 12;
- ps /= 10;
- break;
-
default:
break;
}
@@ -2251,14 +2201,6 @@ int player_AC(void)
AC += (100 + 100 * you.skills[SK_EARTH_MAGIC] / 4); // max +7
break;
- case TRAN_SERPENT_OF_HELL:
- AC += (1000 + 100 * you.skills[SK_FIRE_MAGIC] / 3); // max 19
- break;
-
- case TRAN_AIR: // air - scales & species ought to be irrelevant
- AC = (you.skills[SK_AIR_MAGIC] * 300) / 2; // max 40
- break;
-
default:
break;
}
@@ -2436,10 +2378,6 @@ int player_evasion()
ev -= 5; // stiff
break;
- case TRAN_AIR:
- ev += 20; // vapourous
- break;
-
default:
break;
}
@@ -2543,7 +2481,6 @@ int old_player_evasion(void)
break;
case TRAN_STATUE:
- case TRAN_SERPENT_OF_HELL:
ev -= 5;
break;
@@ -2555,10 +2492,6 @@ int old_player_evasion(void)
ev += 20 + (you.experience_level - 10);
break;
- case TRAN_AIR:
- ev += 20;
- break;
-
default:
break;
}
@@ -3985,12 +3918,6 @@ void display_char_status()
case TRAN_LICH:
text += "You are in lich-form.";
break;
- case TRAN_SERPENT_OF_HELL:
- text += "You are a huge demonic serpent.";
- break;
- case TRAN_AIR:
- text += "You are a cloud of diffuse gas.";
- break;
}
mpr(text.c_str());
}
@@ -5655,7 +5582,6 @@ static int _strength_modifier()
case TRAN_STATUE: result += 2; break;
case TRAN_DRAGON: result += 10; break;
case TRAN_LICH: result += 3; break;
- case TRAN_SERPENT_OF_HELL: result += 13; break;
case TRAN_BAT: result -= 5; break;
default: break;
}
@@ -5725,7 +5651,6 @@ static int _dex_modifier()
{
case TRAN_SPIDER: result += 5; break;
case TRAN_STATUE: result -= 2; break;
- case TRAN_AIR: result += 8; break;
case TRAN_BAT: result += 5; break;
default: break;
}
@@ -6157,9 +6082,6 @@ size_type player::body_size(int psize, bool base) const
int player::body_weight() const
{
- if (attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
- return 0;
-
int weight = 0;
switch (body_size(PSIZE_BODY))
{
@@ -6231,14 +6153,11 @@ std::string player::shout_verb() const
switch (transform)
{
case TRAN_DRAGON:
- case TRAN_SERPENT_OF_HELL:
return "roar";
case TRAN_SPIDER:
return "hiss";
case TRAN_BAT:
return "squeak";
- case TRAN_AIR:
- return "__NONE";
default: // depends on SCREAM mutation
int level = player_mutation_level(MUT_SCREAM);
if ( level <= 1)
@@ -6430,12 +6349,7 @@ std::string player::foot_name(bool plural, bool *can_plural) const
std::string str;
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
- {
- str = "lowest portion";
- *can_plural = false;
- }
- else if (you.attribute[ATTR_TRANSFORMATION] == TRAN_SPIDER)
+ if (you.attribute[ATTR_TRANSFORMATION] == TRAN_SPIDER)
str = "back leg";
else if (!transform_changed_physiology())
{
@@ -7096,11 +7010,8 @@ int player::has_claws(bool allow_tran) const
if (allow_tran)
{
// these transformations bring claws with them
- if (attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
- || attribute[ATTR_TRANSFORMATION] == TRAN_SERPENT_OF_HELL)
- {
+ if (attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON)
return 3;
- }
// transformations other than these will override claws
if (attribute[ATTR_TRANSFORMATION] != TRAN_NONE
@@ -7215,9 +7126,9 @@ bool player::can_bleed() const
}
const int tran = you.attribute[ATTR_TRANSFORMATION];
+ // The corresponding monsters don't bleed either.
if (tran == TRAN_STATUE || tran == TRAN_ICE_BEAST
- || tran == TRAN_AIR || tran == TRAN_LICH
- || tran == TRAN_SPIDER) // Monster spiders don't bleed either.
+ || tran == TRAN_LICH || tran == TRAN_SPIDER)
{
return (false);
}
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc
index 6129c2d4ef..715bfc9564 100644
--- a/crawl-ref/source/spells4.cc
+++ b/crawl-ref/source/spells4.cc
@@ -304,8 +304,6 @@ void cast_shatter(int pow)
case TRAN_SPIDER:
case TRAN_LICH:
case TRAN_DRAGON:
- case TRAN_AIR:
- case TRAN_SERPENT_OF_HELL:
case TRAN_BAT:
break;
diff --git a/crawl-ref/source/spl-mis.cc b/crawl-ref/source/spl-mis.cc
index cf66a8d892..d4bada8746 100644
--- a/crawl-ref/source/spl-mis.cc
+++ b/crawl-ref/source/spl-mis.cc
@@ -963,11 +963,8 @@ void MiscastEffect::_enchantment(int severity)
msg_ch = MSGCH_SOUND;
return;
}
- else if (target->atype() == ACT_PLAYER
- && you.attribute[ATTR_TRANSFORMATION] != TRAN_AIR)
- {
+ else if (target->atype() == ACT_PLAYER)
you_msg = "Your skull vibrates slightly.";
- }
break;
}
do_msg();
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index 3d20c0a8b7..c6fbfd6231 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -75,8 +75,6 @@ bool transform_allows_wearing_item(const item_def& item,
// Some can't wear anything.
case TRAN_DRAGON:
- case TRAN_SERPENT_OF_HELL:
- case TRAN_AIR: // How did you carry it?
case TRAN_BAT:
rc = false;
break;
@@ -280,7 +278,6 @@ static bool _tran_may_meld_cursed(int transformation)
return (true);
// intentional fall-through
case TRAN_SPIDER:
- case TRAN_AIR:
return (false);
default:
return (true);
@@ -436,10 +433,7 @@ size_type player::transform_size(int psize) const
case TRAN_ICE_BEAST:
return SIZE_LARGE;
case TRAN_DRAGON:
- case TRAN_SERPENT_OF_HELL:
return SIZE_HUGE;
- case TRAN_AIR:
- return SIZE_MEDIUM;
default:
return SIZE_CHARACTER;
}
@@ -459,9 +453,7 @@ static void _transformation_expiration_warning()
bool transform(int pow, transformation_type which_trans, bool quiet)
{
if (you.species == SP_MERFOLK && player_is_swimming()
- && which_trans != TRAN_DRAGON
- && which_trans != TRAN_AIR
- && which_trans != TRAN_BAT)
+ && which_trans != TRAN_DRAGON && which_trans != TRAN_BAT)
{
// This might be overkill, but it's okay because obviously
// whatever magical ability that lets them walk on land is
@@ -594,25 +586,6 @@ bool transform(int pow, transformation_type which_trans, bool quiet)
msg = "Your body is suffused with negative energy!";
break;
- case TRAN_SERPENT_OF_HELL:
- tran_name = "Serpent of Hell";
- str = 13;
- xhp = 17;
- symbol = 'S';
- colour = RED;
- dur = std::min(20 + random2(pow) + random2(pow), 120);
- msg = "You transform into a huge demonic serpent!";
- break;
-
- case TRAN_AIR:
- tran_name = "air";
- dex = 8;
- symbol = '#';
- colour = DARKGREY;
- dur = std::min(35 + random2(pow) + random2(pow), 150);
- msg = "You feel diffuse...";
- break;
-
case TRAN_BAT:
tran_name = "bat";
str = -5;
@@ -718,19 +691,6 @@ bool transform(int pow, transformation_type which_trans, bool quiet)
set_redraw_status(REDRAW_HUNGER);
break;
- case TRAN_AIR:
- _drop_everything();
-
- if (you.attribute[ATTR_HELD])
- {
- mpr("You drift through the net!");
- you.attribute[ATTR_HELD] = 0;
- int net = get_trapping_net(you.pos());
- if (net != NON_ITEM)
- remove_item_stationary(mitm[net]);
- }
- break;
-
default:
break;
}
@@ -743,8 +703,7 @@ bool transform(int pow, transformation_type which_trans, bool quiet)
bool transform_can_butcher_barehanded(transformation_type tt)
{
- return (tt == TRAN_BLADE_HANDS || tt == TRAN_DRAGON
- || tt == TRAN_SERPENT_OF_HELL);
+ return (tt == TRAN_BLADE_HANDS || tt == TRAN_DRAGON);
}
void untransform(void)
@@ -836,19 +795,6 @@ void untransform(void)
you.is_undead = US_ALIVE;
break;
- case TRAN_AIR:
- mpr( "Your body solidifies.", MSGCH_DURATION );
- modify_stat(STAT_DEXTERITY, -8, true,
- "losing the air transformation");
- break;
-
- case TRAN_SERPENT_OF_HELL:
- mpr( "Your transformation has ended.", MSGCH_DURATION );
- modify_stat(STAT_STRENGTH, -13, true,
- "losing the Serpent of Hell transformation");
- hp_downscale = 17;
- break;
-
default:
break;
}
diff --git a/crawl-ref/source/transfor.h b/crawl-ref/source/transfor.h
index 733e8e70fd..072b92a4f9 100644
--- a/crawl-ref/source/transfor.h
+++ b/crawl-ref/source/transfor.h
@@ -24,8 +24,6 @@ enum transformation_type
TRAN_ICE_BEAST,
TRAN_DRAGON, // 5
TRAN_LICH,
- TRAN_SERPENT_OF_HELL,
- TRAN_AIR,
TRAN_BAT,
NUM_TRANSFORMATIONS // must remain last member {dlb}
};
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 0f36222956..00d6b15356 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -276,12 +276,6 @@ void player_caught_in_net()
if (you.body_size(PSIZE_BODY) >= SIZE_GIANT)
return;
- if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
- {
- mpr("The net passes right through you!");
- return;
- }
-
if (you.flight_mode() == FL_FLY && (!you.confused() || one_chance_in(3)))
{
mpr("You dart out from under the net!");
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index fe1eca7283..aafdecaceb 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -1373,7 +1373,7 @@ static void _xom_zero_miscast()
messages.push_back("You trip over your bandages.");
}
- if (transform != TRAN_SPIDER && transform != TRAN_AIR)
+ if (transform != TRAN_SPIDER)
{
std::string str = "A monocle briefly appears over your ";
str += coinflip() ? "right" : "left";
@@ -1507,9 +1507,6 @@ static void _get_hand_type(std::string &hand, bool &can_plural)
const int transform = you.attribute[ATTR_TRANSFORMATION];
- if (transform == TRAN_AIR)
- return;
-
std::vector<std::string> hand_vec;
std::vector<bool> plural_vec;
bool plural;
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-18 04:04:53 +0000