From fa5083020d4cc4d6d7471b461c430d40ed36c02e Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 20 Jun 2016 22:49:05 +0200 Subject: Remove ANIM_DEAD monster spell It doesn't seem like it was ever implemented fully in the first place, i.e. it was only available to Possessors and Symbiants, not monsters. --- lib/edit/r_info.txt | 43 ------------------------------------------ lib/mods/theme/edit/r_info.txt | 29 ---------------------------- src/cmd5.cc | 17 ----------------- src/melee2.cc | 10 ---------- 4 files changed, 99 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 252c1f2d..8e0697b2 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -8453,7 +8453,6 @@ F:RAND_50 F:RES_NETH F:ZANGBAND S:1_IN_3 -S:ANIM_DEAD S:BA_FIRE D:A pale, corpse-like lesser demon, who moves very fast and spawns evil D:everywhere. @@ -9821,7 +9820,6 @@ F:RES_TELE F:UNDEAD F:UNIQUE S:1_IN_5 -S:ANIM_DEAD S:CAUSE_3 S:DARKNESS S:SCARE @@ -11917,7 +11915,6 @@ F:NO_SLEEP F:OPEN_DOOR F:UNDEAD S:1_IN_7 -S:ANIM_DEAD S:DARKNESS S:HOLD S:SCARE @@ -13186,7 +13183,6 @@ F:SMART F:TAKE_ITEM F:UNDEAD S:1_IN_3 -S:ANIM_DEAD S:BA_COLD S:BA_NETH S:BA_POIS @@ -14608,7 +14604,6 @@ F:ONLY_ITEM F:OPEN_DOOR F:SMART S:1_IN_3 -S:ANIM_DEAD S:BLIND S:BO_NETH S:CAUSE_3 @@ -14666,7 +14661,6 @@ F:RES_WATE F:SMART F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BLINK S:DARKNESS S:DRAIN_MANA @@ -15972,7 +15966,6 @@ F:SMART F:SMART F:UNDEAD S:1_IN_3 -S:ANIM_DEAD S:BLIND S:BLINK S:BRAIN_SMASH @@ -17518,7 +17511,6 @@ F:SUSCEP_FIRE F:UNDEAD F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BLIND S:BLINK S:BO_ACID @@ -17561,7 +17553,6 @@ F:ONLY_ITEM F:OPEN_DOOR F:SMART S:1_IN_2 -S:ANIM_DEAD S:BA_COLD S:BA_FIRE S:BLIND @@ -17860,7 +17851,6 @@ F:NO_SLEEP F:RES_TELE F:UNDEAD S:1_IN_2 -S:ANIM_DEAD S:BA_COLD S:BA_FIRE S:BO_ACID @@ -18224,7 +18214,6 @@ F:OPEN_DOOR F:UNDEAD F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BLIND S:BRAIN_SMASH S:CAUSE_3 @@ -18461,7 +18450,6 @@ F:TAKE_ITEM F:UNDEAD F:ZANGBAND S:1_IN_6 -S:ANIM_DEAD S:BLINK S:CAUSE_3 S:MULTIPLY @@ -18717,7 +18705,6 @@ F:SUSCEP_FIRE F:UNDEAD F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BA_FIRE S:BA_NETH S:BLIND @@ -18831,7 +18818,6 @@ F:ONLY_ITEM F:OPEN_DOOR F:SMART S:1_IN_2 -S:ANIM_DEAD S:BLIND S:CAUSE_3 S:CAUSE_4 @@ -19022,7 +19008,6 @@ F:RES_TELE F:SMART F:UNDEAD S:1_IN_3 -S:ANIM_DEAD S:BA_NETH S:BLIND S:CAUSE_3 @@ -19467,7 +19452,6 @@ F:REGENERATE F:SMART F:UNIQUE S:1_IN_4 -S:ANIM_DEAD S:BR_CHAO S:BR_NEXU S:BR_NUKE @@ -20021,7 +20005,6 @@ F:POWERFUL F:SMART F:ZANGBAND S:1_IN_4 -S:ANIM_DEAD S:BA_COLD S:BA_NETH S:BLIND @@ -20549,7 +20532,6 @@ F:SMART F:UNDEAD F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BRAIN_SMASH S:CAUSE_3 S:CAUSE_4 @@ -20600,7 +20582,6 @@ F:POWERFUL F:SMART F:ZANGBAND S:1_IN_3 -S:ANIM_DEAD S:BR_ACID S:BR_NUKE S:BR_POIS @@ -20842,7 +20823,6 @@ F:RES_TELE F:SMART F:UNDEAD S:1_IN_3 -S:ANIM_DEAD S:BLIND S:BLINK S:BRAIN_SMASH @@ -22177,7 +22157,6 @@ F:RES_TELE F:SMART F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_ACID S:BA_CHAO S:BA_COLD @@ -22309,7 +22288,6 @@ F:RES_TELE F:TAKE_ITEM F:UNDEAD S:1_IN_3 -S:ANIM_DEAD S:BA_NETH S:BLIND S:BRAIN_SMASH @@ -22405,7 +22383,6 @@ F:RES_TELE F:SMART F:UNDEAD S:1_IN_3 -S:ANIM_DEAD S:BA_NETH S:BLIND S:BLINK @@ -23518,7 +23495,6 @@ F:SMART F:UNIQUE F:ZANGBAND S:1_IN_5 -S:ANIM_DEAD S:BRAIN_SMASH S:BR_NETH S:DRAIN_MANA @@ -23564,7 +23540,6 @@ F:SPECIAL_GENE F:UNDEAD F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_MANA S:BA_NETH S:BLINK @@ -24172,7 +24147,6 @@ F:SMART F:UNIQUE F:ZANGBAND S:1_IN_3 -S:ANIM_DEAD S:BA_DARK S:BA_NETH S:BLIND @@ -24221,7 +24195,6 @@ F:OPEN_DOOR F:SMART F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_DARK S:BA_FIRE S:BA_MANA @@ -24273,7 +24246,6 @@ F:SMART F:SPECIAL_GENE F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_CHAO S:BA_DARK S:BA_FIRE @@ -24763,7 +24735,6 @@ F:SMART F:UNDEAD F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_NETH S:BA_WATE S:BO_ICEE @@ -24818,7 +24789,6 @@ F:RES_PLAS F:UNIQUE F:ZANGBAND S:1_IN_3 -S:ANIM_DEAD S:BRAIN_SMASH S:BR_FIRE S:BR_NETH @@ -24913,7 +24883,6 @@ F:RES_WATE F:SMART F:UNIQUE S:1_IN_6 -S:ANIM_DEAD S:BRAIN_SMASH S:BR_CHAO S:BR_NEXU @@ -25028,7 +24997,6 @@ F:TAKE_ITEM F:UNIQUE F:ZANGBAND S:1_IN_5 -S:ANIM_DEAD S:BA_DARK S:BA_MANA S:DRAIN_MANA @@ -25085,7 +25053,6 @@ F:RAND_25 F:RES_NETH F:RES_TELE S:1_IN_3 -S:ANIM_DEAD S:BA_NUKE S:BRAIN_SMASH S:BR_ACID @@ -25315,7 +25282,6 @@ F:RES_WATE F:SMART F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_MANA S:BLIND S:BRAIN_SMASH @@ -25458,7 +25424,6 @@ F:SMART F:UNDEAD F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BA_FIRE S:BA_MANA S:BA_NETH @@ -25689,7 +25654,6 @@ F:RES_TELE F:SMART F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BA_CHAO S:BA_DARK S:BO_MANA @@ -25843,7 +25807,6 @@ F:SHAPECHANGER F:SMART F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BA_CHAO S:BA_FIRE S:BA_MANA @@ -26163,7 +26126,6 @@ F:RES_TELE F:SMART F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BLIND S:BRAIN_SMASH S:BR_ACID @@ -26341,7 +26303,6 @@ F:RES_TELE F:SMART F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_CHAO S:BA_DARK S:BA_FIRE @@ -26500,7 +26461,6 @@ F:RES_TELE F:SMART F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BA_CHAO S:BA_DARK S:BA_MANA @@ -29017,7 +28977,6 @@ F:SMART F:UNDEAD F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_COLD S:BA_FIRE S:BA_NETH @@ -29070,7 +29029,6 @@ F:SMART F:UNDEAD F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_NETH S:BLIND S:BO_MANA @@ -32119,7 +32077,6 @@ F:SPECIAL_GENE F:SPIRIT F:UNIQUE S:1_IN_4 -S:ANIM_DEAD S:BA_CHAO S:BA_DARK S:BA_MANA diff --git a/lib/mods/theme/edit/r_info.txt b/lib/mods/theme/edit/r_info.txt index f238fec8..fe18f2fa 100644 --- a/lib/mods/theme/edit/r_info.txt +++ b/lib/mods/theme/edit/r_info.txt @@ -5677,7 +5677,6 @@ F:RES_WATE F:STUPID F:UNDEAD S:1_IN_5 -S:ANIM_DEAD D:An evil cannibal spirit from the marshlands. It has been given D:additional power by necromantic magic, making it nearly invulnerable. # Wow, a dangerous icky thing :P @@ -11833,7 +11832,6 @@ F:SMART F:UNDEAD F:UNIQUE S:1_IN_5 -S:ANIM_DEAD S:S_KIN D:A ruler of mewlips. She might not be the most powerful of D:them all, but she is the smartest, and has her minions @@ -12779,7 +12777,6 @@ F:NO_SLEEP F:OPEN_DOOR F:UNDEAD S:1_IN_7 -S:ANIM_DEAD S:DARKNESS S:HOLD S:SCARE @@ -14202,7 +14199,6 @@ F:SMART F:TAKE_ITEM F:UNDEAD S:1_IN_3 -S:ANIM_DEAD S:BA_COLD S:BA_NETH S:BA_POIS @@ -15912,7 +15908,6 @@ F:ONLY_ITEM F:OPEN_DOOR F:SMART S:1_IN_3 -S:ANIM_DEAD S:BLIND S:BO_NETH S:CAUSE_3 @@ -17171,7 +17166,6 @@ F:SMART F:SMART F:UNDEAD S:1_IN_3 -S:ANIM_DEAD S:BLIND S:BLINK S:BRAIN_SMASH @@ -18107,7 +18101,6 @@ F:RES_NETH F:RES_NEXU F:RES_PLAS S:1_IN_6 -S:ANIM_DEAD S:BA_DARK S:BO_MANA S:DARKNESS @@ -18598,7 +18591,6 @@ F:SUSCEP_FIRE F:UNDEAD F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BLIND S:BLINK S:BO_ACID @@ -18641,7 +18633,6 @@ F:ONLY_ITEM F:OPEN_DOOR F:SMART S:1_IN_2 -S:ANIM_DEAD S:BA_COLD S:BA_FIRE S:BLIND @@ -18869,7 +18860,6 @@ F:NO_SLEEP F:RES_TELE F:UNDEAD S:1_IN_2 -S:ANIM_DEAD S:BA_COLD S:BA_FIRE S:BO_ACID @@ -19169,7 +19159,6 @@ F:OPEN_DOOR F:UNDEAD F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BLIND S:BRAIN_SMASH S:CAUSE_3 @@ -19389,7 +19378,6 @@ F:SMART F:TAKE_ITEM F:UNDEAD S:1_IN_6 -S:ANIM_DEAD S:BLINK S:CAUSE_3 S:MULTIPLY @@ -19563,7 +19551,6 @@ F:SUSCEP_FIRE F:UNDEAD F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BA_FIRE S:BA_NETH S:BLIND @@ -19677,7 +19664,6 @@ F:ONLY_ITEM F:OPEN_DOOR F:SMART S:1_IN_2 -S:ANIM_DEAD S:BLIND S:CAUSE_3 S:CAUSE_4 @@ -19867,7 +19853,6 @@ F:RES_TELE F:SMART F:UNDEAD S:1_IN_3 -S:ANIM_DEAD S:BA_NETH S:BLIND S:CAUSE_3 @@ -21504,7 +21489,6 @@ F:RES_TELE F:SMART F:UNDEAD S:1_IN_3 -S:ANIM_DEAD S:BLIND S:BLINK S:BRAIN_SMASH @@ -22530,7 +22514,6 @@ F:SMART F:SPECIAL_GENE F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_ACID S:BA_CHAO S:BA_COLD @@ -22661,7 +22644,6 @@ F:RES_TELE F:TAKE_ITEM F:UNDEAD S:1_IN_3 -S:ANIM_DEAD S:BA_NETH S:BLIND S:BRAIN_SMASH @@ -22757,7 +22739,6 @@ F:RES_TELE F:SMART F:UNDEAD S:1_IN_3 -S:ANIM_DEAD S:BA_NETH S:BLIND S:BLINK @@ -23835,7 +23816,6 @@ F:SPECIAL_GENE F:UNDEAD F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_MANA S:BA_NETH S:BLINK @@ -24438,7 +24418,6 @@ F:OPEN_DOOR F:SMART F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_DARK S:BA_FIRE S:BA_MANA @@ -24492,7 +24471,6 @@ F:SMART F:SPECIAL_GENE F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_CHAO S:BA_DARK S:BA_FIRE @@ -24901,7 +24879,6 @@ F:SMART F:UNDEAD F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_NETH S:BA_WATE S:BO_ICEE @@ -25315,7 +25292,6 @@ F:SMART F:UNDEAD F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BA_FIRE S:BA_MANA S:BA_NETH @@ -25863,7 +25839,6 @@ F:RES_TELE F:SMART F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_CHAO S:BA_DARK S:BA_FIRE @@ -26022,7 +25997,6 @@ F:RES_TELE F:SMART F:UNIQUE S:1_IN_3 -S:ANIM_DEAD S:BA_CHAO S:BA_DARK S:BA_MANA @@ -28576,7 +28550,6 @@ F:SUSCEP_FIRE F:UNDEAD F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_COLD S:BA_NETH S:BLIND @@ -28629,7 +28602,6 @@ F:SUSCEP_FIRE F:UNDEAD F:UNIQUE S:1_IN_2 -S:ANIM_DEAD S:BA_NETH S:BLIND S:BO_MANA @@ -31453,7 +31425,6 @@ F:SPECIAL_GENE F:SPIRIT F:UNIQUE S:1_IN_4 -S:ANIM_DEAD S:BA_CHAO S:BA_DARK S:BA_MANA diff --git a/src/cmd5.cc b/src/cmd5.cc index 6dccbc8c..a3a70b01 100644 --- a/src/cmd5.cc +++ b/src/cmd5.cc @@ -1693,23 +1693,6 @@ static void apply_monster_power(monster_race const *r_ptr, int power) break; } - /* 75 FORGET -- Not available */ - - /* ANIM_DEAD -- Use the same code as the nether spell */ - case 76: - { - int dir; - if (!get_aim_dir(&dir)) break; - - fire_ball(GF_RAISE, dir, 1, 0); - - break; - } - - /* 77 S_BUG -- Not available, well we do that anyway ;) */ - - /* 78 S_RNG -- Not available, who dares? */ - /* S_THUNDERLORD */ case 79: { diff --git a/src/melee2.cc b/src/melee2.cc index 522b2f47..83827dcf 100644 --- a/src/melee2.cc +++ b/src/melee2.cc @@ -2344,12 +2344,6 @@ static bool_ monst_spell_monst(int m_idx) break; } - /* RF6_ANIM_DEAD */ - case 160 + 12: - { - break; - } - /* RF6_S_BUG */ case 160 + 13: { @@ -4214,10 +4208,6 @@ static bool_ make_attack_spell(int m_idx) break; } - /* RF6_ANIM_DEAD */ - case 160 + 12: - break; - /* RF6_S_BUG */ case 160 + 13: { -- cgit v1.2.3