From df1ad0a3b4c71a9273461aca8abd29fc30be544a Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 13 Sep 2009 10:50:38 +0000 Subject: Shorten Lair to 8 levels. In monster generation I collapsed monsters of Lair:1-2 to Lair:1 and Lair:3-4 to Lair:2, with the rest following as usual. Monster weights have *not* been changed. The subbranch entrances are now as follows: Swamp/Shoals: 2-5 Snake : 3-6 Slime Pits : 5-8 git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10666 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/branch.cc | 2 +- crawl-ref/source/dat/lair.des | 34 +++++++++++++++++----------------- crawl-ref/source/mon-pick.cc | 22 ++++++++-------------- crawl-ref/source/newgame.cc | 8 ++++---- 4 files changed, 30 insertions(+), 36 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index cf247bb4ad..f95ed8b96b 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -184,7 +184,7 @@ Branch branches[] = { NULL, NULL, NULL, NULL, 8, 'E', false, true }, - { BRANCH_LAIR, BRANCH_MAIN_DUNGEON, 10, 8, 0, 0, + { BRANCH_LAIR, BRANCH_MAIN_DUNGEON, 8, 8, 0, 0, DNGN_ENTER_LAIR, DNGN_RETURN_FROM_LAIR, "Lair", "the Lair of Beasts", "Lair", NULL, diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des index 8a7c0023f1..d5ab3d7864 100644 --- a/crawl-ref/source/dat/lair.des +++ b/crawl-ref/source/dat/lair.des @@ -57,7 +57,7 @@ xxxx..@..xxxx ENDMAP ################################################################################ -# Lair monsters near stair +# Lair monsters near stair # NAME: david_lair_3 TAGS: lair_entry @@ -221,7 +221,7 @@ ORIENT: float SUBST: . = G:20 B:15 . SUBST: 1 = 1:60 . SUBST: 2 = 2:60 1 . -SUBST: . = .:60 1:20 2:5 +SUBST: . = .:60 1:20 2:5 COLOUR: G = green FTILE: G = floor_grass SUBST: G = . @@ -293,7 +293,7 @@ ENDMAP # NAME: pond_and_an_island_with_a_cottage ORIENT: float -DEPTH: Lair:3-9 +DEPTH: Lair:3-7 SUBST: % = %%%%%$$$**| MONS: patrolling necromancer / necromancer SHUFFLE: 23 @@ -503,7 +503,7 @@ ENDMAP # Ice dragon lair with assorted imp pets # NAME: ice_dragon_lair_bobbens -DEPTH: Lair:5-10 +DEPTH: Lair:4-8 TAGS: no_monster_gen MONS: ice dragon MONS: w:9 white imp/w:1 nothing @@ -538,7 +538,7 @@ ENDMAP # Dragon lair embedded in wall # NAME: dragon_lair_wall_bobbens -DEPTH: Lair:5-10 +DEPTH: Lair:4-8 TAGS: no_monster_gen mini_float : if you.absdepth() >= 18 then MONS: dragon @@ -578,7 +578,7 @@ ENDMAP # Hibernating monster in a tunnel, can be pretty dangerous # NAME: hibernation_bobbens -DEPTH: Lair:5-10 +DEPTH: Lair:4-8 TAGS: allow_dup no_monster_gen no_item_gen mini_float MONS: w:5 death drake / ice dragon / dragon / swamp dragon MONS: swamp dragon / hydra / grey snake @@ -669,7 +669,7 @@ ENDMAP # Shoals specific non-ending vaults ############################################################################## - + ########################### # Shoal Ruins - nothing special, just some flavor (Enne) # Appear rarely. @@ -703,7 +703,7 @@ SUBST: ' = ' 1:5 SUBST: . = . 2:1 SUBST: ' = . MAP - ''''''''' + ''''''''' '''xx+xx''' ''xx...xx'' 'xx.....xx' @@ -713,7 +713,7 @@ MAP 'xx.....xx' ''xx...xx'' '''xxxxx''' - ''''''''' + ''''''''' ENDMAP NAME: overgrown_statue @@ -726,8 +726,8 @@ SUBST: p = 1:2 . SUBST: P = 1:20 . SUBST: G = G 2 MAP - ........ - .......... + ........ + .......... ....ppp..... ...ppppp.... ..ppPPPpp... @@ -735,8 +735,8 @@ MAP ..ppPPPpp... ...ppppp.... ....ppp..... - .......... - ........ + .......... + ........ ENDMAP NAME: shoals_oasis @@ -748,13 +748,13 @@ SUBST: W = W . SUBST: w = W w SUBST: _ = w MAP - ... - ..W.. + ... + ..W.. ..WwW.. .Ww_wW. ..WwW.. - ..W.. - ... + ..W.. + ... ENDMAP diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc index 592a62f99b..b7f339abf3 100644 --- a/crawl-ref/source/mon-pick.cc +++ b/crawl-ref/source/mon-pick.cc @@ -1329,12 +1329,9 @@ int mons_lair_level(int mcls) case MONS_GIANT_NEWT: case MONS_RAT: case MONS_QUOKKA: - mlev += 0; - break; - case MONS_GIANT_CENTIPEDE: case MONS_GIANT_IGUANA: - mlev++; + mlev += 0; break; case MONS_GIANT_FROG: @@ -1342,12 +1339,9 @@ int mons_lair_level(int mcls) case MONS_GREY_RAT: case MONS_HOUND: case MONS_BLACK_BEAR: - mlev += 2; - break; - case MONS_WORM: case MONS_WOLF: - mlev += 3; + mlev++; break; case MONS_FUNGUS: @@ -1357,7 +1351,7 @@ int mons_lair_level(int mcls) case MONS_GREEN_RAT: case MONS_SCORPION: case MONS_SNAKE: - mlev += 4; + mlev += 2; break; case MONS_WATER_MOCCASIN: @@ -1370,7 +1364,7 @@ int mons_lair_level(int mcls) case MONS_WAR_DOG: case MONS_YELLOW_WASP: case MONS_BEAR: - mlev += 5; + mlev += 3; break; case MONS_BLINK_FROG: @@ -1383,7 +1377,7 @@ int mons_lair_level(int mcls) case MONS_WOLF_SPIDER: case MONS_YAK: case MONS_GRIZZLY_BEAR: - mlev += 6; + mlev += 4; break; case MONS_BLACK_MAMBA: @@ -1395,7 +1389,7 @@ int mons_lair_level(int mcls) case MONS_WYVERN: case MONS_TRAPDOOR_SPIDER: case MONS_ROCK_WORM: - mlev += 7; + mlev += 5; break; case MONS_ELEPHANT_SLUG: @@ -1404,14 +1398,14 @@ int mons_lair_level(int mcls) case MONS_LINDWURM: case MONS_REDBACK: case MONS_WANDERING_MUSHROOM: - mlev += 8; + mlev += 6; break; case MONS_BORING_BEETLE: case MONS_BOULDER_BEETLE: case MONS_DEATH_YAK: case MONS_SPINY_WORM: - mlev += 9; + mlev += 7; break; default: diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 9a7b50b4fc..0833efcb87 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -691,18 +691,18 @@ static void _initialise_branch_depths() branches[BRANCH_ELVEN_HALLS].startdepth = random_range(3, 4); branches[BRANCH_LAIR].startdepth = random_range(8, 13); branches[BRANCH_HIVE].startdepth = random_range(11, 16); - branches[BRANCH_SLIME_PITS].startdepth = random_range(8, 10); + branches[BRANCH_SLIME_PITS].startdepth = random_range(5, 8); if ( coinflip() ) { - branches[BRANCH_SWAMP].startdepth = random_range(2, 7); + branches[BRANCH_SWAMP].startdepth = random_range(2, 5); branches[BRANCH_SHOALS].startdepth = -1; } else { branches[BRANCH_SWAMP].startdepth = -1; - branches[BRANCH_SHOALS].startdepth = random_range(2, 7); + branches[BRANCH_SHOALS].startdepth = random_range(2, 5); } - branches[BRANCH_SNAKE_PIT].startdepth = random_range(3, 8); + branches[BRANCH_SNAKE_PIT].startdepth = random_range(3, 6); branches[BRANCH_VAULTS].startdepth = random_range(14, 19); branches[BRANCH_CRYPT].startdepth = random_range(2, 4); branches[BRANCH_HALL_OF_BLADES].startdepth = random_range(4, 6); -- cgit v1.2.3-54-g00ecf