fiddlerwoaroof/crawl - Change BY2UVD3YLBUISKN6V2AYDMXQ6DT5D2UFYHU5MVFRU6J4COOC2DLQC

Apply Eino's patches 2495756 and 2496205. Thanks!

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8378 c06c8d41-db1a-0410-9941-cceddc491573

Created by j-p-e-g on January 10, 2009

BY2UVD3YLBUISKN6V2AYDMXQ6DT5D2UFYHU5MVFRU6J4COOC2DLQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/dat/vaults.des at line 191 [7.1041446]
B:BD[6.3092] → [6.3092:3116]
```
TAGS:   uniq_jelly_drop
```
[6.3092]
[6.3116]
```
TAGS:   uniq_jelly_drop no_wall_fixup
```
Replacement in crawl-ref/source/dat/vaults.des at line 215 [7.1041446]
B:BD[6.3521] → [6.3521:3572]
```
TAGS:   no_secret_doors no_monster_gen no_item_gen
```
[6.3521]
[6.3572]
```
TAGS:   no_secret_doors no_monster_gen no_item_gen no_wall_fixup
```

Insertion in crawl-ref/source/dat/sewer.des at line 71 [9.50909]

[2.2649]

[8.2851]

# A standard random monster list for Sewer. Use:
# : sewer_random_monster_list(_G)
{{
function sewer_random_monster_list(e)
  e.set_random_mon_list("giant bat w:20 / giant newt w:20 / small snake / \
                         ooze / worm / snake / giant mosquito w:15")
end
}}

Insertion in crawl-ref/source/dat/sewer.des at line 164 [9.50909]
[10.3199]
[8.4473]
```
: sewer_random_monster_list(_G)
```
Insertion in crawl-ref/source/dat/sewer.des at line 232 [9.50909]
[10.3456]
[8.7436]
```
: sewer_random_monster_list(_G)
```
Insertion in crawl-ref/source/dat/sewer.des at line 281 [9.50909]
[10.3625]
[8.9430]
```
: sewer_random_monster_list(_G)
```
Insertion in crawl-ref/source/dat/sewer.des at line 340 [9.50909]
[10.4194]
[10.4194]
```
: sewer_random_monster_list(_G)
```
Replacement in crawl-ref/source/dat/icecave.des at line 24 [11.2680]
B:BD[5.3925] → [5.3925:3945]
```
  local messager = 
```
[5.3925]
[5.3945]
```
  local messager =
```

Replacement in crawl-ref/source/dat/icecave.des at line 88 [11.2680]

B:BD[12.2667] → [3.2670:2747]

# Using this function will turn any ^ glyph on the map into a fog generator.

[12.2667]

[3.2747]

# Using this function will turn any ! glyph on the map into a fog generator.

Replacement in crawl-ref/source/dat/icecave.des at line 90 [11.2680]
B:BD[3.2793] → [3.2793:2835]
```
# : place_fog(_G, "freezing vapour", 200)
```
[3.2793]
[3.2835]
```
# : place_fog(_G, "freezing vapour", 25)
```

Replacement in crawl-ref/source/dat/icecave.des at line 93 [11.2680]

B:BD[3.2876] → [3.2876:3016]

   e.lua_marker(".", fog_machine { pow_max = strength, cloud_type = type,
                     delay_min = 50, delay_max = 300, size = 12,

[3.2876]

[3.3016]

   e.lua_marker("!", fog_machine { pow_max = strength, cloud_type = type,
                     delay_min = 50, delay_max = 300, size = 12,

Insertion in crawl-ref/source/dat/icecave.des at line 96 [11.2680]

[3.3058]

end
}}
# Monster set functions
# Some random monster lists are the same for multiple destination caves.
# : ice_cave_random_monster_list_natural_giant(_G)
{{
function ice_cave_random_monster_list_natural_giant(e)
  e.set_random_mon_list("wolf w:35 / yak w:35 / polar bear w:15 / death yak / \
                         frost giant w:5")
end
}}
# : ice_cave_random_monster_list_undead_demon(_G)
{{
function ice_cave_random_monster_list_undead_demon(e)
  e.set_random_mon_list("white imp w:20 / ufetubus w:20 / freezing wraith / \
                         wolf simulacrum / yak simulacrum / \
                         polar bear simulacrum / human simulacrum / \
                         elf simulacrum / orc simulacrum / \
                         draconian simulacrum / ogre simulacrum / \
                         centaur simulacrum / troll simulacrum / \
                         naga simulacrum / blue devil / ice devil / \
                         ice fiend w:5")
end
}}
# : ice_cave_random_monster_list_undead_necromancer(_G)
{{
function ice_cave_random_monster_list_undead_necromancer(e)
  e.set_random_mon_list("white imp w:20 / ufetubus w:20 / freezing wraith / \
                         wolf simulacrum / yak simulacrum / \
                         polar bear simulacrum / human simulacrum / \
                         elf simulacrum / orc simulacrum / \
                         draconian simulacrum / ogre simulacrum / \
                         centaur simulacrum / troll simulacrum / \
                         naga simulacrum / necromancer")
end
}}
# Currently, all the "caverns" maps use the same monster sets for placement.
# : ice_cave_caverns_undead_demon_monster_set(_G)
{{
function ice_cave_caverns_undead_demon_monster_set(e)
  e.mons("white imp w:5 / ufetubus w:5 / human simulacrum w:2 / \
          elf simulacrum w:2 / orc simulacrum w:2")
  e.mons("polar bear simulacrum / freezing wraith w:3 / nothing w:1")
  e.mons("ice statue")
  e.mons("ice devil")
  e.mons("draconian simulacrum / ogre simulacrum / centaur simulacrum / \
          naga simulacrum / troll simulacrum")
  e.mons("freezing wraith / blue devil")
  e.mons("patrolling ice fiend")
end
}}
# : ice_cave_caverns_natural_giant_monster_set(_G)
{{
function ice_cave_caverns_natural_giant_monster_set(e)
  e.mons("wolf / yak w:3 / nothing w:1")
  e.mons("polar bear / nothing w:5")
  e.mons("ice statue")
  e.mons("polar bear / death yak w:5")
  e.mons("polar bear / yak")
  e.mons("wolf")
  e.mons("patrolling frost giant")

Replacement in crawl-ref/source/dat/icecave.des at line 289 [11.2680]

B:BD[11.6207] → [11.6207:6359]

# foes: animals + frost giant & the ice statues
# loot: heavy weapons and rC gear wearable by big races
#       plus some useful potions in the freezer

[11.6207]

[11.6359]

# Foes: animals + frost giant & the ice statues.
# Loot: heavy weapons and rC gear wearable by big races,
#       plus some useful potions in the freezer.

Insertion in crawl-ref/source/dat/icecave.des at line 299 [11.2680]
[11.6533]
[11.6533]
```
: ice_cave_random_monster_list_natural_giant(_G)
```

Replacement in crawl-ref/source/dat/icecave.des at line 368 [11.2680]

B:BD[11.9994] → [11.9994:10044]

B:BD[11.10044] → [4.3171:3228]

# foes: ice beasts, ice dragons & the ice statues
# loot: some gold, jewellery (approximately three rings)

[11.9994]

[11.10071]

# Foes: ice beasts, ice dragons & the ice statues.
# Loot: some gold, jewellery (approximately three rings).

Insertion in crawl-ref/source/dat/icecave.des at line 377 [11.2680]
[11.10245]
[11.10245]
```
: dgn.set_random_mon_list("ice beast w:90 / ice dragon / nothing")
```

Replacement in crawl-ref/source/dat/icecave.des at line 428 [11.2680]

B:BD[11.12116] → [11.12116:12168]

B:BD[11.12168] → [4.3349:3409]

# foes: mostly in the undead vein & the ice statues
# loot: ice magic loot, gear of cold resistance (one piece)

[11.12116]

[11.12191]

# Foes: mostly in the undead vein & the ice statues.
# Loot: ice magic loot, gear of cold resistance (one piece).

Deletion in crawl-ref/source/dat/icecave.des at line 434 [11.2680]
∅:D[4.3421] → [11.12307:12330]
B:BD[11.12307] → [11.12307:12330]
```
: ice_cave_colours(_G)
```
Insertion in crawl-ref/source/dat/icecave.des at line 437 [11.2680]
[11.12422]
[11.12422]
```
: ice_cave_colours(_G)
: ice_cave_random_monster_list_undead_necromancer(_G)
```

Replacement in crawl-ref/source/dat/icecave.des at line 502 [11.2680]

B:BD[11.15354] → [11.15354:15403]

B:BD[11.15403] → [4.3422:3452]

# foes: ice devils, white imps & the ice statues
# loot: weapons and/or armour

[11.15354]

[11.15413]

# Foes: ice & blue devils, white imps & ufetubi, the ice statues.
# Loot: weapons and/or armour.

Replacement in crawl-ref/source/dat/icecave.des at line 508 [11.2680]
B:BD[4.3464] → [4.3464:3493]
```
NSUBST:  . = 9:1 / 1:1 / *:.
```
[4.3464]
[4.3493]
```
NSUBST:  . = 9:1 / 1:2 / *:.
```

Replacement in crawl-ref/source/dat/icecave.des at line 511 [11.2680]

B:BD[4.3558] → [4.3558:3591]

SUBST:   q=^, z=^, n=., b=., m=.

[4.3558]

[11.15529]

SUBST:   q=!, z=!, n=., b=., m=.
# Replaces '!'s with fog generators, then makes them floor.
: place_fog(_G, "freezing vapour", 100)
KFEAT:   ! = .
# Couple of more random, milder fog generators.
NSUBST:  . = 3:! / *:.
: place_fog(_G, "freezing vapour", 30)
KFEAT:   ! = .

Replacement in crawl-ref/source/dat/icecave.des at line 520 [11.2680]

B:BD[11.15552] → [4.3592:3674]

: place_fog(_G, "freezing vapour", 200)
MONS:    white imp, ice devil, ice statue

[11.15552]

[4.3674]

: dgn.set_random_mon_list("white imp w:35 / ufetubus w:35 / blue devil w:20 / \
:                          ice devil / nothing")
MONS:    white imp / ufetubus
MONS:    ice devil / blue devil w:3
MONS:    ice statue
MONS:    blue devil

Replacement in crawl-ref/source/dat/icecave.des at line 531 [11.2680]

B:BD[4.3916] → [4.3916:3987]

      giant spiked club ego:freezing / demon trident ego:freezing

[4.3916]

[4.3987]

      giant spiked club ego:freezing / demon trident ego:freezing

Replacement in crawl-ref/source/dat/icecave.des at line 541 [11.2680]
B:BD[4.4611] → [4.4611:4661]
```
ITEM: crystal plate mail ego:cold_resistance / \ 
```
[4.4611]
[4.4661]
```
ITEM: crystal plate mail ego:cold_resistance / \
```

Replacement in crawl-ref/source/dat/icecave.des at line 546 [11.2680]

B:BD[4.4889] → [4.4889:4949]

      crystal plate mail ego:cold_resistance good_item / \

[4.4889]

[4.4949]

      crystal plate mail ego:cold_resistance good_item / \

Replacement in crawl-ref/source/dat/icecave.des at line 553 [11.2680]

B:BD[11.15983] → [11.15983:16067]

xxxx........xxxxxxxxx..xxxxxxx...xxxxxxxx
xxx...........xxxxxx...xxx3..xxxx..xxxxxx

[11.15983]

[11.16067]

xxxx........xxxxxxxxx..xxx4xxx...xxxxxxxx
xxx...........xxxxxx...xx44..xxxx..xxxxxx

Replacement in crawl-ref/source/dat/icecave.des at line 565 [11.2680]

B:BD[4.5135] → [4.5135:5303]

xxxwxx..xxxwwxx..b.x.....N..x...Z...xxxxx
xxxwwx...xxwwxx..B.xxx..n.N.xx.ZzZ...xxxx
xxxwwxx...xxwwx.BbB..xx..N...xx.......xxx
xxxwwxxx...xwwxx.........x.n.........xxxx

[4.5135]

[11.16655]

xxxwxx..xxxwwxx4.b.x.....N..x...Z...xxxxx
xxxwwx...xxwwxx..B.xxx..n.N.xx.ZzZ..4xxxx
xxxwwxx...xxwwx4BbB..xx..N...xx.......xxx
xxxwwxxx...xwwxx.........x.n........4xxxx

Replacement in crawl-ref/source/dat/icecave.des at line 592 [11.2680]
B:BD[11.17277] → [4.5727:5759]
```
# a bit of layout randomization
```
[11.17277]
[11.17354]
```
# A bit of layout randomization.
```
Replacement in crawl-ref/source/dat/icecave.des at line 603 [11.2680]
∅:D[4.5825] → [11.17451:17511]
B:BD[11.17451] → [11.17451:17511]
```
# two different populations: undead/demon and natural/giant
```
[4.5825]
[11.17511]
```
# Two different populations: undead/demon and natural/giant.
```

Replacement in crawl-ref/source/dat/icecave.des at line 605 [11.2680]

B:BD[11.17543] → [11.17543:17862]

B:BD[11.17862] → [4.5826:5853]

MONS: white imp / human simulacrum w:2 / elf simulacrum w:2 / \
      orc simulacrum w:2
MONS: polar bear simulacrum / freezing wraith w:3 / nothing w:1
MONS: ice statue
MONS: ice devil
MONS: draconian simulacrum / ogre simulacrum / centaur simulacrum / \
      naga simulacrum / troll simulacrum
MONS: freezing wraith
MONS: patrolling ice fiend

[11.17543]

[11.17878]

: ice_cave_random_monster_list_undead_demon(_G)
: ice_cave_caverns_undead_demon_monster_set(_G)

Replacement in crawl-ref/source/dat/icecave.des at line 614 [11.2680]

B:BD[11.18239] → [11.18239:18389]

B:BD[11.18389] → [4.5854:5883]

MONS: wolf / yak w:3 / nothing w:1
MONS: polar bear / nothing w:5
MONS: ice statue
MONS: polar bear / death yak w:5
MONS: polar bear / yak
MONS: wolf
MONS: patrolling frost giant

[11.18239]

[11.18407]

: ice_cave_random_monster_list_natural_giant(_G)
: ice_cave_caverns_natural_giant_monster_set(_G)

Insertion in crawl-ref/source/dat/icecave.des at line 659 [11.2680]
[4.7640]
[4.7640]
```
# Some layout randomization.
```

Replacement in crawl-ref/source/dat/icecave.des at line 665 [11.2680]

B:BD[4.7719] → [4.7719:7802]

: ice_cave_colours(_G)
# two different populations: undead/demon and natural/giant

[4.7719]

[4.7802]

# Two different populations: undead/demon and natural/giant.

Replacement in crawl-ref/source/dat/icecave.des at line 667 [11.2680]

B:BD[4.7834] → [4.7834:8158]

MONS: white imp / human simulacrum w:2 / elf simulacrum w:2 / \
      orc simulacrum w:2
MONS: polar bear simulacrum / freezing wraith w:3 / nothing w:1
MONS: ice statue
MONS: ice devil
MONS: draconian simulacrum / ogre simulacrum / centaur simulacrum / \
      naga simulacrum / troll simulacrum
MONS: patrolling ice fiend

[4.7834]

[4.8158]

: ice_cave_random_monster_list_undead_demon(_G)
: ice_cave_caverns_undead_demon_monster_set(_G)

Replacement in crawl-ref/source/dat/icecave.des at line 676 [11.2680]

B:BD[4.8519] → [4.8519:8687]

MONS: wolf / yak w:3 / nothing w:1
MONS: polar bear / nothing w:5
MONS: ice statue
MONS: polar bear / death yak w:5
MONS: polar bear / yak
MONS: patrolling frost giant

[4.8519]

[4.8687]

: ice_cave_random_monster_list_natural_giant(_G)
: ice_cave_caverns_natural_giant_monster_set(_G)

Insertion in crawl-ref/source/dat/icecave.des at line 687 [11.2680]

[4.9134]

# As the clouds kill natural creatures off, don't place the predetermined
# generators.
SUBST: ! = .

Replacement in crawl-ref/source/dat/icecave.des at line 692 [11.2680]

B:BD[4.9189] → [4.9189:9257]

# traps:
SUBST: . = .:40 ^:1
: place_fog(_G, "freezing vapour", 50)

[4.9189]

[4.9257]

# Traps and colours:
SUBST: . = .:40 !:1
: place_fog(_G, "freezing vapour", 25)
KFEAT: ! = .
: ice_cave_colours(_G)

Replacement in crawl-ref/source/dat/icecave.des at line 708 [11.2680]

B:BD[4.9971] → [4.9971:10042]

xxxxx^xxwxxxxxxxxx.xxx..xwxx...xxxxxxxxx..xxwwwxxx.-xxxxxxxxxxxxxxxxxx

[4.9971]

[4.10042]

xxxxx.xxwxxxxxxxxx.xxx..xwxx...xxxxxxxxx..xxwwwxxx.-xxxxxxxxxxxxxxxxxx

Replacement in crawl-ref/source/dat/icecave.des at line 712 [11.2680]

B:BD[4.10255] → [4.10255:10326]

x$x..x.^..xx..xxx..xwwwwxx--xxxx-xx.1.xxxwwwwwwxxxxx....xxxxxxxxxxxxxx

[4.10255]

[4.10326]

x$x..x.!..xx..xxx..xwwwwxx--xxxx-xx.1.xxxwwwwwwxxxxx....xxxxxxxxxxxxxx

Replacement in crawl-ref/source/dat/icecave.des at line 727 [11.2680]
B:BD[4.11012] → [4.11012:11066]
```
# a bit of layout randomization for the middle part..
```
[4.11012]
[4.11066]
```
# A bit of layout randomization for the middle part.
```

Replacement in crawl-ref/source/dat/icecave.des at line 733 [11.2680]

B:BD[4.11145] → [4.11145:11205]

# two different populations: undead/demon and natural/giant

[4.11145]

[4.11205]

# Two different populations: undead/demon and natural/giant.

Replacement in crawl-ref/source/dat/icecave.des at line 735 [11.2680]

B:BD[4.11237] → [4.11237:11583]

MONS: white imp / human simulacrum w:2 / elf simulacrum w:2 / \
      orc simulacrum w:2
MONS: polar bear simulacrum / freezing wraith w:3 / nothing w:1
MONS: ice statue
MONS: ice devil
MONS: draconian simulacrum / ogre simulacrum / centaur simulacrum / \
      naga simulacrum / troll simulacrum
MONS: freezing wraith
MONS: patrolling ice fiend

[4.11237]

[4.11583]

: ice_cave_random_monster_list_undead_demon(_G)
: ice_cave_caverns_undead_demon_monster_set(_G)

Replacement in crawl-ref/source/dat/icecave.des at line 744 [11.2680]

B:BD[4.11944] → [4.11944:12123]

MONS: wolf / yak w:3 / nothing w:1
MONS: polar bear / nothing w:5
MONS: ice statue
MONS: polar bear / death yak w:5
MONS: polar bear / yak
MONS: wolf
MONS: patrolling frost giant

[4.11944]

[4.12123]

: ice_cave_random_monster_list_natural_giant(_G)
: ice_cave_caverns_natural_giant_monster_set(_G)

Replacement in crawl-ref/source/dat/icecave.des at line 757 [11.2680]

B:BD[4.12625] → [4.12625:12773]

# traps and colours:
SUBST: 3 = 3^
: place_fog(_G, "freezing vapour", 200)
SUBST: . = .:100 ~:1
SUBST: ~ = ^
: place_fog(_G, "freezing vapour", 50)

[4.12625]

[4.12773]

# Traps and colours:
SUBST: 3 = 3!
: place_fog(_G, "freezing vapour", 25)
KFEAT: ! = .
SUBST: . = .:100 ":1
SUBST: " = !
: place_fog(_G, "freezing vapour", 10)
KFEAT: ! = .

Replacement in crawl-ref/source/dat/icecave.des at line 776 [11.2680]

B:BD[4.13358] → [4.13358:13482]

xxxxxxxxxxxxxxxxxxxxxxwwwxx.~xxxwwwwwxwwxwwwxxxxxxx....xxxxxx
xxxxxxxxxxxxxxxx....xxxwwwxx..xxxwwwwwwwwwwxx<..^x...xx.xfxxx

[4.13358]

[4.13482]

xxxxxxxxxxxxxxxxxxxxxxwwwxx."xxxwwwwwxwwxwwwxxxxxxx....xxxxxx
xxxxxxxxxxxxxxxx....xxxwwwxx..xxxwwwwwwwwwwxx<..!x...xx.xfxxx

Replacement in crawl-ref/source/dat/icecave.des at line 780 [11.2680]

B:BD[4.13606] → [4.13606:13668]

xxxxxxxxxxx.4.xxx$xxxx...xwxx~..xxxxxwwwwwxwwwxxxxxxxxxx|xexx

[4.13606]

[4.13668]

xxxxxxxxxxx.4.xxx$xxxx...xwxx"..xxxxxwwwwwxwwwxxxxxxxxxx|xexx

Replacement in crawl-ref/source/dat/icecave.des at line 784 [11.2680]

B:BD[4.13854] → [4.13854:13916]

xxxxxxxxx...xxxxxxx15.5xxwwxxx'''~.xxxxwwxxxxxxxxxxxxxxxxxxxx

[4.13854]

[4.13916]

xxxxxxxxx...xxxxxxx15.5xxwwxxx'''".xxxxwwxxxxxxxxxxxxxxxxxxxx

Apply Eino's patches 2495756 and 2496205. Thanks!

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/dat/vaults.des at line 191 [7.1041446]

Replacement in crawl-ref/source/dat/vaults.des at line 215 [7.1041446]

Insertion in crawl-ref/source/dat/sewer.des at line 71 [9.50909]

Insertion in crawl-ref/source/dat/sewer.des at line 164 [9.50909]

Insertion in crawl-ref/source/dat/sewer.des at line 232 [9.50909]

Insertion in crawl-ref/source/dat/sewer.des at line 281 [9.50909]

Insertion in crawl-ref/source/dat/sewer.des at line 340 [9.50909]

Replacement in crawl-ref/source/dat/icecave.des at line 24 [11.2680]