diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-27 00:00:16 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-27 00:00:16 +0000 |
| commit | 142db52cf0a402353b1fa4cb8da1a8035964f63d (patch) | |
| tree | 67b4f22866981cff235841ee4449c06487d38efc /crawl-ref/source/fight.cc | |
| parent | 517f9b7f33af4d09905fae2ab1e295ae066f3859 (diff) | |
| download | crawl-ref-142db52cf0a402353b1fa4cb8da1a8035964f63d.tar.gz crawl-ref-142db52cf0a402353b1fa4cb8da1a8035964f63d.zip | |
Remove all traces of TRAN_AIR and TRAN_SERPENT_OF_HELL, the latter
together with the corresponding unused ability.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9244 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 21 |
1 files changed, 3 insertions, 18 deletions
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) |