From b3cefaa00ebfaaa3ed11a642326a4aaebf908cf6 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Tue, 10 Nov 2009 13:28:25 -0600 Subject: Simplify Yred's and Okawaru's sending of random servants. --- crawl-ref/source/godwrath.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'crawl-ref/source/godwrath.cc') diff --git a/crawl-ref/source/godwrath.cc b/crawl-ref/source/godwrath.cc index 371dfc2b45..d896de98c3 100644 --- a/crawl-ref/source/godwrath.cc +++ b/crawl-ref/source/godwrath.cc @@ -67,23 +67,23 @@ static bool _yred_random_zombified_hostile() static bool _okawaru_random_servant() { - monster_type mon = MONS_PROGRAM_BUG; + monster_type mon_type; const int temp_rand = random2(100); // warriors - mon = ((temp_rand < 15) ? MONS_ORC_WARRIOR : // 15% - (temp_rand < 30) ? MONS_ORC_KNIGHT : // 15% - (temp_rand < 40) ? MONS_NAGA_WARRIOR : // 10% - (temp_rand < 50) ? MONS_CENTAUR_WARRIOR : // 10% - (temp_rand < 60) ? MONS_STONE_GIANT : // 10% - (temp_rand < 70) ? MONS_FIRE_GIANT : // 10% - (temp_rand < 80) ? MONS_FROST_GIANT : // 10% - (temp_rand < 90) ? MONS_CYCLOPS : // 10% - (temp_rand < 95) ? MONS_HILL_GIANT // 5% - : MONS_TITAN); // 5% + mon_type = ((temp_rand < 15) ? MONS_ORC_WARRIOR : // 15% + (temp_rand < 30) ? MONS_ORC_KNIGHT : // 15% + (temp_rand < 40) ? MONS_NAGA_WARRIOR : // 10% + (temp_rand < 50) ? MONS_CENTAUR_WARRIOR : // 10% + (temp_rand < 60) ? MONS_STONE_GIANT : // 10% + (temp_rand < 70) ? MONS_FIRE_GIANT : // 10% + (temp_rand < 80) ? MONS_FROST_GIANT : // 10% + (temp_rand < 90) ? MONS_CYCLOPS : // 10% + (temp_rand < 95) ? MONS_HILL_GIANT // 5% + : MONS_TITAN); // 5% return (create_monster( - mgen_data::hostile_at(mon, + mgen_data::hostile_at(mon_type, true, 0, 0, you.pos(), 0, GOD_OKAWARU)) != -1); } -- cgit v1.2.3-54-g00ecf