diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-02-24 05:34:35 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-02-24 05:34:35 +0100 |
| commit | 65306b0f297ae9ce4a5b2a52f055a2f2482dbad2 (patch) | |
| tree | 376bb1bec86026fdc5317a0299ade45d788f8ef7 /crawl-ref/source/zotdef.cc | |
| parent | b957c737d34260acddc671a3c7bbe9cb810665c0 (diff) | |
| parent | e8f008ab92473c7cc7a26b7a8504733b7c80a407 (diff) | |
| download | crawl-ref-65306b0f297ae9ce4a5b2a52f055a2f2482dbad2.tar.gz crawl-ref-65306b0f297ae9ce4a5b2a52f055a2f2482dbad2.zip | |
Merge branch 'master' into mon-pick
Sorry for merge commits, but rerere is pretty limited.
Diffstat (limited to 'crawl-ref/source/zotdef.cc')
| -rw-r--r-- | crawl-ref/source/zotdef.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/zotdef.cc b/crawl-ref/source/zotdef.cc index 22ec3fca87..f077f642dc 100644 --- a/crawl-ref/source/zotdef.cc +++ b/crawl-ref/source/zotdef.cc @@ -322,7 +322,7 @@ static void _ugly_wave(int power) static void _golem_wave(int power) { wave_name("GOLEM WAVE"); - monster_type golems[] = {MONS_CLAY_GOLEM, MONS_WOOD_GOLEM, MONS_STONE_GOLEM, + monster_type golems[] = {MONS_CLAY_GOLEM, MONS_STONE_GOLEM, MONS_IRON_GOLEM, MONS_CRYSTAL_GOLEM, MONS_TOENAIL_GOLEM, END}; monster_type boss[] = {MONS_ELECTRIC_GOLEM, END}; _zotdef_fill_from_list(golems, 6, power * 2 / 3); // reduced size @@ -411,7 +411,7 @@ static void _giant_wave(int power) monster_type giants[] = {MONS_ETTIN, MONS_CYCLOPS, MONS_TWO_HEADED_OGRE, MONS_OGRE, MONS_TROLL, MONS_MINOTAUR, MONS_HILL_GIANT, MONS_STONE_GIANT, MONS_FIRE_GIANT, MONS_FROST_GIANT, MONS_OGRE_MAGE, - MONS_ROCK_TROLL, MONS_IRON_TROLL, MONS_DEEP_TROLL, MONS_TITAN, END}; + MONS_IRON_TROLL, MONS_DEEP_TROLL, MONS_TITAN, END}; monster_type boss[] = {MONS_EROLCHA, MONS_POLYPHEMUS, MONS_ANTAEUS, MONS_SNORG, MONS_PURGY, MONS_STONE_GIANT, MONS_FIRE_GIANT, MONS_FROST_GIANT, MONS_TITAN, END}; |