fiddlerwoaroof/crawl - Change ADKWRQ4QN4WGEGH2X66IJX6AWEUKEY5YTD4NSFWZIXR24BNLPN6QC

Fix 2792807: Autoexplore attempting to open doors in bat form.

Fix 2792782: vaults not initialising blood potions properly

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

Created by j-p-e-g on May 17, 2009

ADKWRQ4QN4WGEGH2X66IJX6AWEUKEY5YTD4NSFWZIXR24BNLPN6QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.cc at line 655 [5.39949]

[3.927]

[4.1021]


        if (!player_can_open_doors())
            _set_pass_feature(DNGN_CLOSED_DOOR, IMPASSABLE);

Insertion in crawl-ref/source/player.h at line 329 [6.945993]

[6.957905]

/* ***********************************************************************
 * called from: acr - travel
 * *********************************************************************** */
bool player_can_open_doors();

Insertion in crawl-ref/source/player.cc at line 428 [6.962854]

[7.2698]

[8.2159]

}
bool player_can_open_doors()
{
    // Bats can't close/open doors.
    return (you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT);

Insertion in crawl-ref/source/misc.cc at line 241 [6.1933596]

[9.11303]

[10.4134]

static void _compare_blood_quantity(item_def &stack, int timer_size)
{
    if (timer_size != stack.quantity)
    {
        mprf(MSGCH_WARN,
             "ERROR: blood potion quantity (%d) doesn't match timer (%d)",
             stack.quantity, timer_size);
        // sanity measure
        stack.quantity = timer_size;
    }
}

Replacement in crawl-ref/source/misc.cc at line 267 [6.1933596]
B:BD[9.11720] → [10.4364:4408]
```
    ASSERT(timer.size() == blood.quantity);
```
[9.11720]
[9.11720]
```
    _compare_blood_quantity(blood, timer.size());
```

Replacement in crawl-ref/source/misc.cc at line 380 [6.1933596]

B:BD[10.5787] → [10.5787:5835]

        ASSERT(timer.size() == blood.quantity);

[10.5787]

[10.5835]

        _compare_blood_quantity(blood, timer.size());

Replacement in crawl-ref/source/misc.cc at line 420 [6.1933596]
B:BD[10.6787] → [10.6787:6831]
```
    ASSERT(timer.size() == blood.quantity);
```
[10.6787]
[10.6831]
```
    _compare_blood_quantity(blood, timer.size());
```
Replacement in crawl-ref/source/misc.cc at line 471 [6.1933596]
B:BD[10.7916] → [10.7916:7960]
```
    ASSERT(timer.size() == blood.quantity);
```
[10.7916]
[10.7960]
```
    _compare_blood_quantity(blood, timer.size());
```

Replacement in crawl-ref/source/misc.cc at line 532 [6.1933596]

B:BD[10.9497] → [10.9497:9549]

            ASSERT(blood.quantity == timer.size());

[10.9497]

[10.9549]

            _compare_blood_quantity(blood, timer.size());

Replacement in crawl-ref/source/misc.cc at line 579 [6.1933596]

B:BD[10.10918] → [10.10918:10974]

                ASSERT(timer.size() == blood.quantity);

[10.10918]

[10.10974]

                _compare_blood_quantity(blood, timer.size());

Replacement in crawl-ref/source/misc.cc at line 623 [6.1933596]
∅:D[11.4356] → [10.12214:12262]
B:BD[10.12214] → [10.12214:12262]
```
        ASSERT(timer.size() == blood.quantity);
```
[11.4356]
[10.12262]
```
        _compare_blood_quantity(blood, timer.size());
```
Replacement in crawl-ref/source/misc.cc at line 667 [6.1933596]
∅:D[10.13566] → [12.4132:4180]
B:BD[12.4132] → [12.4132:4180]
```
        ASSERT(timer.size() == blood.quantity);
```
[10.13566]
[10.13567]
```
        _compare_blood_quantity(blood, timer.size());
```

Replacement in crawl-ref/source/misc.cc at line 706 [6.1933596]

B:BD[10.14821] → [10.14821:14873]

            ASSERT(timer.size() == blood.quantity);

[10.14821]

[10.14873]

            _compare_blood_quantity(blood, timer.size());

Replacement in crawl-ref/source/misc.cc at line 758 [6.1933596]
B:BD[10.15385] → [10.15385:15433]
```
        ASSERT(timer.size() == blood.quantity);
```
[10.15385]
[10.15433]
```
        _compare_blood_quantity(blood, timer.size());
```
Insertion in crawl-ref/source/dungeon.cc at line 4421 [6.3429798]
[13.3736]
[13.3736]
```
        {
```

Insertion in crawl-ref/source/dungeon.cc at line 4423 [6.3429798]

[13.3774]

[14.473]

            if (is_blood_potion(item))
                init_stack_blood_potions(item);
        }

Replacement in crawl-ref/source/directn.cc at line 567 [6.3697945]

B:BD[2.6635] → [2.6635:6685]

    if (list_mons.size() + list_items.size() > 52

[2.6635]

[2.6685]

    if (list_mons.size() + list_items.size() + list_features.size() > 52

Replacement in crawl-ref/source/dat/entry.des at line 61 [16.591]

B:BD[15.3005] → [15.3005:3239]

# Player monsters (no vampire or ogre-mages because they can get out of their 
# cells or create threats outside; no merfolk, alive or undead, because they 
# insist on having deep water in their cells, which annoys me; other player

[15.3005]

[15.3239]

# Player monsters (no vampire or ogre-mages because they can get out of their
# cells or create threats outside; no merfolk, alive or undead, because they
# insist on having deep water in their cells, which annoys me; other player

Replacement in crawl-ref/source/dat/entry.des at line 67 [16.591]
B:BD[17.21386] → [17.21386:21412]
```
           mummy / ghoul 
```
[17.21386]
[15.3431]
```
           mummy / ghoul
```

Replacement in crawl-ref/source/dat/entry.des at line 77 [16.591]

∅:D[17.21827] → [15.3956:4034]

B:BD[15.3956] → [15.3956:4034]

# And now for something completely different (if any of these turn out to be

[17.21827]

[15.4034]

# And now for something completely different (if any of these turn out to be

Replacement in crawl-ref/source/dat/entry.des at line 183 [16.591]

B:BD[18.8361] → [17.22283:22357]

# This vault is great. If need be, we may delegate it to another branch,

[18.8361]

[17.22357]

# This vault is great. If need be, we may delegate it to another branch,

Replacement in crawl-ref/source/dat/entry.des at line 284 [16.591]

B:BD[19.4841] → [19.4841:4919]

############################################################################

[19.4841]

[20.2709]

############################################################################

Replacement in crawl-ref/source/dat/entry.des at line 304 [16.591]

B:BD[19.5400] → [19.5400:5478]

############################################################################

[19.5400]

[19.5478]

############################################################################

Replacement in crawl-ref/source/dat/entry.des at line 395 [16.591]
B:BD[21.7841] → [21.7841:7869]
```
         ...!!!!!+!!!!!... 
```
[21.7841]
[21.7869]
```
         ...!!!!!+!!!!!...
```

Replacement in crawl-ref/source/dat/entry.des at line 546 [16.591]

B:BD[22.17668] → [23.3367:3389]

∅:D[23.3389] → [16.3686:3906]

B:BD[16.3686] → [16.3686:3906]

xxxxx{.......}xxxxx  
xxxxx.........xxxxx  
xwxxx.........xxxxx  
xwwxx.........xxxxx  
xwwwx.........xxxxx  
xxwwx.........xxxxx  
xxwwXw........xxxxx  
xxxXwwwwwww...xxxxx  
xxxxXwwwwYYwwZxxxxx  
xxxxxXwwYwwwwwZwxxx  
xxxxx...wwwwwZwwwxx

[22.17668]

[22.17669]

xxxxx{.......}xxxxx
xxxxx.........xxxxx
xwxxx.........xxxxx
xwwxx.........xxxxx
xwwwx.........xxxxx
xxwwx.........xxxxx
xxwwXw........xxxxx
xxxXwwwwwww...xxxxx
xxxxXwwwwYYwwZxxxxx
xxxxxXwwYwwwwwZwxxx
xxxxx...wwwwwZwwwxx

Replacement in crawl-ref/source/dat/entry.des at line 558 [16.591]

∅:D[22.17689] → [16.3928:4038]

B:BD[16.3928] → [16.3928:4038]

xxxxx.........xwwwx  
xxxxx.........xxwwx  
xxxxx.........xxxwx  
xxxxx.........xxxxx  
xxxxx....@....xxxxx

[22.17689]

[24.9744]

xxxxx.........xwwwx
xxxxx.........xxwwx
xxxxx.........xxxwx
xxxxx.........xxxxx
xxxxx....@....xxxxx

Replacement in crawl-ref/source/dat/entry.des at line 565 [16.591]

B:BD[24.9752] → [25.635:706]

# Notes: chances are high that there is a shallow water path. Even if

[24.9752]

[25.706]

# Notes: chances are high that there is a shallow water path. Even if

Replacement in crawl-ref/source/dat/entry.des at line 573 [16.591]

∅:D[26.14952] → [24.9861:9889]

∅:D[17.23381] → [24.9861:9889]

B:BD[24.9861] → [24.9861:9889]

B:BD[24.9889] → [23.3408:3430]

∅:D[23.3430] → [24.9911:10021]

B:BD[24.9911] → [24.9911:10021]

MAP  
xxxxxxxxxxxxxxxxxxx  
xxxWA{.......}xxxxx  
xxwWx.........xxxxx  
xwwWB.........xxxxx  
xwwWx.........xxxxx  
xwwWC.........xxxxx  
xxWwx.........xxxxx

[26.14952]

[24.10021]

MAP
xxxxxxxxxxxxxxxxxxx
xxxWA{.......}xxxxx
xxwWx.........xxxxx
xwwWB.........xxxxx
xwwWx.........xxxxx
xwwWC.........xxxxx
xxWwx.........xxxxx

Replacement in crawl-ref/source/dat/entry.des at line 582 [16.591]

B:BD[24.10041] → [24.10041:10261]

xWxwwwwwwww...xxxxx  
xWxxwwwwwwwwwwxxxxx  
xxWxxwwwwwwwwwwwxxx  
xxWxx...wwwwwwwwwxx  
xxwWx........wwwwxx  
xwxw+.........xwwwx  
xwxxx.........xxwwx  
xxxxx.........xxxwx  
xxxxx.........xxxxx  
xxxxx.........xxxxx

[24.10041]

[16.4038]

xWxwwwwwwww...xxxxx
xWxxwwwwwwwwwwxxxxx
xxWxxwwwwwwwwwwwxxx
xxWxx...wwwwwwwwwxx
xxwWx........wwwwxx
xwxw+.........xwwwx
xwxxx.........xxwwx
xxxxx.........xxxwx
xxxxx.........xxxxx
xxxxx.........xxxxx

Replacement in crawl-ref/source/dat/entry.des at line 2909 [16.591]

B:BD[16.71289] → [27.18074:18167]

   ........................   
   ............cc..........   
  d......cc....cc....cc....e

[16.71289]

[16.71382]

   ........................
   ............cc..........
  d......cc....cc....cc....e

Replacement in crawl-ref/source/dat/entry.des at line 2925 [16.591]

B:BD[16.71785] → [27.18168:18261]

  f....cc....cc....cc......}  
   ..........cc............   
   ........................

[16.71785]

[16.71878]

  f....cc....cc....cc......}
   ..........cc............
   ........................

Replacement in crawl-ref/source/dat/entry.des at line 2936 [16.591]

B:BD[16.71982] → [27.18285:18366]

   ....................   
   .........cc.........   
   .........cc.........

[16.71982]

[16.72063]

   ....................
   .........cc.........
   .........cc.........

Replacement in crawl-ref/source/dat/entry.des at line 2949 [16.591]

B:BD[16.72333] → [27.18367:18448]

   .........cc.........   
   .........cc.........   
   ....................

[16.72333]

[16.72414]

   .........cc.........
   .........cc.........
   ....................

Replacement in crawl-ref/source/dat/entry.des at line 3130 [16.591]

B:BD[16.75543] → [27.18449:18725]

xxxxxx>lllllllllll..  
xxxxxxlClllllllll?..  
xxxxxxlllllllll??...  
xxxxxxllllllllll....  
xxxxxxllllllllll....  
xxxxxxllllllllll....  
xxxxxxlllllllll?....  
xxxxxxlllllllll.....  
xxxxxxllllllll?.....  
xxxxxxl?ll?ll?.....{  
xxxxxxll.??....       
xxxxxxl.........

[16.75543]

[16.75819]

xxxxxx>lllllllllll..
xxxxxxlClllllllll?..
xxxxxxlllllllll??...
xxxxxxllllllllll....
xxxxxxllllllllll....
xxxxxxllllllllll....
xxxxxxlllllllll?....
xxxxxxlllllllll.....
xxxxxxllllllll?.....
xxxxxxl?ll?ll?.....{
xxxxxxll.??....
xxxxxxl.........

Replacement in crawl-ref/source/dat/entry.des at line 3159 [16.591]

B:BD[27.18749] → [27.18749:18979]

xxxxxxwwwwwwwwwwww..  
xxxxxxwwwwwwwwwwww..  
xxxxxxwwwwwwwwwww...  
xxxxxxwwwwwwwwwww...  
xxxxxxwwwwwwwwww....  
xxxxxxwwwwwwwwww....  
xxxxxxwwwwwwwww.....  
xxxxxxwwwwwwww.....{  
xxxxxxwwwwww.....     
xxxxxxw..........

[27.18749]

[16.76373]

xxxxxxwwwwwwwwwwww..
xxxxxxwwwwwwwwwwww..
xxxxxxwwwwwwwwwww...
xxxxxxwwwwwwwwwww...
xxxxxxwwwwwwwwww....
xxxxxxwwwwwwwwww....
xxxxxxwwwwwwwww.....
xxxxxxwwwwwwww.....{
xxxxxxwwwwww.....
xxxxxxw..........

Replacement in crawl-ref/source/dat/entry.des at line 3461 [16.591]
B:BD[24.13517] → [17.33920:33940]
```
 ......bbbbbb..... 
```
[24.13517]
[17.33940]
```
 ......bbbbbb.....
```
Replacement in crawl-ref/source/dat/entry.des at line 3473 [16.591]
B:BD[28.397] → [28.397:424]
```
MONS: w:30 nothing / ooze 
```
[28.397]
[28.424]
```
MONS: w:30 nothing / ooze
```
Replacement in crawl-ref/source/dat/entry.des at line 3477 [16.591]
∅:D[17.34098] → [29.4133:4205]
B:BD[29.4133] → [29.4133:4205]
```
# There is a very slight chance that a jelly or an intelligent monster 
```
[17.34098]
[27.19357]
```
# There is a very slight chance that a jelly or an intelligent monster
```

Replacement in crawl-ref/source/dat/entry.des at line 3506 [16.591]

B:BD[24.14168] → [25.1073:1296]

# Monsters are easier. Made it harder for them to get out. The single orc 
# can pack a punch, though. His window is secret, so autoexploring won't 
# notice, except for characters with starting Traps and Doors skill, who

[24.14168]

[25.1296]

# Monsters are easier. Made it harder for them to get out. The single orc
# can pack a punch, though. His window is secret, so autoexploring won't
# notice, except for characters with starting Traps and Doors skill, who

Replacement in crawl-ref/source/dat/entry.des at line 3522 [16.591]

B:BD[24.14342] → [24.14342:14402]

B:BD[24.14402] → [25.1501:1531]

∅:D[25.1531] → [24.14432:14462]

B:BD[24.14432] → [24.14432:14462]

B:BD[24.14462] → [30.480:510]

     xxxxxxxxxBxxxxxxxxx     
    xxxxx...........xxxxx    
   xxx...xxxxx=xxxxx...xxx   
  xx..xxxxxlllllllxxxxx..xx  
 xx.xxxxxlll.....lllxxxxx.xx

[24.14342]

[25.1532]

     xxxxxxxxxBxxxxxxxxx
    xxxxx...........xxxxx
   xxx...xxxxx=xxxxx...xxx
  xx..xxxxxlllllllxxxxx..xx
 xx.xxxxxlll.....lllxxxxx.xx

Replacement in crawl-ref/source/dat/entry.des at line 3540 [16.591]

B:BD[25.1835] → [25.1835:1865]

∅:D[25.1865] → [24.14912:15032]

B:BD[24.14912] → [24.14912:15032]

xxx.xxxxxlll2..2.lllxxxxx.xx 
 xxx..xxxxxlllllllxxxxx..xx  
   xxx...xxxxx+xxxxx...xxx   
    xxxxx...........xxxxx    
     xxxxxxxxxDxxxxxxxxx

[25.1835]

[24.15032]

xxx.xxxxxlll2..2.lllxxxxx.xx
 xxx..xxxxxlllllllxxxxx..xx
   xxx...xxxxx+xxxxx...xxx
    xxxxx...........xxxxx
     xxxxxxxxxDxxxxxxxxx

Replacement in crawl-ref/source/dat/entry.des at line 3747 [16.591]
B:BD[16.83694] → [27.19484:19528]
```
  ........@........  
  ........>........  
```
[16.83694]
[16.83760]
```
  ........@........
  ........>........
```
Replacement in crawl-ref/source/dat/entry.des at line 3758 [16.591]
B:BD[16.83958] → [27.19529:19573]
```
  ........{........  
  ........@........  
```
[16.83958]
[16.84024]
```
  ........{........
  ........@........
```
Replacement in crawl-ref/source/dat/entry.des at line 4103 [16.591]
B:BD[31.4485] → [31.4485:4522]
```
xx.......xx+xx..1.1..xx+xx.......xx 
```
[31.4485]
[31.4522]
```
xx.......xx+xx..1.1..xx+xx.......xx
```
Replacement in crawl-ref/source/dat/entry.des at line 4105 [16.591]
B:BD[31.4559] → [31.4559:4596]
```
xx.......xx+xx...1...xx+xx.......xx 
```
[31.4559]
[31.4596]
```
xx.......xx+xx...1...xx+xx.......xx
```

Replacement in crawl-ref/source/dat/entry.des at line 4238 [16.591]

B:BD[16.99902] → [24.16212:16350]

   xxxx@xxxxxxx.@.x   
   xxxx.xxxxxx...xx   
   xxxx.xxxxx...xxx   
   xx....xxx...xxxx   
   xx{....x...xxxxx   
xxxxx........xxxxxx

[16.99902]

[24.16350]

   xxxx@xxxxxxx.@.x
   xxxx.xxxxxx...xx
   xxxx.xxxxx...xxx
   xx....xxx...xxxx
   xx{....x...xxxxx
xxxxx........xxxxxx

Replacement in crawl-ref/source/dat/entry.des at line 4285 [16.591]
B:BD[24.16481] → [32.4033:4052]
```
SUBST:   C=+, V=+ 
```
[24.16481]
[32.4052]
```
SUBST:   C=+, V=+
```
Replacement in crawl-ref/source/dat/entry.des at line 4383 [16.591]
∅:D[21.8040] → [33.5940:6000]
B:BD[33.5940] → [33.5940:6000]
```
MONS:    w:30 nothing / w:10 plant / w:3 fungus / w:1 worm 
```
[21.8040]
[33.6000]
```
MONS:    w:30 nothing / w:10 plant / w:3 fungus / w:1 worm
```
Replacement in crawl-ref/source/acr.cc at line 2927 [6.4397395]
∅:D[34.5907] → [35.3279:3335]
B:BD[6.4464581] → [35.3279:3335]
```
    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
```
[34.5907]
[35.3335]
```
    if (!player_can_open_doors())
```

Fix 2792807: Autoexplore attempting to open doors in bat form.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/travel.cc at line 655 [5.39949]

Insertion in crawl-ref/source/player.h at line 329 [6.945993]

Insertion in crawl-ref/source/player.cc at line 428 [6.962854]

Insertion in crawl-ref/source/misc.cc at line 241 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 267 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 380 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 420 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 471 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 532 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 579 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 623 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 667 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 706 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 758 [6.1933596]

Insertion in crawl-ref/source/dungeon.cc at line 4421 [6.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 4423 [6.3429798]

Replacement in crawl-ref/source/directn.cc at line 567 [6.3697945]

Replacement in crawl-ref/source/dat/entry.des at line 61 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 67 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 77 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 183 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 284 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 304 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 395 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 546 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 558 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 565 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 573 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 582 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 2909 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 2925 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 2936 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 2949 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 3130 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 3159 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 3461 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 3473 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 3477 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 3506 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 3522 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 3540 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 3747 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 3758 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 4103 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 4105 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 4238 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 4285 [16.591]

Replacement in crawl-ref/source/dat/entry.des at line 4383 [16.591]

Replacement in crawl-ref/source/acr.cc at line 2927 [6.4397395]