fiddlerwoaroof/crawl - Change 3RVTC3CTXS4IMT4KKO7EGWBWPPMV3RFKHRUMZCH4FGL2NTCDVWBQC

ATTR_RUNES_IN_ZOT is no longer needed. I couldn't decide if I should

simply remove it or leave it for the weak save file compatibility we try to maintain within trunk, so I left its definition in enum.h. Also, change Beogh's altar tile to include the orcish idol.

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

Created by j-p-e-g on July 19, 2009

3RVTC3CTXS4IMT4KKO7EGWBWPPMV3RFKHRUMZCH4FGL2NTCDVWBQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 3067 [4.3]

B:BD[3.397] → [2.366:543]

                       + you.attribute[ATTR_DEMONIC_RUNES]
                       + you.attribute[ATTR_ABYSSAL_RUNES]
                       - you.attribute[ATTR_RUNES_IN_ZOT];

[3.397]

[5.2061]

                      + you.attribute[ATTR_DEMONIC_RUNES]
                      + you.attribute[ATTR_ABYSSAL_RUNES];

Replacement in crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_beogh.png at line 3 [6.1276065]
B:BD[6.1276074] → [6.1276074:1276590]
[6.1276074]
File addition: dngn_altar.png (----------)
[7.56172]

Replacement in crawl-ref/source/misc.cc at line 1870 [8.1933596]

B:BD[3.3362] → [3.3362:3506]

            + you.attribute[ATTR_DEMONIC_RUNES]
            + you.attribute[ATTR_ABYSSAL_RUNES]
            - you.attribute[ATTR_RUNES_IN_ZOT];

[3.3362]

[3.3506]

                          + you.attribute[ATTR_DEMONIC_RUNES]
                          + you.attribute[ATTR_ABYSSAL_RUNES];

Deletion in crawl-ref/source/items.cc at line 268 [8.2584728]

B:BD[3.3914] → [3.3914:4035]


    if (player_in_branch(BRANCH_HALL_OF_ZOT) && is_rune(mitm[obj]))
        you.attribute[ATTR_RUNES_IN_ZOT] -= amount;

Deletion in crawl-ref/source/items.cc at line 299 [8.2584728]

B:BD[8.2591911] → [3.4075:4196]

    if (player_in_branch(BRANCH_HALL_OF_ZOT) && is_rune(mitm[obj]))
        you.attribute[ATTR_RUNES_IN_ZOT] += amount;

Deletion in crawl-ref/source/items.cc at line 528 [8.2584728]
B:BD[3.4978] → [3.4978:4979]
B:BD[3.4979] → [9.63280:63353]
∅:D[9.63353] → [3.5083:5146]
B:BD[3.5083] → [3.5083:5146]
```
        if (player_in_branch(BRANCH_HALL_OF_ZOT) && !in_inventory(item))
            you.attribute[ATTR_RUNES_IN_ZOT] -= item.quantity;
```
Replacement in crawl-ref/source/items.cc at line 1763 [8.2584728]
B:BD[10.13451] → [11.41150:41173]
∅:D[11.41173] → [3.6487:6543]
B:BD[3.6487] → [3.6487:6543]
B:BD[3.6543] → [11.41174:41237]
∅:D[11.41237] → [3.6612:6618]
B:BD[3.6612] → [3.6612:6618]
B:BD[3.6618] → [11.41238:41314]
∅:D[11.41314] → [3.6713:6719]
B:BD[3.6713] → [3.6713:6719]
```
    if (is_rune(item))
    {
        if (player_in_branch(BRANCH_HALL_OF_ZOT))
            you.attribute[ATTR_RUNES_IN_ZOT] += item.quantity;
    }
    else if (item.base_type == OBJ_ORBS && you.level_type == LEVEL_DUNGEON)
    {
```
[10.13451]
[10.13528]
```
    if (item.base_type == OBJ_ORBS && you.level_type == LEVEL_DUNGEON)
```
Deletion in crawl-ref/source/items.cc at line 1765 [8.2584728]
B:BD[10.13569] → [3.6720:6726]
```
    }
```
Deletion in crawl-ref/source/items.cc at line 1766 [8.2584728]
B:BD[8.2618574] → [12.4755:4818]
```
//     if (see_grid(p))
//        StashTrack.update_stash(p);
```

Replacement in crawl-ref/source/enum.h at line 167 [8.3287960]

B:BD[3.7018] → [3.7018:7041]

    ATTR_RUNES_IN_ZOT,

[3.7018]

[13.2991]

    ATTR_RUNES_IN_ZOT,         // Unused but needed for save file compatibility.

ATTR_RUNES_IN_ZOT is no longer needed. I couldn't decide if I should

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 3067 [4.3]

Replacement in crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_beogh.png at line 3 [6.1276065]

File addition: dngn_altar.png (----------)

Replacement in crawl-ref/source/misc.cc at line 1870 [8.1933596]

Deletion in crawl-ref/source/items.cc at line 268 [8.2584728]

Deletion in crawl-ref/source/items.cc at line 299 [8.2584728]

Deletion in crawl-ref/source/items.cc at line 528 [8.2584728]

Replacement in crawl-ref/source/items.cc at line 1763 [8.2584728]

Deletion in crawl-ref/source/items.cc at line 1765 [8.2584728]

Deletion in crawl-ref/source/items.cc at line 1766 [8.2584728]

Replacement in crawl-ref/source/enum.h at line 167 [8.3287960]