From 9382906ac78b1088b3344a9901161d97b7e3b935 Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Fri, 15 Jan 2010 15:14:39 +0100 Subject: Make Wayne a dwarf once again. --- crawl-ref/source/dat/descript/monsters.txt | 2 +- crawl-ref/source/enum.h | 6 +++--- crawl-ref/source/mon-data.h | 14 +++++++++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt index 40642702c6..a920b59dd9 100644 --- a/crawl-ref/source/dat/descript/monsters.txt +++ b/crawl-ref/source/dat/descript/monsters.txt @@ -365,7 +365,7 @@ end %%%% Wayne -A fat wizard wearing a stupid-looking hat. +A fat dwarf wearing a stupid-looking hat. %%%% Xtahua diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 9f63ff75d9..011a4615dc 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1629,9 +1629,9 @@ enum monster_type // (int) menv[].type MONS_PHANTOM, // 15 MONS_QUASIT, MONS_RAT, - MONS_SCORPION, // 18 - //MONS_TUNNELING_WORM, // deprecated and now officially removed {dlb} - MONS_UGLY_THING = 20, // 20 + MONS_SCORPION, + MONS_DWARF, // only for corpses + MONS_UGLY_THING, // 20 MONS_FIRE_VORTEX, MONS_WORM, MONS_ABOMINATION_SMALL, diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 82d0f47ccc..4bba22264e 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -3585,6 +3585,18 @@ static monsterentry mondata[] = { MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_MEDIUM }, +{ // another dummy monster + MONS_DWARF, '@', BROWN, "dwarf", + M_WARM_BLOOD | M_SPEAKS, + MR_NO_FLAGS, + 550, 10, MONS_DWARF, MONS_DWARF, MH_NATURAL, -3, + { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, + { 5, 3, 5, 0 }, + 2, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, + I_NORMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, + MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM +}, + // mimics { // Gold mimics are the only mimics that actually use their name. - bwr @@ -5090,7 +5102,7 @@ static monsterentry mondata[] = { M_UNIQUE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_SPEAKS, MR_NO_FLAGS, - 550, 4, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5, + 550, 4, MONS_DWARF, MONS_DWARF, MH_NATURAL, -5, { {AT_HIT, AF_PLAIN, 22}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 17, 0, 0, 140 }, 1, 10, MST_ORC_PRIEST, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, -- cgit v1.2.3-54-g00ecf