fiddlerwoaroof/crawl - Change N5XD5IAOMEDF37AXEBALHFINB4H527T6YNTCHN5KKO6YHXAP5PNQC

Tweak recite to yield better results for holy beings.

As their MR will be unachievably high no matter what, their "resist value" instead depends on your Invocations skill. Change calculation of power, so high values are easier to reach, to a maximum of 50.

Also add special casing for neutral monsters so they no longer pretend not to have noticed you.

Oh, and I found a problem concerning holy beings: Now that the player can actually meet hostile holy monsters the good gods reaction at killing one of them needs to be changed accordingly. We cannot simply restrict it to friendly holy beings as, once hit, they won't be friendly anymore. Instead we'll have to use the CREATED_FRIENDLY flag that already takes care of not getting any xp for any being that used to be friendly.

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

Created by j-p-e-g on February 10, 2008

N5XD5IAOMEDF37AXEBALHFINB4H527T6YNTCHN5KKO6YHXAP5PNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 900 [6.16817]

B:BD[5.522] → [2.133:174]

    if (!force && mons_friendly(monster)

[5.522]

[5.553]

    if (!force && (mons_friendly(monster) || mons_neutral(monster))

Replacement in crawl-ref/source/monstuff.cc at line 1850 [6.1396662]
B:BD[6.1439950] → [7.3608:3648]
```
    bool isNeutral = mons_neutral(mon);
```
[6.1439950]
[6.1439950]
```
    bool isNeutral  = mons_neutral(mon);
```

Replacement in crawl-ref/source/monstuff.cc at line 1853 [6.1396662]

B:BD[6.1440006] → [6.1440006:1440074]

    bool isHurt = (mon->hit_points <= mon->max_hit_points / 4 - 1);

[6.1440006]

[6.1440074]

    bool isHurt    = (mon->hit_points <= mon->max_hit_points / 4 - 1);

Replacement in crawl-ref/source/monstuff.cc at line 1855 [6.1396662]

B:BD[6.1440140] → [6.1440140:1440195]

B:BD[6.1440195] → [8.8524:8570]

∅:D[8.8570] → [9.420767:420813]

B:BD[6.1440246] → [9.420767:420813]

    bool isSmart = (mons_intel(mon->type) > I_ANIMAL);
    bool isScared = mon->has_ench(ENCH_FEAR);
    bool isMobile = !mons_is_stationary(mon);

[6.1440140]

[6.1440559]

    bool isSmart   = (mons_intel(mon->type) > I_ANIMAL);
    bool isScared  = mon->has_ench(ENCH_FEAR);
    bool isMobile  = !mons_is_stationary(mon);

Replacement in crawl-ref/source/itemname.cc at line 888 [6.2667494]
B:BD[4.4976] → [4.4976:5007]
```
    case 2: return "heavily ";
```
[4.4976]
[4.5007]
```
    case 2: return "weird ";
```

Replacement in crawl-ref/source/direct.cc at line 797 [6.3697945]

B:BD[10.1061] → [7.13564:13730]

                m.attitude = m.attitude == ATT_FRIENDLY? ATT_NEUTRAL :
                    m.attitude == ATT_HOSTILE? ATT_FRIENDLY :
                    ATT_HOSTILE;

[10.1061]

[5.34636]

                m.attitude = (m.attitude == ATT_FRIENDLY? ATT_NEUTRAL :
                              m.attitude == ATT_HOSTILE ? ATT_FRIENDLY
                                                        : ATT_HOSTILE);

Replacement in crawl-ref/source/direct.cc at line 1953 [6.3697945]

B:BD[11.3099] → [11.3099:3159]

       else if (!mons_friendly(mon) && mon->foe != MHITYOU)

[11.3099]

[11.3159]

       else if (!mons_friendly(mon) && !mons_neutral(mon) && mon->foe != MHITYOU)

Insertion in crawl-ref/source/delay.cc at line 69 [6.3963459]
[12.3366]
[3.2903]
```
// power is maximum 50
```

Replacement in crawl-ref/source/delay.cc at line 86 [6.3963459]

B:BD[12.3984] → [3.3035:3083]

    const int resist = mons_resist_magic(mons);

[12.3984]

[3.3083]

    int resist;
    const int holiness = mons_holiness(mons);
    if (holiness == MH_HOLY)
    {
        resist = 7 - random2(you.skills[SK_INVOCATIONS]);
        if (resist < 0)
            resist = 0;
    }
    else
    {
        resist = mons_resist_magic(mons);
        
        // much lower chances at influencing demons
        if (holiness == MH_DEMONIC)
            pow -= 3 + random2(5);
    }

Deletion in crawl-ref/source/delay.cc at line 104 [6.3963459]

B:BD[3.3102] → [3.3102:3234]

    
    // much lower chances at influencing demons
    if (mons_class_holiness(mon) == MH_DEMONIC)
        pow -= 3 + random2(5);

Replacement in crawl-ref/source/abl-show.cc at line 1318 [6.4494389]

B:BD[12.9357] → [3.6094:6292]

//        const int pow = (you.skills[SK_INVOCATIONS] + 12) * (50 + you.piety) / 600;
        // up to (60 + 33)/3 = 31
        const int pow = ( 2*skill_bump(SK_INVOCATIONS) + you.piety / 6 ) / 3;

[12.9357]

[12.9441]

        // up to (60 + 40)/2 = 50
        const int pow = ( 2*skill_bump(SK_INVOCATIONS) + you.piety / 5 ) / 2;