fiddlerwoaroof/crawl - Change AHOXABEVCSDSQXPLYA34COWVGAQVB7H3FB4KCFWK7V43IWFRLB4QC

Repairing levels for trunk. Whoops...

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

Created by j-p-e-g on October 28, 2007

AHOXABEVCSDSQXPLYA34COWVGAQVB7H3FB4KCFWK7V43IWFRLB4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/dat/large.des at line 205 [3.96290]
B:BD[3.103765] → [2.2084:2110]
```
KFEAT:   ! = amnesia trap
```
[3.103765]
[3.103791]
```
#KFEAT:   ! = amnesia trap
KFEAT:   ! = ^
```
Replacement in crawl-ref/source/dat/large.des at line 224 [3.96290]
B:BD[3.104371] → [2.2111:2166]
```
ITEM:    scroll of forgetfulness, potion of experience
```
[3.104371]
[3.104426]
```
ITEM:    any scroll, potion of experience
```

Replacement in crawl-ref/source/dat/lair.des at line 256 [3.144230]

B:BD[4.444] → [2.2168:2249]

ä adapted towards less strawberries (dp). I'm against using these outside Lair.

[4.444]

[5.5446]

# adapted towards less strawberries (dp). I'm against using these outside Lair.

Replacement in crawl-ref/source/dat/lab.des at line 109 [3.165145]
B:BD[2.3173] → [2.3173:3177]
```
MAi
```
[2.3173]
[3.167911]
```
MAP
```

Deletion in crawl-ref/source/dat/bazaar.des at line 7 [6.48488]

B:BD[6.48802] → [6.48802:48803]

B:BD[6.48803] → [2.4651:4827]


# What is still missing:
# The timer should be more generous for lower levels.
# Bazaars would also make sense outside of the dungeon (at least in the Vaults,
# Orc, and Elf).

Insertion in crawl-ref/source/dat/bazaar.des at line 31 [6.48488]

[7.11556]

[6.48970]

function random_bazaar_colour()
  local colours = {"blue", "red", "lightblue", "magenta", "green"}
  crawl.mpr("#colours = " .. #colours)
  local ret = colours[crawl.random2(#colours) + 1]
  crawl.mpr("ret = " .. ret)
  return ret
end
function fixup_bazaar()
  dgn.fixup_stairs("stone_arch", "exit_portal_vault")
  dgn.floor_halo("enter_shop", "yellow")
  if (dgn.get_floor_colour() == "black") then
    dgn.change_floor_colour(random_bazaar_colour())
  end
  if (dgn.get_rock_colour() == "black") then
    dgn.change_rock_colour("yellow")
  end
end
dgn.set_lt_callback("bazaar", "fixup_bazaar")

Replacement in crawl-ref/source/dat/bazaar.des at line 198 [6.48488]
B:BD[8.12644] → [2.4844:4845]
[8.12644]
[5.17472]
```
#
# You can force a particular colour for the rock walls or floor using
# ROCKCOL and FLOORCOL directives.
#
```

Replacement in crawl-ref/source/dat/bazaar.des at line 280 [6.48488]

B:BD[9.1793] → [2.4846:4884]

: if you.bazaar_floor() == "red" then

[9.1793]

[9.1831]

: local colour = random_bazaar_colour()
: _G.floor_colour(colour)
: if colour == "red" then

Replacement in crawl-ref/source/dat/bazaar.des at line 285 [6.48488]
B:BD[9.1851] → [2.4885:4924]
```
: if you.bazaar_floor() == "blue" then
```
[9.1851]
[9.1890]
```
: if colour == "blue" then
```

Replacement in crawl-ref/source/dat/bazaar.des at line 313 [6.48488]

B:BD[9.1953] → [2.4925:4963]

: if you.bazaar_floor() == "red" then

[9.1953]

[9.1991]

: local colour = random_bazaar_colour()
: _G.floor_colour(colour)
: if colour == "red" then

Replacement in crawl-ref/source/dat/bazaar.des at line 318 [6.48488]
B:BD[9.2011] → [2.4964:5003]
```
: if you.bazaar_floor() == "blue" then
```
[9.2011]
[9.2050]
```
: if colour == "blue" then
```

Replacement in crawl-ref/source/dat/bazaar.des at line 369 [6.48488]

B:BD[9.2113] → [2.5194:5249]

: if you.bazaar_floor() == "red" then
SUBST:   l : wWx

[9.2113]

[9.2168]

: local colour = random_bazaar_colour()
: _G.floor_colour(colour)
: if colour == "red" then
SUBST: l = w

Replacement in crawl-ref/source/dat/bazaar.des at line 374 [6.48488]
B:BD[9.2175] → [2.5250:5305]
```
: if you.bazaar_floor() == "blue" then
SUBST:   w : Wx
```
[9.2175]
[9.2230]
```
: if colour == "blue" then
SUBST: w = l
```

Replacement in crawl-ref/source/dat/bazaar.des at line 412 [6.48488]

B:BD[2.5862] → [2.5862:5917]

: if you.bazaar_floor() == "red" then
SUBST:   l : wWx

[2.5862]

[2.5917]

: local colour = random_bazaar_colour()
: _G.floor_colour(colour)
: if colour == "red" then
SUBST: l = w

Replacement in crawl-ref/source/dat/bazaar.des at line 417 [6.48488]
B:BD[2.5924] → [2.5924:5979]
```
: if you.bazaar_floor() == "blue" then
SUBST:   w : Wx
```
[2.5924]
[2.5979]
```
: if colour == "blue" then
SUBST: w = l
```
Deletion in crawl-ref/source/dat/bazaar.des at line 439 [6.48488]
B:BD[2.6735] → [2.6735:6736]

Replacement in crawl-ref/source/dat/bazaar.des at line 739 [6.48488]

B:BD[10.2864] → [2.6749:6813]

# special case for floor
: if you.bazaar_floor() == "blue" then

[10.2864]

[9.2309]

# special cases for blue floor
: local colour = random_bazaar_colour()
: _G.floor_colour(colour)
: if colour == "blue" then

Replacement in crawl-ref/source/dat/bazaar.des at line 865 [6.48488]

B:BD[9.3644] → [2.6814:6852]

: if you.bazaar_floor() == "red" then

[9.3644]

[9.3682]

: local colour = random_bazaar_colour()
: _G.floor_colour(colour)
: if colour == "red" then

Replacement in crawl-ref/source/dat/bazaar.des at line 870 [6.48488]
B:BD[9.3702] → [2.6853:6892]
```
: if you.bazaar_floor() == "blue" then
```
[9.3702]
[9.3741]
```
: if colour == "blue" then
```

Repairing levels for trunk. Whoops...

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/dat/large.des at line 205 [3.96290]

Replacement in crawl-ref/source/dat/large.des at line 224 [3.96290]

Replacement in crawl-ref/source/dat/lair.des at line 256 [3.144230]

Replacement in crawl-ref/source/dat/lab.des at line 109 [3.165145]

Deletion in crawl-ref/source/dat/bazaar.des at line 7 [6.48488]

Insertion in crawl-ref/source/dat/bazaar.des at line 31 [6.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 198 [6.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 280 [6.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 285 [6.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 313 [6.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 318 [6.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 369 [6.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 374 [6.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 412 [6.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 417 [6.48488]

Deletion in crawl-ref/source/dat/bazaar.des at line 439 [6.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 739 [6.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 865 [6.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 870 [6.48488]