fiddlerwoaroof/crawl - Change ZO2PZE57FZOUNGR2MEA3ZRRC7DEC7R3NMXLHZMGWROSIYKH2FAWAC

In response to BR 2005224 (TSO penance from shooting unseen underwater

enemies) use player_visible_monster() as parameter known when setting conducts in beam.cc, so the player isn't punished for attacking monsters he didn't know were there, or if he did, had no idea about their current behaviour (fleeing perhaps?) Might be too nice, again, but I think it's okay.

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

Created by j-p-e-g on June 28, 2008

ZO2PZE57FZOUNGR2MEA3ZRRC7DEC7R3NMXLHZMGWROSIYKH2FAWAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 4375 [5.1396662]

B:BD[3.3292] → [3.3292:3397]

    bool                    was_visible =
        mons_near(monster) && player_monster_visible(monster);

[3.3292]

[6.463]

    bool was_visible = (mons_near(monster) && player_monster_visible(monster));

Replacement in crawl-ref/source/monstuff.cc at line 4644 [5.1396662]

B:BD[3.8536] → [3.8536:8627]

    bool was_visible
             = mons_near(monster) && player_monster_visible(monster);

[3.8536]

[5.1486042]

    bool was_visible = (mons_near(monster) && player_monster_visible(monster));

Replacement in crawl-ref/source/beam.cc at line 4389 [5.4128068]

B:BD[7.18261] → [4.4342:4394]

                set_attack_conducts(conducts, mon);

[7.18261]

[8.1489]

                set_attack_conducts(conducts, mon, player_monster_visible(mon));

Insertion in crawl-ref/source/beam.cc at line 4565 [5.4128068]

[5.4238975]

[9.2762]

            // It's not the player's fault if he didn't see the monster or
            // the monster was caught in an unexpected blast of ?immolation.

Replacement in crawl-ref/source/beam.cc at line 4568 [5.4128068]

B:BD[9.2792] → [9.2792:2861]

B:BD[9.2861] → [2.5145:5186]

                (beam.aux_source == "reading a scroll of immolation"
                 && !beam.effect_known);

[9.2792]

[10.4883]

                (!player_monster_visible(mon)
                 || beam.aux_source == "reading a scroll of immolation"
                    && !beam.effect_known);