From f3a3978b980b4c634bc31344fb3477242ec3cd8f Mon Sep 17 00:00:00 2001 From: Darshan Shaligram Date: Thu, 31 Dec 2009 17:35:53 +0530 Subject: Adjust Shoals monster depths and tweak new Shoals monsters to reduce experience overdose in the Shoals. Weaken impalers and javelineers. They should still be a threat, but more in line with the Shoals depth. --- crawl-ref/source/mon-data.h | 20 ++++++++++---------- crawl-ref/source/mon-pick.cc | 6 +++--- crawl-ref/source/wiz-mon.cc | 12 +++++++----- 3 files changed, 20 insertions(+), 18 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 5f2465e678..9b9d1b5d30 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -1122,9 +1122,9 @@ static monsterentry mondata[] = { MONS_MERFOLK_IMPALER, 'm', LIGHTBLUE, "merfolk impaler", M_WARM_BLOOD, MR_NO_FLAGS, - 500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3, - { {AT_HIT, AF_PLAIN, 34}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, - { 16, 4, 3, 0 }, + 500, 8, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3, + { {AT_HIT, AF_PLAIN, 24}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, + { 12, 5, 4, 0 }, // Impalers prefer light armour, and are dodging experts. 0, 23, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, ATTACK_ENERGY(6), @@ -1135,9 +1135,9 @@ static monsterentry mondata[] = { MONS_MERFOLK_JAVELINEER, 'm', LIGHTGREY, "merfolk javelineer", M_WARM_BLOOD | M_ARCHER, MR_NO_FLAGS, - 500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -4, - { {AT_SHOOT, AF_PLAIN, 16}, {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK }, - { 15, 4, 2, 0 }, + 500, 8, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -4, + { {AT_SHOOT, AF_PLAIN, 16}, {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK }, + { 13, 5, 2, 0 }, 0, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, MISSILE_ENERGY(8), MONUSE_MAGIC_ITEMS, MONEAT_NOTHING, SIZE_MEDIUM @@ -1147,7 +1147,7 @@ static monsterentry mondata[] = { MONS_MERFOLK_AQUAMANCER, 'm', GREEN, "merfolk aquamancer", M_WARM_BLOOD | M_SPELLCASTER | M_ACTUAL_SPELLS, MR_NO_FLAGS, - 500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -4, + 500, 8, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 15, 3, 3, 0 }, 0, 12, MST_MERFOLK_AQUAMANCER, CE_CONTAMINATED, Z_SMALL, S_SHOUT, @@ -1171,7 +1171,7 @@ static monsterentry mondata[] = { MONS_SIREN, 'm', LIGHTCYAN, "siren", M_SPELLCASTER | M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 500, 12, MONS_MERMAID, MONS_SIREN, MH_NATURAL, -7, + 500, 10, MONS_MERMAID, MONS_SIREN, MH_NATURAL, -7, { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 13, 5, 3, 0 }, 4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, @@ -3341,9 +3341,9 @@ static monsterentry mondata[] = { MONS_KRAKEN, 'X', BLACK, "kraken", M_NO_SKELETON | M_COLD_BLOOD | M_SPELLCASTER, MR_NO_FLAGS, - 3500, 20, MONS_KRAKEN, MONS_KRAKEN, MH_NATURAL, -3, + 3500, 5, MONS_KRAKEN, MONS_KRAKEN, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 50}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, - { 20, 10, 10, 0 }, + { 16, 10, 6, 0 }, 20, 0, MST_KRAKEN, CE_POISONOUS, Z_BIG, S_SILENT, I_ANIMAL, HT_WATER, FL_NONE, 10, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc index b260bc19b2..3ed21bafb6 100644 --- a/crawl-ref/source/mon-pick.cc +++ b/crawl-ref/source/mon-pick.cc @@ -1718,9 +1718,6 @@ int mons_shoals_level(int mcls) case MONS_CYCLOPS: // will have a sheep band case MONS_SIREN: case MONS_HARPY: - case MONS_MERFOLK_IMPALER: - case MONS_MERFOLK_AQUAMANCER: - case MONS_MERFOLK_JAVELINEER: mlev += 3; break; @@ -1728,6 +1725,9 @@ int mons_shoals_level(int mcls) case MONS_OKLOB_PLANT: case MONS_SHARK: case MONS_KRAKEN: + case MONS_MERFOLK_IMPALER: + case MONS_MERFOLK_AQUAMANCER: + case MONS_MERFOLK_JAVELINEER: mlev += 4; break; diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc index e237401b5d..5664e28fcf 100644 --- a/crawl-ref/source/wiz-mon.cc +++ b/crawl-ref/source/wiz-mon.cc @@ -263,7 +263,7 @@ void debug_list_monsters() std::sort(mon_nums, mon_nums + MAX_MONSTERS, _sort_monster_list); - int total_exp = 0, total_adj_exp = 0; + long total_exp = 0, total_adj_exp = 0, total_nonuniq_exp = 0; std::string prev_name = ""; int count = 0; @@ -297,6 +297,8 @@ void debug_list_monsters() int exp = exper_value(mi); total_exp += exp; + if (!mons_is_unique(mi->type)) + total_nonuniq_exp += exp; if ((mi->flags & (MF_WAS_NEUTRAL | MF_NO_REWARD)) || mi->has_ench(ENCH_ABJ)) @@ -320,13 +322,13 @@ void debug_list_monsters() if (total_adj_exp == total_exp) { - mprf("%d monsters, %d total exp value", - nfound, total_exp); + mprf("%d monsters, %ld total exp value (%ld non-uniq)", + nfound, total_exp, total_nonuniq_exp); } else { - mprf("%d monsters, %d total exp value (%d adjusted)", - nfound, total_exp, total_adj_exp); + mprf("%d monsters, %ld total exp value (%ld non-uniq, %ld adjusted)", + nfound, total_exp, total_nonuniq_exp, total_adj_exp); } } -- cgit v1.2.3-54-g00ecf