From 076bae805cc14f884cf40c84f278478d2b4ad24c Mon Sep 17 00:00:00 2001 From: Jude Brown Date: Thu, 10 Dec 2009 15:10:45 +1000 Subject: Pre-emptively adjust Aizul. (dpeg) In preparation for the guardian naga -> guardian serpent change. A compromise of sorts. --- crawl-ref/source/dat/database/monspeak.txt | 12 +++++++++--- crawl-ref/source/dat/descript/monsters.txt | 2 +- crawl-ref/source/dat/uniques.des | 2 +- crawl-ref/source/mon-data.h | 10 +++++----- crawl-ref/source/mon-gear.cc | 18 ------------------ crawl-ref/source/mon-spll.h | 2 +- 6 files changed, 17 insertions(+), 29 deletions(-) diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt index bc3abbb9fe..612ac4b491 100644 --- a/crawl-ref/source/dat/database/monspeak.txt +++ b/crawl-ref/source/dat/database/monspeak.txt @@ -1047,7 +1047,7 @@ _player_ghost_rare_ # Unique monsters ####################################### %%%% -############ AIZUL ### Renegade Guardian Naga Crusader whose vault got raided +############ AIZUL ### Renegade guardian serpent whose vault was raided. Aizul @_Aizul_common_@ @@ -1064,7 +1064,7 @@ VISUAL:@The_monster@ yawns, and then pretends he didn't. @The_monster@ says, "I wasn't actually sleeping!" -VISUAL:@The_monster@ grinds his teeth. +VISUAL:@The_monster@ hisses menacingly. @The_monster@ screams @at_foe@, "I'll haunt your nightmares!" %%%% @@ -1074,12 +1074,18 @@ _Aizul_rare_ @The_monster@ hums a lullaby. -VISUAL:@The_monster@ stretches carefully. +VISUAL:@The_monster@ coils and then uncoils. @The_monster@ says, "Everybody has to sleep sometimes." @The_monster@ says @to_foe@, "Fancy a snooze?" +@The_monster@ says, "They said they'd gotten someone better!" + +@The_monster@ says, "Replaced! How does it feel to be replaced?" + +@The_monster@ moans, "No job prospects! Who wants sleepy Aizul to guard their treasure?" + VISUAL:@The_monster@ winks several times @at_foe@. %%%% ############ AGNES ### She is trying to get money and treasure diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt index ba0cc96cc9..3c7108bd0d 100644 --- a/crawl-ref/source/dat/descript/monsters.txt +++ b/crawl-ref/source/dat/descript/monsters.txt @@ -20,7 +20,7 @@ power. %%%% Aizul -Once the guardian of a legendary treasure hoard, he was disgraced after thieves looted it while he slept. Left without a purpose he now slithers aimlessly from place to place, seeking redemption on the field of battle. +Once the primary guardian of a legendary treasure hoard, he was disgraced after thieves looted it while he slept. Left without a job and a purpose, he now slithers aimlessly from place to place. %%%%% Agnes diff --git a/crawl-ref/source/dat/uniques.des b/crawl-ref/source/dat/uniques.des index e45d0ee4c6..8e4e08525d 100644 --- a/crawl-ref/source/dat/uniques.des +++ b/crawl-ref/source/dat/uniques.des @@ -99,7 +99,7 @@ DEPTH: 14-16, !Lair, !Slime : place_unique(_G, "Agnes") NAME: uniq_aizul -DEPTH: 16-25, !Lair, !Slime, Snake:2-5 +DEPTH: 13-25, !Lair, !Slime : place_unique(_G, "Aizul") NAME: uniq_azrael diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 93b54dd808..23fecfcc30 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -4569,15 +4569,15 @@ static monsterentry mondata[] = { { MONS_AIZUL, 'N', LIGHTMAGENTA, "Aizul", - M_FIGHTER | M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS + M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS | M_ACTUAL_SPELLS | M_UNIQUE, MR_RES_POISON, - 750, 10, MONS_NAGA, MONS_GUARDIAN_NAGA, MH_NATURAL, -6, - { {AT_HIT, AF_PLAIN, 28}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, + 350, 10, MONS_NAGA, MONS_GUARDIAN_NAGA, MH_NATURAL, -6, + { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 14, 0, 0, 142 }, - 6, 16, MST_AIZUL, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SHOUT, + 8, 18, MST_AIZUL, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SHOUT, I_HIGH, HT_LAND, FL_NONE, 15, DEFAULT_ENERGY, - MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_LARGE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, { diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc index f66fdb0410..96ff1feef1 100644 --- a/crawl-ref/source/mon-gear.cc +++ b/crawl-ref/source/mon-gear.cc @@ -274,16 +274,6 @@ static item_make_species_type _give_weapon(monsters *mon, int level, do_curse_item(item); break; - case MONS_AIZUL: - if (one_chance_in(3)) - level = MAKE_GOOD_ITEM; - - item_race = MAKE_ITEM_NO_RACE; - item.base_type = OBJ_WEAPONS; - item.sub_type = random_choose(WPN_HALBERD, WPN_SCIMITAR, WPN_GREAT_MACE, - WPN_LONG_SWORD, WPN_EVENINGSTAR, -1); - break; - case MONS_GNOLL: case MONS_OGRE_MAGE: case MONS_NAGA_WARRIOR: @@ -1193,7 +1183,6 @@ void give_shield(monsters *mon, int level) make_item_for_monster(mon, OBJ_ARMOUR, ARM_LARGE_SHIELD, level * 2 + 1, MAKE_ITEM_RANDOM_RACE, 1); break; - case MONS_AIZUL: case MONS_DONALD: make_item_for_monster(mon, OBJ_ARMOUR, ARM_SHIELD, level * 2 + 1, MAKE_ITEM_RANDOM_RACE, 1); @@ -1490,13 +1479,6 @@ void give_armour(monsters *mon, int level) force_colour = LIGHTCYAN; break; - case MONS_AIZUL: - item_race = MAKE_ITEM_NO_RACE; - item.base_type = OBJ_ARMOUR; - item.sub_type = ARM_NAGA_BARDING; - force_colour = RED; - break; - default: return; } diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h index 4b2f8fe176..ed5d9ea79e 100644 --- a/crawl-ref/source/mon-spll.h +++ b/crawl-ref/source/mon-spll.h @@ -1270,7 +1270,7 @@ SPELL_BLINK_OTHER, SPELL_SLEEP, SPELL_POISON_ARROW, - SPELL_SLOW, + SPELL_POISON_ARROW, SPELL_MINOR_HEALING } }, -- cgit v1.2.3-54-g00ecf