From 79c3d7c39771724248d7f06bc206c33d6517225a Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Sun, 15 Nov 2009 01:21:31 +0100 Subject: Remove the Divinations school. --- crawl-ref/docs/aptitudes.txt | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'crawl-ref/docs') diff --git a/crawl-ref/docs/aptitudes.txt b/crawl-ref/docs/aptitudes.txt index 0ad6313656..c69291b404 100644 --- a/crawl-ref/docs/aptitudes.txt +++ b/crawl-ref/docs/aptitudes.txt @@ -110,38 +110,38 @@ Vampire 110 90 100 110 140 110 140 90 140 140 140 140 140 Fgt SBl LBl Axs M&F Pla Stv U C Thr Slg Bws Crb Drt - Spc Coj Enc Sum Nec Trl Trm Div Fir Ice Air Ear Poi + Spc Coj Enc Sum Nec Trl Trm Fir Ice Air Ear Poi --------------------------------------------------------------------- -Human 130 100 100 100 100 100 100 100 100 100 100 100 100 -High Elf 90 90 70 110 130 90 90 110 100 100 70 130 130 -Deep Elf 70 80 50 80 70 80 80 80 90 90 80 100 80 -Sludge Elf 90 130 130 90 90 100 60 130 80 80 80 80 80 -Mountain Dwarf 210 120 150 150 160 150 120 130 70 130 150 70 130 -Deep Dwarf 160 120 120 110 80 90 120 120 110 110 170 60 130 -Hill Orc 200 100 120 100 100 150 160 160 100 100 150 100 110 -Merfolk 130 140 90 100 150 140 60 80 160 80 150 150 80 -Halfling 170 130 100 120 150 100 150 140 100 100 90 100 120 -Kobold 140 110 110 110 110 100 110 130 100 100 100 100 100 -Spriggan 80 160 50 150 120 50 60 70 140 140 120 120 100 -Naga 130 100 100 100 100 100 100 100 100 100 100 100 60 -Centaur 180 120 110 120 120 120 120 130 120 120 120 120 130 -Ogre 90 160 160 160 160 160 160 160 160 160 160 160 160 -Troll 260 160 200 160 150 160 160 200 160 160 200 120 160 -Minotaur 230 170 170 170 170 170 170 170 170 170 170 170 170 -Kenku 130 60 160 70 80 150 150 180 90 120 90 120 100 -Draconian Red 130 100 120 100 100 100 100 100 70 140 100 100 100 - White 130 100 120 100 100 100 100 100 140 70 100 100 100 - Green 130 100 120 100 100 100 100 100 100 100 100 100 70 - Yellow 130 100 120 100 100 100 100 100 100 100 100 100 100 - Grey 130 100 120 100 100 100 100 100 100 100 100 100 100 - Black 130 100 120 100 100 100 100 100 100 100 70 140 100 - Purple 90 100 90 100 100 100 100 100 100 100 100 100 100 - Mottled 130 100 120 100 100 100 100 100 80 100 100 100 100 - Pale 130 100 120 100 100 100 100 100 90 100 90 100 100 -Demigod 140 110 110 110 110 110 110 110 110 110 110 110 110 -Demonspawn 130 100 110 100 90 110 110 110 100 110 110 110 100 -Mummy 130 140 140 140 100 140 140 140 140 140 140 140 140 -Ghoul 160 130 130 120 100 120 120 120 150 90 150 90 100 -Vampire 130 160 90 100 90 140 90 120 140 100 100 120 120 +Human 130 100 100 100 100 100 100 100 100 100 100 100 +High Elf 90 90 70 110 130 90 90 100 100 70 130 130 +Deep Elf 70 80 50 80 70 80 80 90 90 80 100 80 +Sludge Elf 90 130 130 90 90 100 60 80 80 80 80 80 +Mountain Dwarf 210 120 150 150 160 150 120 70 130 150 70 130 +Deep Dwarf 160 120 120 110 80 90 120 110 110 170 60 130 +Hill Orc 200 100 120 100 100 150 160 100 100 150 100 110 +Merfolk 130 140 90 100 150 140 60 160 80 150 150 80 +Halfling 170 130 100 120 150 100 150 100 100 90 100 120 +Kobold 140 110 110 110 110 100 110 100 100 100 100 100 +Spriggan 80 160 50 150 120 50 60 140 140 120 120 100 +Naga 130 100 100 100 100 100 100 100 100 100 100 60 +Centaur 180 120 110 120 120 120 120 120 120 120 120 130 +Ogre 90 160 160 160 160 160 160 160 160 160 160 160 +Troll 260 160 200 160 150 160 160 160 160 200 120 160 +Minotaur 230 170 170 170 170 170 170 170 170 170 170 170 +Kenku 130 60 160 70 80 150 150 90 120 90 120 100 +Draconian Red 130 100 120 100 100 100 100 70 140 100 100 100 + White 130 100 120 100 100 100 100 140 70 100 100 100 + Green 130 100 120 100 100 100 100 100 100 100 100 70 + Yellow 130 100 120 100 100 100 100 100 100 100 100 100 + Grey 130 100 120 100 100 100 100 100 100 100 100 100 + Black 130 100 120 100 100 100 100 100 100 70 140 100 + Purple 90 100 90 100 100 100 100 100 100 100 100 100 + Mottled 130 100 120 100 100 100 100 80 100 100 100 100 + Pale 130 100 120 100 100 100 100 90 100 90 100 100 +Demigod 140 110 110 110 110 110 110 110 110 110 110 110 +Demonspawn 130 100 110 100 90 110 110 100 110 110 110 100 +Mummy 130 140 140 140 100 140 140 140 140 140 140 140 +Ghoul 160 130 130 120 100 120 120 150 90 150 90 100 +Vampire 130 160 90 100 90 140 90 140 100 100 120 120 --------------------------------------------------------------------- - Spc Coj Enc Sum Nec Trl Trm Div Fir Ice Air Ear Poi + Spc Coj Enc Sum Nec Trl Trm Fir Ice Air Ear Poi -- cgit v1.2.3-54-g00ecf From 5bba7e89fd395a2cde9cbf596208785508e22331 Mon Sep 17 00:00:00 2001 From: Jude Brown Date: Sun, 15 Nov 2009 16:00:24 +1000 Subject: Allow MonPropsMarker to set monster descriptions and quotes. --- crawl-ref/docs/develop/levels/advanced.txt | 14 ++++++++++++++ crawl-ref/source/describe.cc | 14 ++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) (limited to 'crawl-ref/docs') diff --git a/crawl-ref/docs/develop/levels/advanced.txt b/crawl-ref/docs/develop/levels/advanced.txt index a9d986daf6..816497e4b9 100644 --- a/crawl-ref/docs/develop/levels/advanced.txt +++ b/crawl-ref/docs/develop/levels/advanced.txt @@ -742,6 +742,20 @@ dungeon cell which they are on: * veto_shatter: If this property is set to "veto" then the cell will be unaffected by the Shatter spell. +Special monster-related Lua marker properties +--------------------------------------------- + +Using the MonPropsMarker allows you to permanantly alter or mark a monster that +the marker is placed upon. The options currently available are: + +* description: If this property is set, the monster's full description (accessed + via the 'xv' command) will be set to whatever string you pass it. + +* quote: Setting this property to a string will set the monster's quote. + +* monster_dies_lua_key: If this property is set to a function, that function + will be executed upon the monster's death. + Lua API reference ----------------- a. The Map. diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index b7855e66aa..2dfb3218d3 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -2766,10 +2766,20 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf, inf.title = "A mimic"; } + // This is somewhat hackish, but it's a good way of over-riding monsters' + // descriptions in Lua vaults by using MonPropsMarker. This is also the + // method used by set_feature_desc_long, etc. {due} + if (mons.props.exists("description")) + inf.body << std::string(mons.props["description"]); // Don't get description for player ghosts. - if (mons.type != MONS_PLAYER_GHOST) + else if (mons.type != MONS_PLAYER_GHOST) inf.body << getLongDescription(db_name); - inf.quote = getQuoteString(db_name); + + // And quotes {due} + if (mons.props.exists("quote")) + inf.body << std::string(mons.props["quote"]); + else + inf.quote = getQuoteString(db_name); std::string symbol; symbol += get_monster_data(mons.type)->showchar; -- cgit v1.2.3-54-g00ecf