fiddlerwoaroof/crawl - Change GTXKQTORYHZ7XB2VIH6372UM5GMWAN7IVRXWY5FGBCHFGBV6D6NAC

Fix giving an interruption message when a monster ignored with the

runrest_ignore_monster option gets too close. Also give a more informative interruption message when an air elemental quits being "submerged" in the air, and give a new message when it first "submerges" itself into the air.

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

Created by zelgadis on October 13, 2007

GTXKQTORYHZ7XB2VIH6372UM5GMWAN7IVRXWY5FGBCHFGBV6D6NAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 3882 [5.1699344]

B:BD[4.6918] → [4.6918:6987]

void monsters::add_enchantment_effect(const mon_enchant &ench, bool)

[4.6918]

[4.6987]

void monsters::add_enchantment_effect(const mon_enchant &ench, bool quiet)

Insertion in crawl-ref/source/mon-util.cc at line 3904 [5.1699344]

[6.14452]

[4.7163]

        break;
    case ENCH_SUBMERGED:
        if (type == MONS_AIR_ELEMENTAL && mons_near(this) && !quiet)
            mprf("%s merges itself into the air.",
                 name(DESC_CAP_A, true).c_str() );

Insertion in crawl-ref/source/mon-util.cc at line 4051 [5.1699344]

[6.17049]

    case ENCH_SUBMERGED:
        if (type == MONS_AIR_ELEMENTAL)
        {
            if (mons_near(this))
            {
                if (!mons_is_safe( static_cast<const monsters*>(this)))
                {
                    activity_interrupt_data aid(this);
                    aid.context = "thin air";
                    interrupt_activity( AI_SEE_MONSTER, aid );
                }
                else if (!quiet)
                    mprf("%s forms itself from the air!",
                         name(DESC_CAP_A, true).c_str() );
                seen_monster( this );
                // Monster was viewed this turn
                flags |= MF_WAS_IN_VIEW;
            }
        }
        break;

Replacement in crawl-ref/source/delay.cc at line 1074 [5.3963459]
B:BD[7.2244] → [2.22214:22254]
```
        if (at.context == "newly seen")
```
[7.2244]
[8.5333]
```
        if (at.context == "already seen")
```

Replacement in crawl-ref/source/delay.cc at line 1102 [5.3963459]

B:BD[9.6117] → [9.6117:6134]

            else

[9.6117]

[9.6134]

        }
        else
        {
            const std::string mweap =
                get_monster_desc(mon, false, DESC_NONE);
            std::string text = mon->name(DESC_CAP_A);
            if (at.context == "thin air")

Replacement in crawl-ref/source/delay.cc at line 1111 [5.3963459]

B:BD[9.6148] → [3.2643:3136]

                const std::string mweap =
                    get_monster_desc(mon, false, DESC_NONE);
                std::string text = mon->name(DESC_CAP_A) + " comes into view.";
                if (!mweap.empty())
                    text += " " + mon->pronoun(PRONOUN_CAP)
                        + " is" + mweap + ".";
                print_formatted_paragraph(text,
                                          get_number_of_cols(),
                                          MSGCH_WARN);

[9.6148]

[9.6341]

                if (mon->type == MONS_AIR_ELEMENTAL)
                    text += " forms itself from the air.";
                else
                    text += " appears from thin air.";

Insertion in crawl-ref/source/delay.cc at line 1116 [5.3963459]

[9.6355]

[8.5524]

            else
                text += " comes into view.";
            if (!mweap.empty())
                text += " " + mon->pronoun(PRONOUN_CAP)
                    + " is" + mweap + ".";
            print_formatted_paragraph(text,
                                      get_number_of_cols(),
                                      MSGCH_WARN);