diff options
| -rw-r--r-- | crawl-ref/source/dat/database/monspeak.txt | 29 | ||||
| -rw-r--r-- | crawl-ref/source/dat/descript/monsters.txt | 2 | ||||
| -rw-r--r-- | crawl-ref/source/items.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/mon-data.h | 8 |
4 files changed, 34 insertions, 9 deletions
diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt index 605cf66ef8..6c26d48ccf 100644 --- a/crawl-ref/source/dat/database/monspeak.txt +++ b/crawl-ref/source/dat/database/monspeak.txt @@ -1281,9 +1281,17 @@ Boris unsummoned @The_monster@ says, "You can't fire me, I quit!" ## END Boris ## %%%% -# a sentient jelly +# a sentient jelly who used to be human a long time ago Dissolution +@dissolution_common@ + +w:5 +@dissolution_speech@ +%%%% +# Dissolution non-speech +dissolution_common + @The_monster@ gurgles. @The_monster@ gurgles loudly. @@ -1292,9 +1300,28 @@ Dissolution @The_monster@ jiggles. +@The_monster@ wobbles. +%%%% +dissolution_speech + @The_monster@ says, "Join with me for eternity!" @The_monster@ says, "Become one with my sorrow!" + +@The_monster@ says, "Slime for the Slime God!" + +@The_monster@ says, "Acid is thicker than water." + +@dissolution_rare@ +%%%% +dissolution_rare + +@The_monster@ says, "We come from slime, we turn to slime." + +@The_monster@ says, "Resolve to dissolve!" + +w:2 +@The_monster@ says, "There is a problem solver and it's name is Dissolver!" ## END Dissolution ## %%%% # An adventurer hating competition diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt index 7645008321..d959fcedbf 100644 --- a/crawl-ref/source/dat/descript/monsters.txt +++ b/crawl-ref/source/dat/descript/monsters.txt @@ -214,7 +214,7 @@ A withered sorceress, exceptionally ugly even by orc standards. %%%% Nessos -A Black Centaur with a malicious look in the eyes. +A black centaur warrior with a malicious look in the eyes. %%%% Norbert diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 3cb80ae907..5e4fe0129b 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -10,9 +10,7 @@ REVISION("$Rev$"); #include "items.h" -//#ifdef USE_TILE - #include "cio.h" -//#endif +#include "cio.h" #include "clua.h" #include <string.h> diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 082734accd..575aee55f5 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -3870,10 +3870,10 @@ static monsterentry mondata[] = { M_UNIQUE | M_WARM_BLOOD | M_SPELLCASTER | M_ACTUAL_SPELLS | M_EVIL | M_SPEAKS, MR_NO_FLAGS, - 1500, 10, MONS_CENTAUR, MONS_CENTAUR, MH_NATURAL, -3, - { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, - { 4, 3, 5, 0 }, - 3, 7, MST_NESSOS, CE_CLEAN, Z_NOZOMBIE, S_SHOUT, I_NORMAL, + 1500, 12, MONS_CENTAUR, MONS_CENTAUR, MH_NATURAL, -3, + { {AT_HIT, AF_PLAIN, 16}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, + { 9, 3, 5, 0 }, + 4, 8, MST_NESSOS, CE_CLEAN, Z_NOZOMBIE, S_SHOUT, I_HIGH, HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG }, |