fiddlerwoaroof/crawl - Change MMHQBQAWWCK6ZWOPAT265BXFTKXHDATCITFYR7FOIM6ZZE26FTBQC

Only stimulate Xom when zapping a wand of random effects or an unknown

wand if a monster or the player is targeted, or if an invisible enemy is nearby. This prevents the player from maximally stimulating Xom by just wasting a turn while near a dangerous monster via aming a wand of random effects away from all monsters.

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

Created by zelgadis on June 27, 2008

MMHQBQAWWCK6ZWOPAT265BXFTKXHDATCITFYR7FOIM6ZZE26FTBQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/item_use.cc at line 3405 [5.2781507]

B:BD[3.610] → [4.11294:11355]

    const bool dangerous    = player_in_a_dangerous_place();

[3.610]

[4.11355]

          bool invis_enemy  = false;
    const bool dangerous    = player_in_a_dangerous_place(&invis_enemy);

Replacement in crawl-ref/source/item_use.cc at line 3480 [5.2781507]

B:BD[6.15983] → [2.6239:6314]

    if (dangerous && alreadyknown && wand.sub_type == WAND_RANDOM_EFFECTS)

[6.15983]

[2.6314]

    // Zapping the wand isn't risky if you aim it away from all monsters
    // and yourself, unless there's a nearby invisible enemy and you're
    // trying to hit it at random.
    const bool risky = dangerous && (beam.fr_count || beam.foe_count
                                     || invis_enemy || beam.aimed_at_feet);
    if (risky && alreadyknown && wand.sub_type == WAND_RANDOM_EFFECTS)

Replacement in crawl-ref/source/item_use.cc at line 3530 [5.2781507]
B:BD[5.2845062] → [3.611:664]
```
    if (!alreadyknown && !alreadytried && dangerous)
```
[5.2845062]
[7.49889]
```
    if (!alreadyknown && !alreadytried && risky)
```