fiddlerwoaroof/crawl - Change EFWEYIB2R3DPD3JWIPU6LS6SFLPMYN7J7X4GBZR7DJWKHJ3UELSAC

Made Xom be smarter about being amused at losing/missing runes, and

made Xom also be amused at runes being destroyed. Related changes:

Keep track of which items have ever been held by the player with ISFLAG_BEEN_IN_INV.
item_was_destroyed() is called when an item is destroyed (as in dropped in lava, not destroy_item() being called), and item_was_lost() is called if the item was lost (i.e., being left behind in the Abyss).
Keeps track of the number of runes that the character has collected, and how many have been left in the Halls of Zot.

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

Created by zelgadis on October 2, 2007

EFWEYIB2R3DPD3JWIPU6LS6SFLPMYN7J7X4GBZR7DJWKHJ3UELSAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.h at line 39 [2.3]

B:BD[2.880] → [2.880:922]

void xom_check_lost_item(item_def& item);

[2.880]

[2.922]

void xom_check_lost_item(const item_def& item);
void xom_check_destroyed_item(const item_def& item, int cause = -1);

Insertion in crawl-ref/source/xom.cc at line 12 [3.3]
[3.226]
[3.226]
```
#include "branch.h"
```

Replacement in crawl-ref/source/xom.cc at line 931 [3.3]

B:BD[2.4506] → [2.4506:4547]

void xom_check_lost_item(item_def& item)

[2.4506]

[2.4547]

static void xom_check_less_runes(int runes_gones)
{
    if (player_in_branch(BRANCH_HALL_OF_ZOT) ||
        !(branches[BRANCH_HALL_OF_ZOT].branch_flags & BFLAG_HAS_ORB))
    {
        return;
    }
    int runes_avail = you.attribute[ATTR_UNIQUE_RUNES]
        + you.attribute[ATTR_DEMONIC_RUNES]
        + you.attribute[ATTR_ABYSSAL_RUNES]
        - you.attribute[ATTR_RUNES_IN_ZOT];
    int was_avail = runes_avail + runes_gones;
    // No longer enough available runes to get into Zot
    if (was_avail >= NUMBER_OF_RUNES_NEEDED &&
        runes_avail < NUMBER_OF_RUNES_NEEDED)
    {
        xom_is_stimulated(128, "Xom snickers.", true);
    }
}
void xom_check_lost_item(const item_def& item)

Insertion in crawl-ref/source/xom.cc at line 961 [3.3]

[2.4773]

        // If you'd dropped it, check if that means you'd dropped your
        // third rune and now don't have enough to get into Zot.
        if (item.flags & ISFLAG_BEEN_IN_INV)
            xom_check_less_runes(item.quantity);

Replacement in crawl-ref/source/xom.cc at line 969 [3.3]

B:BD[2.4929] → [2.4929:4977]

                !(item.flags & ISFLAG_DROPPED))

[2.4929]

[2.4977]

                 !(item.flags & ISFLAG_BEEN_IN_INV))

Replacement in crawl-ref/source/xom.cc at line 971 [3.3]

B:BD[2.4987] → [2.4987:5143]

            // Player voluntarily entered Pan or the Abyss looking
            // for runes, yet never found it.
            if (item.plus == RUNE_ABYSSAL)

[2.4987]

[2.5143]

            // Player voluntarily entered Pan or the Abyss looking for
            // runes, yet never found it.
            if (item.plus == RUNE_ABYSSAL &&
                you.attribute[ATTR_ABYSSAL_RUNES] == 0)

Replacement in crawl-ref/source/xom.cc at line 983 [3.3]

B:BD[2.5502] → [2.5502:5519]

            else

[2.5502]

[2.5519]

            else if (item.plus == RUNE_DEMONIC &&
                     you.attribute[ATTR_DEMONIC_RUNES] == 0)
            {

Insertion in crawl-ref/source/xom.cc at line 987 [3.3]
[2.5588]
[2.5588]
```
            }
```

Insertion in crawl-ref/source/xom.cc at line 989 [3.3]

[2.5598]

    }
}
void xom_check_destroyed_item(const item_def& item, int cause)
{
    int amusement = 0;
    if (item.base_type == OBJ_ORBS)
    {
        xom_is_stimulated(255, "Xom laughs nastily.", true);
        return;
    }
    else if (is_fixed_artefact(item))
        xom_is_stimulated(128, "Xom snickers.", true);
    else if (is_rune(item))
    {
        xom_check_less_runes(item.quantity);
        if (is_unique_rune(item) || item.plus == RUNE_ABYSSAL)
            amusement = 255;
        else
            amusement = 64 * item.quantity;

Insertion in crawl-ref/source/xom.cc at line 1012 [3.3]

[2.5604]

[3.27718]


    xom_is_stimulated(amusement,
                      amusement > 128 ? "Xom snickers loudly." :
                      amusement > 64  ? "Xom snickers." :
                      "Xom snickers softly.",
                      true);

Insertion in crawl-ref/source/terrain.cc at line 380 [4.26938]
[4.37048]
[4.37048]
```
                item_was_destroyed(mitm[item]);
```
Insertion in crawl-ref/source/religion.cc at line 3117 [7.804403]
[5.2520]
[6.1765]
```
        item_was_destroyed(mitm[i]);
```
Insertion in crawl-ref/source/newgame.cc at line 876 [7.1132300]
[7.1152074]
[8.103]
```
            you.inv[i].flags |= ISFLAG_BEEN_IN_INV;
```
Insertion in crawl-ref/source/monstuff.cc at line 270 [7.1396662]
[7.1403707]
[7.1403707]
```
    int midx = (int) monster_index(monster);
```
Insertion in crawl-ref/source/monstuff.cc at line 281 [7.1396662]
[7.1403884]
[7.1403884]
```
                item_was_destroyed(mitm[item], midx);
```
Deletion in crawl-ref/source/monstuff.cc at line 307 [7.1396662]
B:BD[9.412038] → [9.412038:412039]
Replacement in crawl-ref/source/monstuff.cc at line 315 [7.1396662]
B:BD[7.1404719] → [7.1404719:1404758]
B:BD[7.1404758] → [9.412130:412213]
∅:D[9.412213] → [7.1404883:1404889]
B:BD[7.1404883] → [7.1404883:1404889]
```
    if (mons_weight(corpse_class) == 0
        || grid_destroys_items(grd[monster->x][monster->y])
        || coinflip())
    {
```
[7.1404719]
[7.1404889]
```
    if (mons_weight(corpse_class) == 0 || coinflip())
```
Deletion in crawl-ref/source/monstuff.cc at line 317 [7.1396662]
B:BD[7.1404905] → [7.1404905:1404911]
```
    }
```

Insertion in crawl-ref/source/monstuff.cc at line 334 [7.1396662]

[7.1405390]

    if (grid_destroys_items(grd[monster->x][monster->y]))
    {
        item_was_destroyed(mitm[o]);
        mitm[o].base_type = OBJ_UNASSIGNED;
        return;
    }

Replacement in crawl-ref/source/monstuff.cc at line 4250 [7.1396662]

B:BD[7.1520061] → [7.1520061:1520154]

B:BD[7.1520154] → [10.8979:9011]

        int hps_gained = 0;
        int max_eat = roll_dice( 1, 10 );
        int eaten = 0;
        bool eaten_net = false;

[7.1520061]

[7.1520154]

        int  midx       = monster_index(monster);
        int  hps_gained = 0;
        int  max_eat    = roll_dice( 1, 10 );
        int  eaten      = 0;
        bool eaten_net  = false;

Insertion in crawl-ref/source/monstuff.cc at line 4291 [7.1396662]

[7.1521673]

            if (quant >= mitm[item].quantity)
                item_was_destroyed(mitm[item], midx);

Replacement in crawl-ref/source/misc.cc at line 687 [7.1933596]

B:BD[2.10583] → [2.10583:10707]

        && runes_in_pack() < NUMBER_OF_RUNES_NEEDED
        && (branches[BRANCH_HALL_OF_ZOT].branch_flags & BFLAG_HAS_ORB))

[2.10583]

[2.10707]

        && branches[BRANCH_HALL_OF_ZOT].branch_flags & BFLAG_HAS_ORB)

Replacement in crawl-ref/source/misc.cc at line 689 [7.1933596]

B:BD[2.10713] → [2.10713:10775]

        xom_is_stimulated(255, "Xom snickers loudly.", true);

[2.10713]

[2.10775]

        int runes_avail = you.attribute[ATTR_UNIQUE_RUNES]
            + you.attribute[ATTR_DEMONIC_RUNES]
            + you.attribute[ATTR_ABYSSAL_RUNES]
            - you.attribute[ATTR_RUNES_IN_ZOT];
        if (runes_avail < NUMBER_OF_RUNES_NEEDED)
            xom_is_stimulated(255, "Xom snickers loudly.", true);

Replacement in crawl-ref/source/items.h at line 79 [7.2580284]

B:BD[7.2582452] → [7.2582452:2582493]

void destroy_item_stack( int x, int y );

[7.2582452]

[7.2582493]

void destroy_item_stack( int x, int y, int cause = -1 );
void lose_item_stack( int x, int y );

Insertion in crawl-ref/source/items.h at line 175 [7.2580284]

[2.12878]

[7.2584687]

void item_was_lost(const item_def &item);
void item_was_destroyed(const item_def &item, int cause = -1);

Insertion in crawl-ref/source/items.cc at line 292 [7.2584728]

[7.2591551]

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

Insertion in crawl-ref/source/items.cc at line 324 [7.2584728]

[7.2591911]

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

Replacement in crawl-ref/source/items.cc at line 521 [7.2584728]

B:BD[7.2597488] → [7.2597488:2597528]

void destroy_item_stack( int x, int y )

[7.2597488]

[7.2597528]

static void handle_gone_item(const item_def &item)
{
    if (item.base_type == OBJ_ORBS)
    {   
        set_unique_item_status(OBJ_ORBS, item.sub_type,
                                UNIQ_LOST_IN_ABYSS);
    }
    else if (is_fixed_artefact(item))
    {   
        set_unique_item_status(OBJ_WEAPONS, item.special, 
                                UNIQ_LOST_IN_ABYSS);
    }
    if (is_rune(item))
    {
        if ((item.flags & ISFLAG_BEEN_IN_INV))
        {
            if (is_unique_rune(item))
                you.attribute[ATTR_UNIQUE_RUNES] -= item.quantity;
            else if (item.plus == RUNE_ABYSSAL)
                you.attribute[ATTR_ABYSSAL_RUNES] -= item.quantity;
            else
                you.attribute[ATTR_DEMONIC_RUNES] -= item.quantity;
        }
        if (player_in_branch(BRANCH_HALL_OF_ZOT)
            && item.x != -1 && item.y != -1)
        {
            you.attribute[ATTR_RUNES_IN_ZOT] -= item.quantity;
        }
    }
}
void item_was_lost(const item_def &item)

Insertion in crawl-ref/source/items.cc at line 556 [7.2584728]

[7.2597530]

    handle_gone_item( item );
    xom_check_lost_item( item );
}
void item_was_destroyed(const item_def &item, int cause)
{
    handle_gone_item( item );
    xom_check_destroyed_item( item, cause );
}
void lose_item_stack( int x, int y )
{

Replacement in crawl-ref/source/items.cc at line 578 [7.2584728]

B:BD[7.2597697] → [7.2597697:2598120]

            if (mitm[o].base_type == OBJ_ORBS)
            {   
                set_unique_item_status( OBJ_ORBS, mitm[o].sub_type,
                                        UNIQ_LOST_IN_ABYSS );
            }
            else if (is_fixed_artefact( mitm[o] ))
            {   
                set_unique_item_status( OBJ_WEAPONS, mitm[o].special, 
                                        UNIQ_LOST_IN_ABYSS );
            }

[7.2597697]

[2.12919]

            item_was_lost(mitm[o]);
            mitm[o].base_type = OBJ_UNASSIGNED;
            mitm[o].quantity = 0;
        }
        o = next;
    }
}
void destroy_item_stack( int x, int y, int cause )
{
    int o = igrd[x][y];
    igrd[x][y] = NON_ITEM;
    while (o != NON_ITEM)
    {
        int next = mitm[o].link;

Replacement in crawl-ref/source/items.cc at line 598 [7.2584728]

B:BD[2.12920] → [2.12920:12964]

            xom_check_lost_item( mitm[o] );

[2.12920]

[7.2598120]

        if (is_valid_item( mitm[o] ))
        {
            item_was_destroyed(mitm[o], cause);

Insertion in crawl-ref/source/items.cc at line 1410 [7.2584728]

[11.354182]

}
static void got_item(item_def& item, int quant)
{
    if (!is_rune(item))
        return;
    // Picking up the rune for the first time.
    if (!(item.flags & ISFLAG_BEEN_IN_INV))
    {
        if (is_unique_rune(item))
            you.attribute[ATTR_UNIQUE_RUNES] += quant;
        else if (item.plus == RUNE_ABYSSAL)
            you.attribute[ATTR_ABYSSAL_RUNES] += quant;
        else
            you.attribute[ATTR_DEMONIC_RUNES] += quant;
    }
    item.flags |= ISFLAG_BEEN_IN_INV;

Insertion in crawl-ref/source/items.cc at line 1508 [7.2584728]
[7.2615654]
[7.2615654]
```
                got_item(mitm[obj], quant_got);
```
Insertion in crawl-ref/source/items.cc at line 1579 [7.2584728]
[2.13449]
[7.2617024]
```
    got_item(item, item.quantity);
```

Replacement in crawl-ref/source/items.cc at line 1649 [7.2584728]

B:BD[2.13451] → [2.13451:13528]

    if (mitm[*obj].base_type == OBJ_ORBS && you.level_type == LEVEL_DUNGEON)

[2.13451]

[2.13528]

    if (is_rune(mitm[*obj]))
    {
        if (player_in_branch(BRANCH_HALL_OF_ZOT))
            you.attribute[ATTR_RUNES_IN_ZOT] += mitm[*obj].quantity;
    }
    else if (mitm[*obj].base_type == OBJ_ORBS
             && you.level_type == LEVEL_DUNGEON)
    {

Insertion in crawl-ref/source/items.cc at line 1658 [7.2584728]
[2.13569]
[7.2618573]
```
    }
```
Insertion in crawl-ref/source/items.cc at line 1833 [7.2584728]
[12.763]
[12.763]
```
        item_was_destroyed(you.inv[item_dropped], NON_MONSTER);
```

Replacement in crawl-ref/source/files.cc at line 829 [7.3084589]

B:BD[2.15844] → [2.15844:15910]

static void _xom_check_lost_items(level_area_type old_level_type)

[2.15844]

[2.15910]

static void do_lost_items(level_area_type old_level_type)

Replacement in crawl-ref/source/files.cc at line 845 [7.3084589]
B:BD[2.16258] → [2.16258:16293]
```
        xom_check_lost_item(item);
```
[2.16258]
[2.16293]
```
        item_was_lost(item);
```
Replacement in crawl-ref/source/files.cc at line 897 [7.3084589]
B:BD[2.16304] → [2.16304:16347]
```
    _xom_check_lost_items(old_level_type);
```
[2.16304]
[7.3096569]
```
    do_lost_items(old_level_type);
```

Insertion in crawl-ref/source/enum.h at line 176 [7.3287960]

[2.17263]

[13.14625]

    ATTR_UNIQUE_RUNES,
    ATTR_DEMONIC_RUNES,
    ATTR_ABYSSAL_RUNES,
    ATTR_RUNES_IN_ZOT,

Replacement in crawl-ref/source/enum.h at line 1277 [7.3287960]

B:BD[14.1201] → [14.1201:1243]

    ISFLAG_NOTED_GET         = 0x10000000

[14.1201]

[7.3324296]

    ISFLAG_NOTED_GET         = 0x10000000,
    ISFLAG_BEEN_IN_INV       = 0x20000000  // Item has been in inventory

Insertion in crawl-ref/source/effects.cc at line 1333 [7.3382105]
[15.30247]
[7.3417525]
```
        item_was_destroyed(mitm[igrd[you.x_pos][you.y_pos]], NON_MONSTER);
```
Insertion in crawl-ref/source/beam.cc at line 2409 [7.4128068]
[16.635]
[7.4205172]
```
        item_was_destroyed(*item, beam.beam_source);
```
Insertion in crawl-ref/source/beam.cc at line 2937 [7.4128068]
[7.4221536]
[7.4221536]
```
            item_was_destroyed(mitm[igrd[x][y]], beam.beam_source);
```

Replacement in crawl-ref/source/abyss.cc at line 222 [7.4482606]

B:BD[2.29348] → [2.29348:29399]

                && get_screen_glyph(x, y) != '\0')

[2.29348]

[2.29399]

                && get_screen_glyph(x, y) != ' ')

Replacement in crawl-ref/source/abyss.cc at line 244 [7.4482606]

B:BD[2.29985] → [2.29985:30033]

            if (get_screen_glyph(x, y) != '\0')

[2.29985]

[2.30033]

            if (get_screen_glyph(x, y) != ' ')

Replacement in crawl-ref/source/abyss.cc at line 282 [7.4482606]

B:BD[2.31081] → [2.31081:31270]

    if ((exit_was_near < INFINITE_DISTANCE &&
         exit_is_near == INFINITE_DISTANCE)
        || (exit_was_near == INFINITE_DISTANCE &&
            exit_is_near  <  INFINITE_DISTANCE))

[2.31081]

[2.31270]

    int rune_is_near = abyss_rune_nearness();
    if ((exit_was_near   <  INFINITE_DISTANCE
         && exit_is_near == INFINITE_DISTANCE)
        || (rune_was_near < INFINITE_DISTANCE
            && rune_is_near == INFINITE_DISTANCE
            && you.attribute[ATTR_ABYSSAL_RUNES] == 0))

Replacement in crawl-ref/source/abyss.cc at line 290 [7.4482606]
B:BD[2.31276] → [2.31276:31308]
```
        xom_is_stimulated(255);
```
[2.31276]
[2.31308]
```
        xom_is_stimulated(255, "Xom snickers loudly.", true);
```

Replacement in crawl-ref/source/abyss.cc at line 293 [7.4482606]

B:BD[2.31315] → [2.31315:31550]

    int rune_is_near = abyss_rune_nearness();
    if ((rune_was_near < INFINITE_DISTANCE &&
         rune_is_near == INFINITE_DISTANCE)
        || (rune_was_near == INFINITE_DISTANCE &&
            rune_is_near  <  INFINITE_DISTANCE))

[2.31315]

[2.31550]

    if ((rune_was_near   == INFINITE_DISTANCE
         && rune_is_near <  INFINITE_DISTANCE
         && you.attribute[ATTR_ABYSSAL_RUNES] == 0)
        || (exit_was_near == INFINITE_DISTANCE &&
            exit_is_near  <  INFINITE_DISTANCE))

Replacement in crawl-ref/source/abyss.cc at line 344 [7.4482606]
B:BD[7.4489004] → [7.4489004:4489044]
```
            destroy_item_stack( i, j );
```
[7.4489004]
[17.16570]
```
            lose_item_stack( i, j );
```

Replacement in crawl-ref/source/abyss.cc at line 480 [7.4482606]

B:BD[7.4491884] → [7.4491884:4492303]

B:BD[7.4492303] → [2.31962:32007]

            if (mitm[k].base_type == OBJ_ORBS)
            {
                set_unique_item_status( OBJ_ORBS, mitm[k].sub_type, 
                                        UNIQ_LOST_IN_ABYSS );
            }
            else if (is_fixed_artefact( mitm[k] ))
            {
                set_unique_item_status( OBJ_WEAPONS, mitm[k].special, 
                                        UNIQ_LOST_IN_ABYSS );
            }
            xom_check_lost_item( mitm[k] );

[7.4491884]

[7.4492303]

            item_was_lost( mitm[k] );

Made Xom be smarter about being amused at losing/missing runes, and

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.h at line 39 [2.3]

Insertion in crawl-ref/source/xom.cc at line 12 [3.3]

Replacement in crawl-ref/source/xom.cc at line 931 [3.3]

Insertion in crawl-ref/source/xom.cc at line 961 [3.3]

Replacement in crawl-ref/source/xom.cc at line 969 [3.3]

Replacement in crawl-ref/source/xom.cc at line 971 [3.3]

Replacement in crawl-ref/source/xom.cc at line 983 [3.3]

Insertion in crawl-ref/source/xom.cc at line 987 [3.3]

Insertion in crawl-ref/source/xom.cc at line 989 [3.3]

Insertion in crawl-ref/source/xom.cc at line 1012 [3.3]

Insertion in crawl-ref/source/terrain.cc at line 380 [4.26938]

Insertion in crawl-ref/source/religion.cc at line 3117 [7.804403]

Insertion in crawl-ref/source/newgame.cc at line 876 [7.1132300]

Insertion in crawl-ref/source/monstuff.cc at line 270 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 281 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 307 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 315 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 317 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 334 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4250 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4291 [7.1396662]

Replacement in crawl-ref/source/misc.cc at line 687 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 689 [7.1933596]

Replacement in crawl-ref/source/items.h at line 79 [7.2580284]

Insertion in crawl-ref/source/items.h at line 175 [7.2580284]

Insertion in crawl-ref/source/items.cc at line 292 [7.2584728]

Insertion in crawl-ref/source/items.cc at line 324 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 521 [7.2584728]

Insertion in crawl-ref/source/items.cc at line 556 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 578 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 598 [7.2584728]

Insertion in crawl-ref/source/items.cc at line 1410 [7.2584728]

Insertion in crawl-ref/source/items.cc at line 1508 [7.2584728]

Insertion in crawl-ref/source/items.cc at line 1579 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 1649 [7.2584728]

Insertion in crawl-ref/source/items.cc at line 1658 [7.2584728]

Insertion in crawl-ref/source/items.cc at line 1833 [7.2584728]

Replacement in crawl-ref/source/files.cc at line 829 [7.3084589]

Replacement in crawl-ref/source/files.cc at line 845 [7.3084589]

Replacement in crawl-ref/source/files.cc at line 897 [7.3084589]

Insertion in crawl-ref/source/enum.h at line 176 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 1277 [7.3287960]

Insertion in crawl-ref/source/effects.cc at line 1333 [7.3382105]

Insertion in crawl-ref/source/beam.cc at line 2409 [7.4128068]

Insertion in crawl-ref/source/beam.cc at line 2937 [7.4128068]

Replacement in crawl-ref/source/abyss.cc at line 222 [7.4482606]

Replacement in crawl-ref/source/abyss.cc at line 244 [7.4482606]

Replacement in crawl-ref/source/abyss.cc at line 282 [7.4482606]

Replacement in crawl-ref/source/abyss.cc at line 290 [7.4482606]

Replacement in crawl-ref/source/abyss.cc at line 293 [7.4482606]

Replacement in crawl-ref/source/abyss.cc at line 344 [7.4482606]

Replacement in crawl-ref/source/abyss.cc at line 480 [7.4482606]