fiddlerwoaroof/crawl - Change SSI2HXYXWAFH5ROTQ5JTTH62LQILJECBHGEK2TSIIQJBH7CSQWCAC

* Fix 2477235: Use inscription check when switching back from butchering

           tool in case it was autoinscribed {!w}.

Make TSO reclaim holy wrath weapons an Elyvilon worshipper is attempting to destroy (flavour only). (FR 2497133)
Disallow Dissolution outside of the Slime Pits.
Explain 'e' as "Drain corpses" for Vampires in the command help.

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

Created by j-p-e-g on January 14, 2009

SSI2HXYXWAFH5ROTQ5JTTH62LQILJECBHGEK2TSIIQJBH7CSQWCAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 3864 [8.804403]

B:BD[6.805] → [7.5385:5499]

B:BD[7.5499] → [9.4579:4640]

∅:D[9.4640] → [7.5563:5591]

B:BD[7.5563] → [7.5563:5591]

        // Elyvilon doesn't care about item sacrifices at altars, so
        // I'm stealing _Sacrifice_Messages.
        _print_sacrifice_message(GOD_ELYVILON, item, pgain);
        if (is_evil_weapon)

[6.805]

[7.5591]

        if (get_weapon_brand(item) == SPWPN_HOLY_WRATH)

Replacement in crawl-ref/source/religion.cc at line 3866 [8.804403]

B:BD[7.5601] → [10.3071:3123]

∅:D[10.3123] → [7.5601:5728]

B:BD[7.5601] → [7.5601:5728]

            // Print this is addition to the above!
            simple_god_message(" welcomes the destruction of this evil weapon.",
                               GOD_ELYVILON);

[7.5601]

[11.3502]

            // Weapons blessed by TSO don't get destroyed but are instead
            // returned whence they came. (jpeg)
//            _print_sacrifice_message(GOD_SHINING_ONE, item, pgain);
            simple_god_message(
                make_stringf(" %sreclaims %s.",
                             pgain == PIETY_SOME ? "gladly " : "",
                             item.name(DESC_NOCAP_THE).c_str()).c_str(),
                GOD_SHINING_ONE);

Insertion in crawl-ref/source/religion.cc at line 3875 [8.804403]

[11.3512]

[12.2601]

        else
        {
            // Elyvilon doesn't care about item sacrifices at altars, so
            // I'm stealing _Sacrifice_Messages.
            _print_sacrifice_message(GOD_ELYVILON, item, pgain);
            if (is_evil_weapon)
            {
                // Print this is addition to the above!
                simple_god_message(" welcomes the destruction of this evil "
                                   "weapon.", GOD_ELYVILON);
            }
        }

Insertion in crawl-ref/source/religion.cc at line 4190 [8.804403]
[3.3342]
[3.3342]
```
            {
```
Insertion in crawl-ref/source/religion.cc at line 4193 [8.804403]
[3.3458]
[13.3300]
```
            }
```

Replacement in crawl-ref/source/item_use.h at line 137 [8.2777340]

B:BD[8.2780645] → [14.362149:362230]

bool wield_weapon(bool auto_wield, int slot = -1, bool show_we_messages = true);

[8.2780645]

[8.2780681]

bool wield_weapon(bool auto_wield, int slot = -1, bool show_we_messages = true,
                  bool force = false);

Replacement in crawl-ref/source/item_use.cc at line 222 [8.2781507]

∅:D[15.8694] → [14.364353:364423]

B:BD[14.364353] → [14.364353:364423]

bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages)

[15.8694]

[8.2783742]

// If force is true, don't check weapon inscriptions.
// (Assuming the player was already prompted for that.)
bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages,
                  bool force)

Replacement in crawl-ref/source/item_use.cc at line 324 [8.2781507]

B:BD[16.7849] → [2.3270:3342]

    if (auto_wield && !check_warning_inscriptions(new_wpn, OPER_WIELD))

[16.7849]

[17.886]

    if (auto_wield && !force
        && !check_warning_inscriptions(new_wpn, OPER_WIELD))
    {

Insertion in crawl-ref/source/item_use.cc at line 328 [8.2781507]
[17.910]
[17.910]
```
    }
```
Insertion in crawl-ref/source/invent.h at line 224 [8.2919073]
[18.465]
[18.465]
```
bool check_old_item_warning(const item_def& item, operation_types oper);
```

Replacement in crawl-ref/source/invent.cc at line 1240 [8.2920632]

B:BD[19.924] → [19.924:1033]

B:BD[19.1033] → [20.3509:3568]

∅:D[20.3568] → [19.1091:1150]

B:BD[19.1091] → [19.1091:1150]

// checks if current item (to be removed) has a warning inscription
// and prompts the user for confirmation
static bool _check_old_item_warning( const item_def& item,
                                    operation_types oper )

[19.924]

[19.1150]

// Checks if current item (to be removed) has a warning inscription
// and prompts the user for confirmation.
bool check_old_item_warning( const item_def& item,
                             operation_types oper )

Replacement in crawl-ref/source/invent.cc at line 1350 [8.2920632]

B:BD[21.5037] → [20.3627:3689]

                return (_check_old_item_warning(item, oper));

[21.5037]

[21.5098]

                return (check_old_item_warning(item, oper));

Replacement in crawl-ref/source/invent.cc at line 1365 [8.2920632]

B:BD[21.5534] → [20.3690:3756]

∅:D[20.3756] → [21.5599:5643]

B:BD[21.5599] → [21.5599:5643]

                    return (_check_old_item_warning(item, oper));
                // or maybe the other ring?

[21.5534]

[21.5643]

                    return (check_old_item_warning(item, oper));
                // Or maybe the other ring?

Replacement in crawl-ref/source/invent.cc at line 1372 [8.2920632]

B:BD[21.5775] → [20.3757:3819]

                return (_check_old_item_warning(item, oper));

[21.5775]

[21.5836]

                return (check_old_item_warning(item, oper));

Replacement in crawl-ref/source/invent.cc at line 1379 [8.2920632]

B:BD[19.2704] → [20.3891:3948]

                && _check_old_item_warning(item, oper));

[19.2704]

[22.783240]

                && check_old_item_warning(item, oper));

Replacement in crawl-ref/source/invent.cc at line 1382 [8.2920632]

B:BD[18.1303] → [20.3949:4003]

        return (_check_old_item_warning(item, oper));

[18.1303]

[14.388066]

        return (check_old_item_warning(item, oper));

Insertion in crawl-ref/source/food.cc at line 133 [8.3043806]

[8.3047049]

[23.4139]

    if (you.equip[EQ_WEAPON] != -1
        && !check_old_item_warning(you.inv[you.equip[EQ_WEAPON]],
                                   OPER_WIELD))
    {
        return;
    }

Replacement in crawl-ref/source/food.cc at line 329 [8.3043806]

B:BD[24.5102] → [4.3632:3689]

        if (!wield_weapon(true, butchering_tool, false))

[24.5102]

[25.5601]

        if (!wield_weapon(true, butchering_tool, false, true))

Replacement in crawl-ref/source/dungeon.cc at line 3231 [8.3429798]
B:BD[26.24475] → [26.24475:24510]
```
// Murray (Hell), or Tiamat (Zot).
```
[26.24475]
[27.6755]
```
// Dissolution (Slime), Murray (Hell), or Tiamat (Zot).
```

Replacement in crawl-ref/source/dungeon.cc at line 3266 [8.3429798]

B:BD[26.24848] → [5.5351:5427]

                            MONS_SONJA, MONS_NESSOS, MONS_DISSOLUTION, -1);

[26.24848]

[28.4093]

                            MONS_SONJA, MONS_NESSOS, -1);

Replacement in crawl-ref/source/dungeon.cc at line 3274 [8.3429798]

B:BD[26.24963] → [5.5428:5496]

                            MONS_SAINT_ROKA, MONS_DISSOLUTION, -1);

[26.24963]

[28.4410]

                            MONS_SAINT_ROKA, -1);

Replacement in crawl-ref/source/command.cc at line 2137 [8.4082507]
B:BD[29.6153] → [29.6153:6192]
```
    cols.add_formatted(
            1,
```
[29.6153]
[29.6192]
```
    std::string interact =
```

Replacement in crawl-ref/source/command.cc at line 2145 [8.4082507]

B:BD[29.6490] → [29.6490:6550]

            "<w>e</w> : Eat food (but tries floor first)\n"

[29.6490]

[29.6550]

            "<w>e</w> : ";
    interact += (you.species == SP_VAMPIRE ? "Drain corpses" : "Eat food");
    interact +=
            " (tries floor first)\n"

Insertion in crawl-ref/source/command.cc at line 2159 [8.4082507]
[29.7032]
[30.15942]
```
    cols.add_formatted(
            1, interact,
```