fiddlerwoaroof/crawl - Change 27JI3J23EXDY2G4X7NHTFTSHSEUDGDPFOYPG6P53UNSSJP3DDQTAC

Consolidate and clean up Yred's injury mirroring routines.

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

Created by dolorous on September 30, 2008

27JI3J23EXDY2G4X7NHTFTSHSEUDGDPFOYPG6P53UNSSJP3DDQTAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.h at line 97 [4.800304]
B:BD[3.263] → [2.2427:2476]
```
bool yred_mirror_injury(monsters *mon, int dam);
```
[3.263]
[3.263]
```
bool yred_injury_mirror();
```
Replacement in crawl-ref/source/religion.cc at line 742 [4.804403]
B:BD[5.2481] → [2.2478:2526]
```
bool yred_mirror_injury(monsters *mon, int dam)
```
[5.2481]
[5.2529]
```
bool yred_injury_mirror()
```

Replacement in crawl-ref/source/religion.cc at line 744 [4.804403]

B:BD[5.2531] → [5.2531:2549]

B:BD[5.2549] → [2.2527:2551]

∅:D[2.2551] → [5.2565:2566]

B:BD[5.2565] → [5.2565:2566]

B:BD[5.2566] → [2.2552:2751]

∅:D[2.2751] → [5.2615:2633]

B:BD[5.2615] → [5.2615:2633]

B:BD[5.2633] → [2.2752:2797]

∅:D[2.2797] → [5.2674:2682]

B:BD[5.2674] → [5.2674:2682]

B:BD[5.2682] → [2.2798:2830]

∅:D[2.2830] → [5.2710:2711]

B:BD[5.2710] → [5.2710:2711]

B:BD[5.2711] → [2.2831:3001]

∅:D[2.3001] → [5.2815:2816]

B:BD[5.2815] → [5.2815:2816]

B:BD[5.2816] → [2.3002:3052]

    if (dam <= 0)
        return (false);
    if (you.religion == GOD_YREDELEMNUL && you.duration[DUR_PRAYER]
        && !player_under_penance() && you.piety >= piety_breakpoint(0))
    {
        simple_god_message(" mirrors your injury!");
#ifndef USE_TILE
        flash_monster_colour(mon, RED, 200);
#endif
        hurt_monster(mon, dam);
        if (mon->hit_points < 1)
            monster_die(mon, KILL_YOU, NON_MONSTER);
        else
            print_wounds(mon);
        lose_piety(integer_sqrt(dam));
        return (true);
    }
    return (false);

[5.2531]

[6.4629]

    return (you.religion == GOD_YREDELEMNUL && !player_under_penance()
            && you.piety >= piety_breakpoint(0));

Insertion in crawl-ref/source/ouch.cc at line 792 [4.1104358]

[7.34922]


static void _yred_mirrors_injury(int dam, int death_source)
{
    if (dam <= 0 || invalid_monster_index(death_source))
        return;

Insertion in crawl-ref/source/ouch.cc at line 798 [4.1104358]

[7.34923]

[8.4019]

    if (yred_injury_mirror() && you.duration[DUR_PRAYER])
    {
        simple_god_message(" mirrors your injury!");
        monsters *mon = &menv[death_source];
#ifndef USE_TILE
        flash_monster_colour(mon, RED, 200);
#endif
        hurt_monster(mon, dam);
        if (mon->hit_points < 1)
            monster_die(mon, KILL_YOU, NON_MONSTER);
        else
            print_wounds(mon);
        lose_piety(integer_sqrt(dam));
    }
}

Replacement in crawl-ref/source/ouch.cc at line 877 [4.1104358]

B:BD[9.3397] → [2.3077:3131]

∅:D[2.3131] → [5.3060:3122]

B:BD[5.3060] → [5.3060:3122]

            if (!invalid_monster_index(death_source))
                yred_mirror_injury(&menv[death_source], dam);

[9.3397]

[5.3136]

            _yred_mirrors_injury(dam, death_source);

Replacement in crawl-ref/source/describe.cc at line 3146 [4.3736416]

B:BD[5.3667] → [5.3667:3744]

            if (!player_under_penance() && you.piety >= piety_breakpoint(0))

[5.3638]

[5.3744]

            if (yred_injury_mirror())