fiddlerwoaroof/crawl - Change VVVOUK7QZU3NNYAI6SJNWM5ZK7362HIXXSQI5BKVMHHL2CXMYXMQC

Simplify further.

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

Created by dolorous on October 2, 2008

VVVOUK7QZU3NNYAI6SJNWM5ZK7362HIXXSQI5BKVMHHL2CXMYXMQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/ouch.cc at line 726 [6.1104358]
B:BD[4.33668] → [5.7798:7842]
```
    if (death_type == KILLED_BY_TARGETTING)
```
[4.33609]
[5.7842]
```
    if (you.religion == GOD_XOM)
```

Replacement in crawl-ref/source/ouch.cc at line 728 [6.1104358]

B:BD[5.7848] → [5.7848:8052]

B:BD[5.8052] → [7.2552:2612]

∅:D[7.2612] → [5.8111:8165]

B:BD[5.8111] → [5.8111:8165]

B:BD[5.8165] → [8.4228:4305]

B:BD[8.4305] → [9.3965:4018]

∅:D[9.4018] → [4.33803:33809]

∅:D[5.8310] → [4.33803:33809]

B:BD[4.33803] → [4.33803:33809]

B:BD[4.33809] → [8.4306:4322]

∅:D[8.4322] → [4.33826:33832]

B:BD[4.33826] → [4.33826:33832]

        // Xom thinks the player hurting him/herself is funny.
        xom_is_stimulated(255 * dam / (dam + you.hp));
        return;
    }
    else if (death_type == KILLED_BY_FALLING_DOWN_STAIRS)
    {
        // Xom thinks falling down the stairs is hilarious.
        xom_is_stimulated(255);
        return;
    }
    else if (death_type != KILLED_BY_MONSTER && death_type != KILLED_BY_BEAM
             || invalid_monster_index(death_source))
    {
        return;
    }

[5.7848]

[5.8311]

        if (death_type == KILLED_BY_TARGETTING)
        {
            // Xom thinks the player hurting him/herself is funny.
            xom_is_stimulated(255 * dam / (dam + you.hp));
            return;
        }
        else if (death_type == KILLED_BY_FALLING_DOWN_STAIRS)
        {
            // Xom thinks falling down the stairs is hilarious.
            xom_is_stimulated(255);
            return;
        }
        else if (death_type != KILLED_BY_MONSTER
                && death_type != KILLED_BY_BEAM
                    || invalid_monster_index(death_source))
        {
            return;
        }

Replacement in crawl-ref/source/ouch.cc at line 747 [6.1104358]
∅:D[5.8312] → [4.33837:33865]
B:BD[4.33837] → [4.33837:33865]
```
    int amusementvalue = 1;
```
[5.8312]
[4.33865]
```
        int amusementvalue = 1;
        const monsters *monster = &menv[death_source];
```

Replacement in crawl-ref/source/ouch.cc at line 750 [6.1104358]

B:BD[4.33866] → [4.33866:33917]

    const monsters *monster = &menv[death_source];

[4.33866]

[4.33917]

        if (!monster->alive())
            return;

Replacement in crawl-ref/source/ouch.cc at line 753 [6.1104358]

B:BD[4.33918] → [4.33918:33961]

    if (!monster->alive())
        return;

[4.33918]

[4.33961]

        if (mons_wont_attack(monster))
        {
            // Xom thinks collateral damage is funny.
            xom_is_stimulated(255 * dam / (dam + you.hp));
            return;
        }

Replacement in crawl-ref/source/ouch.cc at line 760 [6.1104358]

B:BD[4.33962] → [2.2552:2587]

∅:D[2.2587] → [5.8361:8367]

B:BD[5.8361] → [5.8361:8367]

B:BD[5.8367] → [7.2613:2663]

∅:D[7.2663] → [5.8416:8493]

B:BD[5.8416] → [5.8416:8493]

    if (mons_wont_attack(monster))
    {
        // Xom thinks collateral damage is funny.
        xom_is_stimulated(255 * dam / (dam + you.hp));
        return;
    }

[4.33962]

[5.8493]

        int leveldif = monster->hit_dice - you.experience_level;
        if (leveldif == 0)
            leveldif = 1;

Replacement in crawl-ref/source/ouch.cc at line 764 [6.1104358]

∅:D[5.8494] → [4.33962:34023]

B:BD[4.33962] → [4.33962:34023]

    int leveldif = monster->hit_dice - you.experience_level;

[5.8494]

[6.1118440]

        // Note that Xom is amused when you are significantly hurt by a
        // creature of higher level than yourself, as well as by a
        // creature of lower level than yourself.
        amusementvalue += leveldif * leveldif * dam;

Replacement in crawl-ref/source/ouch.cc at line 769 [6.1104358]

B:BD[6.1118441] → [4.34024:34069]

    if (leveldif == 0)
        leveldif = 1;

[6.1118441]

[4.34069]

        if (!player_monster_visible(monster))
            amusementvalue += 10;

Replacement in crawl-ref/source/ouch.cc at line 772 [6.1104358]

B:BD[4.34070] → [7.2664:2841]

∅:D[7.2841] → [4.34250:34299]

B:BD[4.34250] → [4.34250:34299]

    // Note that Xom is amused when you are significantly hurt by a
    // creature of higher level than yourself, as well as by a creature
    // of lower level than yourself.
    amusementvalue += leveldif * leveldif * dam;

[4.34070]

[10.3384]

        if (monster->speed < (int)player_movement_speed())
            amusementvalue += 8;

Replacement in crawl-ref/source/ouch.cc at line 775 [6.1104358]

∅:D[10.3385] → [4.34304:34376]

B:BD[4.34304] → [4.34304:34376]

B:BD[4.34376] → [10.3386:3387]

∅:D[10.3387] → [4.34381:34466]

B:BD[4.34381] → [4.34381:34466]

B:BD[4.34466] → [10.3388:3389]

∅:D[10.3389] → [4.34471:34515]

B:BD[4.34471] → [4.34471:34515]

B:BD[4.34515] → [11.3096:3163]

    if (!player_monster_visible(monster))
        amusementvalue += 10;
    if (monster->speed < (int) player_movement_speed())
        amusementvalue += 8;
    if (death_type != KILLED_BY_BEAM)
    {
        if (you.skills[SK_THROWING] <= (you.experience_level / 4))

[10.3385]

[4.34587]

        if (death_type != KILLED_BY_BEAM
            && you.skills[SK_THROWING] <= (you.experience_level / 4))
        {

Replacement in crawl-ref/source/ouch.cc at line 779 [6.1104358]

B:BD[4.34620] → [4.34620:34708]

    }
    else
    {
        if (you.skills[SK_FIGHTING] <= (you.experience_level / 4))

[4.34620]

[4.34708]

        }
        else if (you.skills[SK_FIGHTING] <= (you.experience_level / 4))

Deletion in crawl-ref/source/ouch.cc at line 782 [6.1104358]
B:BD[4.34741] → [4.34741:34747]
```
    }
```

Replacement in crawl-ref/source/ouch.cc at line 783 [6.1104358]

B:BD[4.34748] → [4.34748:34816]

    if (player_in_a_dangerous_place())
        amusementvalue += 2;

[4.34748]

[10.3390]

        if (player_in_a_dangerous_place())
            amusementvalue += 2;

Replacement in crawl-ref/source/ouch.cc at line 786 [6.1104358]
∅:D[10.3391] → [4.34829:34878]
B:BD[4.34829] → [4.34829:34878]
```
    amusementvalue /= (you.hp > 0) ? you.hp : 1;
```
[10.3391]
[10.3392]
```
        amusementvalue /= (you.hp > 0) ? you.hp : 1;
```
Replacement in crawl-ref/source/ouch.cc at line 788 [6.1104358]
∅:D[10.3393] → [4.34881:34920]
B:BD[4.34881] → [4.34881:34920]
```
    xom_is_stimulated(amusementvalue);
```
[10.3393]
[4.34920]
```
        xom_is_stimulated(amusementvalue);
    }
```
Deletion in crawl-ref/source/ouch.cc at line 794 [6.1104358]
B:BD[3.2692] → [3.2692:2765]
∅:D[3.2765] → [4.34922:34923]
B:BD[4.34922] → [4.34922:34923]
```
    if (dam <= 0 || invalid_monster_index(death_source))
        return;
```

Insertion in crawl-ref/source/ouch.cc at line 796 [6.1104358]

[3.2830]

        if (dam <= 0 || invalid_monster_index(death_source))
            return;