fiddlerwoaroof/crawl - Change NKCSON6P6JR4UKW23LKLGNRB4EFPOI2C3JX5RHNDFLJB3AIJW2NQC

Deprecate various symbols for vault making:

F (was granite statue or rarely hostile statue), P (was non-guaranteed rune), R (was chance between honeycomb and royal jelly). Patch by Zaba.

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

Created by dploog on June 26, 2009

NKCSON6P6JR4UKW23LKLGNRB4EFPOI2C3JX5RHNDFLJB3AIJW2NQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/dungeon.cc at line 4705 [5.3429798]

B:BD[3.150638] → [4.34512:34554]

∅:D[4.34554] → [6.206:389]

B:BD[6.206] → [6.206:389]

B:BD[6.389] → [7.9805:9808]

static monster_type _random_evil_statue()
{
    switch (random2(3))
    {
    case 0: return MONS_ORANGE_STATUE;
    case 1: return MONS_SILVER_STATUE;
    case 2: return MONS_ICE_STATUE;
    }
    return (MONS_PROGRAM_BUG);
}

Deletion in crawl-ref/source/dungeon.cc at line 4811 [5.3429798]
B:BD[6.394] → [6.394:465]
B:BD[6.465] → [2.6889:6966]
∅:D[8.2763] → [6.591:597]
∅:D[2.6966] → [6.591:597]
∅:D[9.50515] → [6.591:597]
∅:D[10.84507] → [6.591:597]
B:BD[6.591] → [6.591:597]
B:BD[6.597] → [11.14747:14748]
```
    if (vgrid == 'F' && one_chance_in(100))
    {
        vgrid = '.';
        create_monster(mgen_data::hostile_at(_random_evil_statue(), where));
    }
```
Deletion in crawl-ref/source/dungeon.cc at line 4840 [5.3429798]
∅:D[4.35647] → [6.598:656]
B:BD[5.3606774] → [6.598:656]
```
                   (vgrid == 'F') ? DNGN_GRANITE_STATUE :
```
Deletion in crawl-ref/source/dungeon.cc at line 4878 [5.3429798]
B:BD[5.3608009] → [12.16621:16639]
```
        case 'R':
```
Deletion in crawl-ref/source/dungeon.cc at line 4882 [5.3429798]
B:BD[12.16711] → [12.16711:16764]
```
        case 'P':                   // possible rune
```
Deletion in crawl-ref/source/dungeon.cc at line 4889 [5.3429798]
B:BD[5.3608405] → [5.3608405:3608483]
```
            bool possible_rune = one_chance_in(3);      // lame, I know {dlb}
```

Replacement in crawl-ref/source/dungeon.cc at line 4891 [5.3429798]

B:BD[5.3608512] → [5.3608512:3608777]

            if (vgrid == 'R')
            {
                which_class = OBJ_FOOD;
                which_type = (one_chance_in(3) ? FOOD_ROYAL_JELLY
                                               : FOOD_HONEYCOMB);
            }
            else if (vgrid == '$')

[5.3608512]

[5.3608777]

            if (vgrid == '$')

Replacement in crawl-ref/source/dungeon.cc at line 4906 [5.3429798]

B:BD[5.3609189] → [11.14809:14843]

B:BD[11.14843] → [13.7613:7756]

            else if (vgrid == '|'
                    || (vgrid == 'P' && (!possible_rune || place.num_runes > 0))
                    || (vgrid == 'O' && place.num_runes > 0))

[5.3609189]

[5.3609355]

            else if (vgrid == '|' || (vgrid == 'O' && place.num_runes > 0))

Replacement in crawl-ref/source/dungeon.cc at line 4911 [5.3429798]
B:BD[5.3609482] → [5.3609482:3609548]
```
            else              // for 'P' (1 out of 3 times) {dlb}
```
[5.3609482]
[5.3609548]
```
            else
```

Replacement in crawl-ref/source/dungeon.cc at line 4944 [5.3429798]

∅:D[13.8069] → [12.16910:16988]

B:BD[12.16910] → [12.16910:16988]

            if (vgrid == '|' || vgrid == 'P' || vgrid == 'O' || vgrid == 'Z')

[13.8069]

[12.16988]

            if (vgrid == '|' || vgrid == 'O' || vgrid == 'Z')

Insertion in crawl-ref/source/dat/pan.des at line 265 [14.51834]
[14.62150]
[14.62150]
```
SUBST: P = O..
```
Insertion in crawl-ref/source/dat/pan.des at line 286 [14.51834]
[14.62430]
[14.62430]
```
SUBST: P = O..
```
Insertion in crawl-ref/source/dat/pan.des at line 367 [14.51834]
[14.63562]
[14.63562]
```
SUBST: P = O..
```
Insertion in crawl-ref/source/dat/mini.des at line 496 [14.75280]
[14.80583]
[14.80583]
```
KITEM: R = w:2 honeycomb / w:1 royal jelly
```
Insertion in crawl-ref/source/dat/mini.des at line 782 [14.75280]
[15.3401]
[14.85671]
```
KITEM: R = w:2 honeycomb / w:1 royal jelly
```

Insertion in crawl-ref/source/dat/mini.des at line 804 [14.75280]

[15.3435]

[14.85929]

SUBST: F = G:100 F:1
KMONS: F = orange crystal statue / silver statue / ice statue

Insertion in crawl-ref/source/dat/mini.des at line 916 [14.75280]
[14.87520]
[14.87520]
```
SUBST: F = G:100 F:1
KMONS: F = orange crystal statue / silver statue / ice statue
```

Insertion in crawl-ref/source/dat/mini.des at line 1576 [14.75280]

[16.14479]

[17.558]

SUBST:  F = G:100 F:1
KMONS:  F = orange crystal statue / silver statue / ice statue

Insertion in crawl-ref/source/dat/lair.des at line 172 [14.144230]
[14.148630]
[18.14246]
```
KITEM:   R = w:2 honeycomb / w:1 royal jelly
```
Insertion in crawl-ref/source/dat/hive.des at line 25 [14.173047]
[14.173699]
[14.173699]
```
KITEM: R = w:2 honeycomb / w:1 royal jelly
```
Insertion in crawl-ref/source/dat/hive.des at line 185 [14.173047]
[18.17915]
[17.3559]
```
KITEM:     R = w:2 honeycomb / w:1 royal jelly
```
Replacement in crawl-ref/source/dat/hive.des at line 187 [14.173047]
B:BD[17.3608] → [17.3608:3625]
```
KFEAT:     R = R
```
[17.3608]
[17.3625]
```
KFEAT:     R = .
```
Insertion in crawl-ref/source/dat/hive.des at line 481 [14.173047]
[18.18838]
[14.177260]
```
KITEM:  R = w:2 honeycomb / w:1 royal jelly
```
Insertion in crawl-ref/source/dat/float.des at line 214 [14.216297]
[14.225662]
[14.225662]
```
SUBST:   F = G:100 F:1
KMONS:   F = orange crystal statue / silver statue / ice statue
```
Deletion in crawl-ref/docs/level_design.txt at line 196 [19.350]
B:BD[19.7327] → [20.1127:1204]
```
 F - Usually a Granite Statue, but may be Orange or Silver or Ice (1 in 100)
```

Insertion in crawl-ref/docs/level_design.txt at line 200 [19.350]

[19.7583]

     NOTE: F used to put down a granite Statue most of the time but occasionally
     Orange or Silver or Ice statues (1 in 100). You can reproduce this by using
     F on the map together with
     SUBST:   F = G:100 F:1
     KMONS:   F = orange crystal statue / silver statue / ice statue

Deletion in crawl-ref/docs/level_design.txt at line 211 [19.350]
B:BD[21.3221] → [22.4012:4087]
∅:D[22.4087] → [23.5043:5268]
B:BD[24.4017] → [23.5043:5268]
∅:D[23.5268] → [24.4243:4272]
B:BD[24.4243] → [24.4243:4272]
∅:D[21.3570] → [19.7653:7654]
∅:D[24.4272] → [19.7653:7654]
∅:D[25.5930] → [19.7653:7654]
B:BD[19.7653] → [19.7653:7654]
B:BD[19.7654] → [26.2726:2798]
∅:D[26.2798] → [22.4164:4241]
B:BD[22.4164] → [22.4164:4241]
∅:D[22.4241] → [24.4428:4445]
B:BD[24.4428] → [24.4428:4445]
∅:D[21.3736] → [19.8196:8197]
∅:D[24.4445] → [19.8196:8197]
B:BD[19.8196] → [19.8196:8197]
```
Note: Due to the level maker having seen incremental improvements over the
years, there are some inconsistencies. For examples, dangerous statues (ice,
orange, silver) are now genuine monsters. In particular, you might see many
older vaults still using the deprecated 'H' and 'S' glyphs which should
otherwise be dispensed with.
Similarly, most of the other feature glyphs can be replaced with KFEAT:
lines. The same goes for some item glyphs ('R', 'Z') which could be replaced
by KITEM: lines.
```
Deletion in crawl-ref/docs/level_design.txt at line 218 [19.350]
B:BD[19.8404] → [19.8404:8481]
```
 P - maybe place a rune here (50%)
 R - honeycomb (2/3) or royal jelly (1/3)
```

Insertion in crawl-ref/docs/level_design.txt at line 220 [19.350]

[19.8574]


NOTE: The P (place a rune here with 1/3 chance) and R (place a honeycomb with
      2/3 chance or else a royal jelly) symbols have been deprecated. You can
      (and should) produce the desired behaviour using
      SUBST: P = O..
      KITEM: R = w:2 honeycomb / w:1 royal jelly

Deprecate various symbols for vault making:

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/dungeon.cc at line 4705 [5.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 4811 [5.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 4840 [5.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 4878 [5.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 4882 [5.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 4889 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4891 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4906 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4911 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4944 [5.3429798]

Insertion in crawl-ref/source/dat/pan.des at line 265 [14.51834]

Insertion in crawl-ref/source/dat/pan.des at line 286 [14.51834]

Insertion in crawl-ref/source/dat/pan.des at line 367 [14.51834]

Insertion in crawl-ref/source/dat/mini.des at line 496 [14.75280]

Insertion in crawl-ref/source/dat/mini.des at line 782 [14.75280]

Insertion in crawl-ref/source/dat/mini.des at line 804 [14.75280]

Insertion in crawl-ref/source/dat/mini.des at line 916 [14.75280]

Insertion in crawl-ref/source/dat/mini.des at line 1576 [14.75280]

Insertion in crawl-ref/source/dat/lair.des at line 172 [14.144230]

Insertion in crawl-ref/source/dat/hive.des at line 25 [14.173047]

Insertion in crawl-ref/source/dat/hive.des at line 185 [14.173047]

Replacement in crawl-ref/source/dat/hive.des at line 187 [14.173047]

Insertion in crawl-ref/source/dat/hive.des at line 481 [14.173047]

Insertion in crawl-ref/source/dat/float.des at line 214 [14.216297]

Deletion in crawl-ref/docs/level_design.txt at line 196 [19.350]

Insertion in crawl-ref/docs/level_design.txt at line 200 [19.350]

Deletion in crawl-ref/docs/level_design.txt at line 211 [19.350]

Deletion in crawl-ref/docs/level_design.txt at line 218 [19.350]

Insertion in crawl-ref/docs/level_design.txt at line 220 [19.350]