diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-21 02:56:38 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-21 02:56:38 +0000 |
| commit | 79e31f1673c6d35c904c0f85fe4f4d688db3fcf4 (patch) | |
| tree | 629ab8e8a47fb95685b422d8aad5e1e9deabf535 | |
| parent | be9cfdbcfa7654155a6982106b685226536a4a50 (diff) | |
| download | crawl-ref-79e31f1673c6d35c904c0f85fe4f4d688db3fcf4.tar.gz crawl-ref-79e31f1673c6d35c904c0f85fe4f4d688db3fcf4.zip | |
Fix [1947495]: Adjust orc bands.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4433 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/mon-pick.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/monplace.cc | 12 | ||||
| -rw-r--r-- | crawl-ref/source/monplace.h | 11 |
3 files changed, 18 insertions, 7 deletions
diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc index d29c2dce49..2807bbae77 100644 --- a/crawl-ref/source/mon-pick.cc +++ b/crawl-ref/source/mon-pick.cc @@ -2479,6 +2479,7 @@ int mons_standard_level(int mcls) return 6; case MONS_ORC: + case MONS_ORC_PRIEST: return 7; case MONS_FUNGUS: @@ -2554,7 +2555,6 @@ int mons_standard_level(int mcls) case MONS_GOLD_MIMIC: case MONS_HYDRA: case MONS_MOTTLED_DRAGON: - case MONS_ORC_PRIEST: case MONS_POTION_MIMIC: case MONS_SCROLL_MIMIC: case MONS_SKELETAL_WARRIOR: diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index c5a21548a1..5ff67ee028 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -896,11 +896,17 @@ static band_type choose_band( int mon_type, int power, int &band_size ) if (coinflip()) break; // intentional fall-through {dlb} - case MONS_ORC_WARRIOR: + case MONS_ORC_WIZARD: band = BAND_ORCS; band_size = 2 + random2(3); break; + case MONS_ORC_PRIEST: + case MONS_ORC_WARRIOR: + band = BAND_ORC_WARRIOR; + band_size = 2 + random2(3); + break; + case MONS_BIG_KOBOLD: if (power > 3) { @@ -1312,6 +1318,10 @@ static int band_member(band_type band, int power) case BAND_ORCS: mon_type = MONS_ORC; + break; + + case BAND_ORC_WARRIOR: + mon_type = MONS_ORC; if (one_chance_in(5)) mon_type = MONS_ORC_WIZARD; if (one_chance_in(7)) diff --git a/crawl-ref/source/monplace.h b/crawl-ref/source/monplace.h index b7139abde6..daf972dfa9 100644 --- a/crawl-ref/source/monplace.h +++ b/crawl-ref/source/monplace.h @@ -23,17 +23,18 @@ enum band_type BAND_NO_BAND = 0, BAND_KOBOLDS = 1, BAND_ORCS, + BAND_ORC_WARRIOR, BAND_ORC_KNIGHT, - BAND_KILLER_BEES, - BAND_FLYING_SKULLS, // 5 + BAND_KILLER_BEES, // 5 + BAND_FLYING_SKULLS, BAND_SLIME_CREATURES, BAND_YAKS, BAND_UGLY_THINGS, - BAND_HELL_HOUNDS, - BAND_JACKALS, // 10 + BAND_HELL_HOUNDS, // 10 + BAND_JACKALS, BAND_HELL_KNIGHTS, BAND_ORC_HIGH_PRIEST, - BAND_GNOLLS, // 13 + BAND_GNOLLS, // 14 BAND_BUMBLEBEES = 16, BAND_CENTAURS, BAND_YAKTAURS, |