fiddlerwoaroof/crawl - Change OONYLF4DAPLIYLBNNRW74IVT5BBTWI4XHQBXSNSPVRX3FTKJBTRAC

Added new field seen_context to the monsters class, which can be set

to cause a non-standard context to be passed to interrupt_activity( AI_SEE_MONSTER ) if it is called before the current turn is over.

If a submerged monster surfaces in order to shout, it has to wait one turn before being able to submerge again.

Added back in a scroll named "forgetfullness", but rather than giving amnesia about the map it gives amnesia about non-equipped inventory items. I tried to make the effects annoying rather than serious.

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

Created by zelgadis on October 16, 2007

OONYLF4DAPLIYLBNNRW74IVT5BBTWI4XHQBXSNSPVRX3FTKJBTRAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 771 [7.16817]

[6.4412]

    }
}
static void handle_seen_interrupt(monsters* monster)
{
    activity_interrupt_data aid(monster);
    if (monster->seen_context != "")
        aid.context = monster->seen_context;
    else if (testbits(monster->flags, MF_WAS_IN_VIEW))
        aid.context = "already seen";
    else
        aid.context = "newly seen";
    if (!mons_is_safe( static_cast<const monsters*>(monster) )
        && !mons_class_flag( monster->type, M_NO_EXP_GAIN )
        && !mons_is_mimic( monster->type ))
    {
        interrupt_activity( AI_SEE_MONSTER, aid );

Insertion in crawl-ref/source/view.cc at line 790 [7.16817]

[6.4418]

    seen_monster( monster );
    // Monster was viewed this turn
    monster->flags |= MF_WAS_IN_VIEW;

Insertion in crawl-ref/source/view.cc at line 966 [7.16817]
[5.133]
[5.133]
```
        {
```

Insertion in crawl-ref/source/view.cc at line 968 [7.16817]

[5.180]

            if (you.can_see(monster))
            {
                monster->seen_context = "bursts forth shouting";
                // Give interrupt message before shout message.
                handle_seen_interrupt(monster);
            }
        }

Replacement in crawl-ref/source/view.cc at line 1068 [7.16817]

B:BD[8.58] → [2.6:242]

∅:D[8.58] → [9.57:204]

∅:D[2.242] → [9.57:204]

B:BD[10.494] → [9.57:204]

∅:D[9.204] → [11.121:195]

B:BD[11.121] → [11.121:195]

B:BD[11.195] → [2.243:306]

∅:D[2.306] → [11.196:214]

B:BD[12.125] → [11.196:214]

∅:D[12.125] → [10.557:598]

∅:D[11.214] → [10.557:598]

B:BD[10.557] → [10.557:598]

∅:D[13.722] → [9.205:304]

B:BD[10.598] → [9.205:304]

                activity_interrupt_data aid(monster);
                if (testbits(monster->flags, MF_WAS_IN_VIEW))
                    aid.context = "already seen";
                else
                    aid.context = "newly seen";
                if (!mons_is_safe( static_cast<const monsters*>(monster) )
                    && !mons_class_flag( monster->type, M_NO_EXP_GAIN )
                    && !mons_is_mimic( monster->type ))
                {
                    interrupt_activity( AI_SEE_MONSTER, aid );
                }
                seen_monster( monster );
                // Monster was viewed this turn
                monster->flags |= MF_WAS_IN_VIEW;

[10.494]

[14.5653]

                handle_seen_interrupt(monster);

Insertion in crawl-ref/source/view.cc at line 1084 [7.16817]
[9.582]
[10.622]
```
        monster->seen_context = "";
```
Insertion in crawl-ref/source/shopping.cc at line 1265 [7.759950]
[7.791572]
[7.791572]
```
            case SCR_FORGETFULNESS:
```

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

B:BD[3.3604] → [3.3604:3685]

                 && (one_chance_in(5) || (grid_distance( monster->x, monster->y,

[3.3604]

[3.3685]

                 && (one_chance_in(5)
                     || ((grid_distance( monster->x, monster->y,

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

∅:D[3.3753] → [15.433:783]

B:BD[15.433] → [15.433:783]

B:BD[15.783] → [3.3754:3959]

                                     // FIXME This is better expressed as a
                                     // function such as
                                     // monster_has_ranged_attack:
                                     && monster->type != MONS_ELECTRICAL_EEL
                                     && monster->type != MONS_LAVA_SNAKE
                                     && (monster->type != MONS_MERMAID
                                          || you.species == SP_MERFOLK)
                                     && !one_chance_in(20)) )

[3.3753]

[15.843]

                          // FIXME This is better expressed as a
                          // function such as
                          // monster_has_ranged_attack:
                          && monster->type != MONS_ELECTRICAL_EEL
                          && monster->type != MONS_LAVA_SNAKE
                          && (monster->type != MONS_MERMAID
                              || you.species == SP_MERFOLK)
                          // Don't submerge if we just unsubmerged for
                          // the sake of shouting.
                          && monster->seen_context != "bursts forth shouting"
                          && !one_chance_in(20)) ))

Replacement in crawl-ref/source/mon-util.cc at line 2319 [7.1699344]
B:BD[16.5634] → [16.5634:5648]
```
      ghost()
```
[16.5634]
[16.5648]
```
      ghost(), seen_context("")
```

Replacement in crawl-ref/source/mon-util.cc at line 4095 [7.1699344]

B:BD[17.621] → [5.542:593]

                activity_interrupt_data aid(this);

[17.621]

[5.593]

                // Already set somewhere else.
                if (seen_context != "")
                    return;

Replacement in crawl-ref/source/mon-util.cc at line 4100 [7.1699344]
∅:D[5.642] → [17.766:812]
B:BD[17.766] → [17.766:812]
```
                    aid.context = "thin air";
```
[5.642]
[5.643]
```
                    seen_context = "thin air";
```

Replacement in crawl-ref/source/mon-util.cc at line 4102 [7.1699344]

B:BD[5.710] → [5.710:760]

                    aid.context = "bursts forth";

[5.710]

[5.760]

                    seen_context = "bursts forth";

Replacement in crawl-ref/source/mon-util.cc at line 4104 [7.1699344]

B:BD[5.781] → [5.781:887]

                    aid.context = "surfaces";
                interrupt_activity( AI_SEE_MONSTER, aid );

[5.781]

[5.887]

                    seen_context = "surfaces";

Deletion in crawl-ref/source/mon-util.cc at line 4107 [7.1699344]
B:BD[5.930] → [5.930:944]
```
            {
```

Deletion in crawl-ref/source/mon-util.cc at line 4109 [7.1699344]

B:BD[17.984] → [17.984:1043]

B:BD[17.1043] → [5.993:1120]

                         name(DESC_CAP_A, true).c_str() );
                else if (monster_habitable_grid(this, DNGN_FLOOR))
                    mprf("%s bursts forth from the water!",

Deletion in crawl-ref/source/mon-util.cc at line 4110 [7.1699344]
B:BD[5.1179] → [5.1179:1193]
∅:D[5.1193] → [17.1043:1044]
B:BD[17.1043] → [17.1043:1044]
B:BD[17.1044] → [5.1194:1228]
∅:D[5.1228] → [17.1082:1083]
B:BD[17.1082] → [17.1082:1083]
B:BD[17.1083] → [5.1229:1310]
```
            }
            seen_monster( this );
            // Monster was viewed this turn
            flags |= MF_WAS_IN_VIEW;
```

Replacement in crawl-ref/source/makeitem.cc at line 2533 [18.927]

B:BD[18.86098] → [4.2776:2928]

                     //(temp_rand > 374) ? SCR_FORGETFULNESS :     //  3.26%
                     (temp_rand > 344) ? SCR_RANDOM_USELESSNESS ://  6.52%

[18.86098]

[18.86248]

                     (temp_rand > 374) ? SCR_FORGETFULNESS :     //  3.26%
                     (temp_rand > 344) ? SCR_RANDOM_USELESSNESS ://  3.26%

Insertion in crawl-ref/source/itemprop.h at line 313 [20.641567]
[19.81677]
[19.81700]
```
    SCR_FORGETFULNESS,
```

Replacement in crawl-ref/source/itemprop.h at line 316 [20.641567]

B:BD[19.81748] → [4.3089:3162]

    SCR_VORPALISE_WEAPON,
    SCR_RECHARGING,                    //   20

[19.81748]

[19.81815]

    SCR_VORPALISE_WEAPON,              //   20
    SCR_RECHARGING,

Insertion in crawl-ref/source/itemname.cc at line 535 [7.2667494]
[21.11848]
[21.11905]
```
    case SCR_FORGETFULNESS:      return "forgetfullness";
```

Insertion in crawl-ref/source/item_use.cc at line 3717 [7.2781507]

[7.2862064]

    case SCR_FORGETFULNESS:
        if (wearing_amulet(AMU_CLARITY))
            mpr("You feel forgetfull for a moment.");
        else
            id_the_scroll = forget_inventory();
        break;

Insertion in crawl-ref/source/externs.h at line 967 [7.3270163]

[16.31834]

[22.83580]

    std::string seen_context;          // Non-standard context for
                                       // AI_SEE_MONSTER

Insertion in crawl-ref/source/effects.h at line 106 [7.3378996]
[20.935953]
[7.3382061]
```
bool forget_inventory(bool quiet = false);
```
Insertion in crawl-ref/source/effects.cc at line 23 [7.3382105]
[7.3382432]
[7.3382432]
```
#include "decks.h"
```

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

[7.3428149]


bool forget_inventory(bool quiet)
{
    int items_forgotten = 0;
    
    for (int i = 0; i < ENDOFPACK; i++)
    {
        item_def& item(you.inv[i]);
        if (!is_valid_item(item) || item_is_equipped(item))
            continue;
        unsigned long orig_flags = item.flags;
        unset_ident_flags(item, ISFLAG_KNOW_CURSE);
        // Don't forget times used or uses left for wands or decks.
        if (item.base_type != OBJ_WANDS && item.base_type != OBJ_MISCELLANY)
            unset_ident_flags(item, ISFLAG_KNOW_PLUSES);
        if (!is_artefact(item))
        {
            switch (item.base_type)
            {
            case OBJ_WEAPONS:
            case OBJ_ARMOUR:
            case OBJ_BOOKS:
            case OBJ_STAVES:
            case OBJ_MISCELLANY:
                // Don't forget identity of decks if it the player has
                // used any of its cards, or knows how many are left.
                if (!is_deck(item) || item.plus2 == 0)
                    unset_ident_flags(item, ISFLAG_KNOW_TYPE);
                break;
            default:
                break;
            }
        }
        // Non-jewellery artifacts can easily be re-identified by
        // equipping them.
        else if (item.base_type != OBJ_JEWELLERY)
            unset_ident_flags(item, ISFLAG_KNOW_TYPE | ISFLAG_KNOW_PROPERTIES);
        if (item.flags != orig_flags)
            items_forgotten++;
    }
    if (items_forgotten > 0)
        mpr("Wait, did you forget something?");
    return (items_forgotten > 0);
}

Insertion in crawl-ref/source/describe.cc at line 2407 [7.3736416]

[7.3812510]


        case SCR_FORGETFULNESS:
            description += "This annoying scrolls causes you to forget "
                "about the items in your inventory.";

Replacement in crawl-ref/source/delay.cc at line 1118 [7.3963459]

B:BD[5.1858] → [5.1858:1909]

            else if (at.context == "bursts forth")

[5.1858]

[5.1909]

            else if (at.context.find("bursts forth") != std::string::npos)

Added new field seen_context to the monsters class, which can be set

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 771 [7.16817]

Insertion in crawl-ref/source/view.cc at line 790 [7.16817]

Insertion in crawl-ref/source/view.cc at line 966 [7.16817]

Insertion in crawl-ref/source/view.cc at line 968 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1068 [7.16817]

Insertion in crawl-ref/source/view.cc at line 1084 [7.16817]

Insertion in crawl-ref/source/shopping.cc at line 1265 [7.759950]

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

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

Replacement in crawl-ref/source/mon-util.cc at line 2319 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4095 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4100 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4102 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4104 [7.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 4107 [7.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 4109 [7.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 4110 [7.1699344]

Replacement in crawl-ref/source/makeitem.cc at line 2533 [18.927]

Insertion in crawl-ref/source/itemprop.h at line 313 [20.641567]

Replacement in crawl-ref/source/itemprop.h at line 316 [20.641567]

Insertion in crawl-ref/source/itemname.cc at line 535 [7.2667494]

Insertion in crawl-ref/source/item_use.cc at line 3717 [7.2781507]

Insertion in crawl-ref/source/externs.h at line 967 [7.3270163]

Insertion in crawl-ref/source/effects.h at line 106 [7.3378996]

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

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

Insertion in crawl-ref/source/describe.cc at line 2407 [7.3736416]

Replacement in crawl-ref/source/delay.cc at line 1118 [7.3963459]