fiddlerwoaroof/crawl - Change 2PURNR3QKW74QYOZJZEBUAI6QMSLAX5XYWF5D5UIENYZF5HPECAAC

Fix lua errors for Ziggurats in Tiles.

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

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

2PURNR3QKW74QYOZJZEBUAI6QMSLAX5XYWF5D5UIENYZF5HPECAAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tile2.cc at line 170 [7.13289]
B:BD[6.15087] → [6.15087:15129]
```
        flv.wall = TILE_WALL_YELLOW_ROCK;
```
[6.15087]
[6.15129]
```
        flv.wall  = TILE_WALL_YELLOW_ROCK;
```

Insertion in crawl-ref/source/misc.cc at line 421 [9.1933596]

[5.3591]

[8.6831]

}
static std::string _get_desc_quantity(const int quant, const int total)
{
    if (total == quant)
        return "Your";
    else if (quant == 1)
        return "One of your";
    else if (quant == 2)
        return "Two of your";
    else if (quant >= (total * 3) / 4)
        return "Most of your";
    else
        return "Some of your";

Replacement in crawl-ref/source/misc.cc at line 440 [9.1933596]

B:BD[10.3816] → [10.3816:3881]

                                          bool coagulate = true)

[10.3816]

[8.6910]

                                          std::string verb)

Deletion in crawl-ref/source/misc.cc at line 443 [9.1933596]

B:BD[10.3911] → [10.3911:3976]

∅:D[10.3976] → [8.6944:6966]

B:BD[8.6944] → [8.6944:6966]

B:BD[8.6966] → [10.3977:4040]

B:BD[10.4040] → [11.3385:3593]

∅:D[11.3593] → [8.7056:7065]

∅:D[10.4040] → [8.7056:7065]

B:BD[8.7056] → [8.7056:7065]

B:BD[8.7065] → [11.3594:3626]

∅:D[11.3626] → [10.4305:4348]

B:BD[8.7234] → [10.4305:4348]

∅:D[10.4348] → [8.7234:7235]

B:BD[8.7234] → [8.7234:7235]

B:BD[8.7235] → [10.4349:4431]

    if (coagulate)
        ASSERT(potion.sub_type == POT_BLOOD);
    std::string msg;
    if (potion.quantity == num_changed)
        msg = "Your ";
    else if (num_changed == 1)
        msg = "One of your ";
    else if (num_changed == 2)
        msg = "Two of your ";
    else if (num_changed >= (potion.quantity * 3) / 4)
        msg = "Most of your ";
    else
        msg = "Some of your ";
    msg += potion.name(DESC_PLAIN, false);
    if (coagulate)
        msg += " coagulate";
    else
        msg += " decay";

Replacement in crawl-ref/source/misc.cc at line 444 [9.1933596]

B:BD[10.4432] → [10.4432:4458]

∅:D[10.4458] → [8.7289:7367]

B:BD[8.7289] → [8.7289:7367]

    if (num_changed == 1)
        msg += "s";
    msg += ".";
    mpr(msg.c_str(), MSGCH_ROTTEN_MEAT);

[10.4432]

[8.7367]

    verb = replace_all(verb, "%s", num_changed == 1 ? "s" : "");
    mprf(MSGCH_ROTTEN_MEAT, "%s %s %s.",
         _get_desc_quantity(num_changed, potion.quantity).c_str(),
         potion.name(DESC_PLAIN, false).c_str(),
         verb.c_str());

Replacement in crawl-ref/source/misc.cc at line 514 [9.1933596]

B:BD[8.9327] → [12.3887:3937]

    if (!coag_count) // Some potions rotted away.

[8.9327]

[8.9376]

    const bool knew_coag  = (get_ident_type(OBJ_POTIONS, POT_BLOOD_COAGULATED)
                                == ID_KNOWN_TYPE);
    if (!coag_count) // Some potions rotted away, but none coagulated.

Insertion in crawl-ref/source/misc.cc at line 519 [9.1933596]

[8.9382]

        // Only coagulated blood can rot.
        ASSERT(blood.sub_type == POT_BLOOD_COAGULATED);
        _potion_stack_changed_message(blood, rot_count, "rot%s away");

Insertion in crawl-ref/source/misc.cc at line 523 [9.1933596]

[8.9419]


        if (!knew_coag)
        {
            set_ident_type( OBJ_POTIONS, POT_BLOOD_COAGULATED, ID_KNOWN_TYPE );
            if (blood.quantity >= 1)
                mpr(blood.name(DESC_INVENTORY).c_str());
        }

Replacement in crawl-ref/source/misc.cc at line 547 [9.1933596]

B:BD[8.9676] → [8.9676:9874]

    bool knew_blood = get_ident_type(OBJ_POTIONS, POT_BLOOD) == ID_KNOWN_TYPE;
    bool knew_coag  = (get_ident_type(OBJ_POTIONS, POT_BLOOD_COAGULATED)
                           == ID_KNOWN_TYPE);

[8.9676]

[8.9874]

    const bool knew_blood = get_ident_type(OBJ_POTIONS, POT_BLOOD)
                                == ID_KNOWN_TYPE;

Replacement in crawl-ref/source/misc.cc at line 550 [9.1933596]

B:BD[8.9875] → [10.4659:4713]

    _potion_stack_changed_message(blood, coag_count);

[8.9875]

[8.9926]

    _potion_stack_changed_message(blood, coag_count, "coagulate%s");

Replacement in crawl-ref/source/misc.cc at line 957 [9.1933596]

B:BD[10.5323] → [10.5323:5385]

        _potion_stack_changed_message(potion, amount, false);

[10.5323]

[8.18687]

        _potion_stack_changed_message(potion, amount, "decay%s");

Replacement in crawl-ref/source/dat/ziggurat.des at line 54 [14.9889]

B:BD[13.2744] → [3.94130:94201]

FTILE:  ' = floor_hall, _ = floor_hall, ; = floor_hall, O = floor_hall

[13.2744]

FTILE:   ' = floor_hall, _ = floor_hall, ; = floor_hall, O = floor_hall

Replacement in crawl-ref/source/dat/ziggurat.des at line 58 [14.9889]
B:BD[13.2795] → [13.2795:2831]
```
   ..'..   
  ..'W'..  
 ..'WwW'.. 
```
[13.2795]
[13.2831]
```
   ..'..
  ..'W'..
 ..'WwW'..
```
Replacement in crawl-ref/source/dat/ziggurat.des at line 64 [14.9889]
B:BD[13.2867] → [13.2867:2891]
```
 ..'WwW'.. 
  ..'W'..  
```
[13.2867]
[13.2891]
```
 ..'WwW'..
  ..'W'..
```
Replacement in crawl-ref/source/dat/ziggurat.des at line 154 [14.9889]
B:BD[4.3450] → [4.3450:3479]
```
TAGS:    chance_shallow_zig 
```
[4.3450]
[15.2675]
```
TAGS:    chance_shallow_zig
```
Replacement in crawl-ref/source/dat/ziggurat.des at line 202 [14.9889]
B:BD[4.4117] → [4.4117:4153]
```
   ..'..   
  ..'W'..  
 ..'WwW'.. 
```
[4.4117]
[4.4153]
```
   ..'..
  ..'W'..
 ..'WwW'..
```
Replacement in crawl-ref/source/dat/ziggurat.des at line 208 [14.9889]
B:BD[4.4189] → [4.4189:4213]
```
 ..'WwW'.. 
  ..'W'..  
```
[4.4189]
[4.4213]
```
 ..'WwW'..
  ..'W'..
```

Replacement in crawl-ref/source/dat/ziggurat.des at line 264 [14.9889]

B:BD[16.6038] → [16.6038:6107]

# - ziggurat pillars do not need allow_dup. The pillar map is never

[16.6038]

[16.6107]

# - ziggurat pillars do not need allow_dup. The pillar map is never

Replacement in crawl-ref/source/dat/ziggurat.des at line 279 [14.9889]
B:BD[17.6250] → [16.6177:6180]
```
c 
```
[17.6250]
[17.6253]
```
c
```
Replacement in crawl-ref/source/dat/icecave.des at line 12 [18.2680]
B:BD[18.3220] → [19.13461:13504]
```
# some challenges are too much to handle. 
```
[18.3220]
[18.3258]
```
# some challenges are too much to handle.
```
Replacement in crawl-ref/source/dat/icecave.des at line 23 [18.2680]
B:BD[20.3922] → [20.3922:3925]
```
  
```
[20.3922]
[2.3291]
Replacement in crawl-ref/source/dat/icecave.des at line 239 [18.2680]
B:BD[18.5180] → [18.5180:5219]
```
NAME:   portal_ice_cave_ice_statue_001
```
[18.5180]
[18.5219]
```
NAME:   portal_ice_cave_entry_ice_statue_001
```
Replacement in crawl-ref/source/dat/icecave.des at line 257 [18.2680]
B:BD[18.5406] → [18.5406:5445]
```
NAME:   portal_ice_cave_ice_statue_002
```
[18.5406]
[18.5445]
```
NAME:   portal_ice_cave_entry_ice_statue_002
```

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 193 [14.11554]

B:BD[6.96463] → [6.96463:96531]

  local rock = dgn.lev_rocktile(place)
  dgn.change_rock_tile(rock)

[6.96463]

[6.96531]

--  local rock  = dgn.lev_rocktile(place)
--  local floor = dgn.lev_floortile(place)
  local tileset = {
    blue      = "wall_zot_blue",
    red       = "wall_zot_red",
    lightblue = "wall_zot_cyan",
    magenta   = "wall_zot_magenta",
    green     = "wall_zot_green",
    white     = "wall_vault"
  }

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 204 [14.11554]

B:BD[6.96532] → [6.96532:96604]

  local floor = dgn.lev_floortile(place)
  dgn.change_floor_tile(floor)

[6.96532]

[21.10076]

  local wall = tileset[ziggurat_wall_colour()]
  if (wall == nil) then
    wall = "wall_vault"
  end
  dgn.change_rock_tile(wall)
  dgn.change_floor_tile("floor_vault")

Fix lua errors for Ziggurats in Tiles.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tile2.cc at line 170 [7.13289]

Insertion in crawl-ref/source/misc.cc at line 421 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 440 [9.1933596]

Deletion in crawl-ref/source/misc.cc at line 443 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 444 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 514 [9.1933596]

Insertion in crawl-ref/source/misc.cc at line 519 [9.1933596]

Insertion in crawl-ref/source/misc.cc at line 523 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 547 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 550 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 957 [9.1933596]

Replacement in crawl-ref/source/dat/ziggurat.des at line 54 [14.9889]

Replacement in crawl-ref/source/dat/ziggurat.des at line 58 [14.9889]

Replacement in crawl-ref/source/dat/ziggurat.des at line 64 [14.9889]

Replacement in crawl-ref/source/dat/ziggurat.des at line 154 [14.9889]

Replacement in crawl-ref/source/dat/ziggurat.des at line 202 [14.9889]

Replacement in crawl-ref/source/dat/ziggurat.des at line 208 [14.9889]

Replacement in crawl-ref/source/dat/ziggurat.des at line 264 [14.9889]

Replacement in crawl-ref/source/dat/ziggurat.des at line 279 [14.9889]

Replacement in crawl-ref/source/dat/icecave.des at line 12 [18.2680]

Replacement in crawl-ref/source/dat/icecave.des at line 23 [18.2680]

Replacement in crawl-ref/source/dat/icecave.des at line 239 [18.2680]

Replacement in crawl-ref/source/dat/icecave.des at line 257 [18.2680]

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 193 [14.11554]

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 204 [14.11554]