From 033b2f5904e3a87e5ce2605b2779be860bf46682 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 1 Jun 2008 12:27:44 +0000 Subject: Fix 1937489: Remove map markers overwritten by lakes or rivers, as was already done for vaults. Modify monster speech to make the beast only use some selected shouts (i.e. not "You hear an irritating whine") and NEVER do the demon taunts since it cannot speak. Demon lords can use almost the whole array of speaking verbs except for "buzz" and "whine". git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5400 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/mapdef.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'crawl-ref/source/mapdef.cc') diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index d330a6e666..135da21ca1 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -1950,9 +1950,9 @@ mons_list::mons_spec_slot mons_list::parse_mons_spec(std::string spec) if (mspec.genweight == TAG_UNFOUND || mspec.genweight <= 0) mspec.genweight = 10; - mspec.fix_mons = strip_tag(mon_str, "fix_mons"); + mspec.fix_mons = strip_tag(mon_str, "fix_mons"); mspec.generate_awake = strip_tag(mon_str, "generate_awake"); - mspec.patrolling = strip_tag(mon_str, "patrolling"); + mspec.patrolling = strip_tag(mon_str, "patrolling"); std::string colour = strip_tag_prefix(mon_str, "col:"); if (!colour.empty()) @@ -1985,9 +1985,9 @@ mons_list::mons_spec_slot mons_list::parse_mons_spec(std::string spec) return (slot); } - mspec.mid = nspec.mid; + mspec.mid = nspec.mid; mspec.monbase = nspec.monbase; - mspec.number = nspec.number; + mspec.number = nspec.number; } if (mspec.items.size() > 0) @@ -2056,10 +2056,10 @@ void mons_list::get_zombie_type(std::string s, mons_spec &spec) const // This order must match zombie_types, indexed from one. static const monster_type zombie_montypes[][2] = - { - { MONS_PROGRAM_BUG, MONS_PROGRAM_BUG }, - { MONS_ZOMBIE_SMALL, MONS_ZOMBIE_LARGE }, - { MONS_SKELETON_SMALL, MONS_SKELETON_LARGE }, + { // small // large + { MONS_PROGRAM_BUG, MONS_PROGRAM_BUG }, + { MONS_ZOMBIE_SMALL, MONS_ZOMBIE_LARGE }, + { MONS_SKELETON_SMALL, MONS_SKELETON_LARGE }, { MONS_SIMULACRUM_SMALL, MONS_SIMULACRUM_LARGE } }; -- cgit v1.2.3-54-g00ecf