fiddlerwoaroof/crawl - Change NDCVITU5R7TBEUC4FILNFRKWQGUNCJUGW5HA5KW3CQTU6AYRLYWQC

Change conducts of Zin and TSO (!)

Zin:

DID_UNDEAD_KILLED_BY_SERVANT
DID_DEMON_KILLED_BY_SERVANT

DID_KILL_MUTATOR_OR_ROTTER (shapeshifters and monsters that have an attack AF_MUTATE or AF_ROT)

TSO:

DID_KILL_NATURAL_EVIL
DID_NATURAL_EVIL_KILLED_BY_SERVANT

Removed M_EVIL flag from a number of early monsters such as goblins and hobgoblins, and also from orcs, ogres, trolls and big kobold. Reasoning: The corresponding species are not considered evil themselves and are allowed to worship the good gods). Note that this weakens all forms of holy attacks!

Any attempt to charm evil, undead or demonic monsters will fail (no effect) for worshippers of TSO.

Like Makhleb, TSO now gets returning power (arguable) and hp from killing evil, undead and demonic monsters.

Zin's piety pool (from donations) is drained much quicker now, on average once every 5 turns.

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

Created by j-p-e-g on January 6, 2008

NDCVITU5R7TBEUC4FILNFRKWQGUNCJUGW5HA5KW3CQTU6AYRLYWQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 1337 [5.804403]

[5.838452]


    case DID_KILL_NATURAL_EVIL:
        if (you.religion == GOD_SHINING_ONE)
        {
            if (god_hates_attacking_friend(you.religion, victim))
                break;

Insertion in crawl-ref/source/religion.cc at line 1344 [5.804403]

[5.838453]

[6.635]

            simple_god_message(" accepts your kill.");
            ret = true;
            if (random2(level + 18) > 3)
                piety_change = 1;
        }
        break;
    case DID_KILL_MUTATOR_OR_ROTTER:
        if (you.religion == GOD_ZIN)
        {
            if (god_hates_attacking_friend(you.religion, victim))
                break;
            simple_god_message(" appreciates the killing of a spawn of chaos.");
            ret = true;
            if (random2(level + 18) > 3)
                piety_change = 1;
        }
        break;

Deletion in crawl-ref/source/religion.cc at line 1466 [5.804403]
B:BD[7.186268] → [7.186268:186290]
```
        case GOD_ZIN:
```
Deletion in crawl-ref/source/religion.cc at line 1484 [5.804403]
B:BD[5.840253] → [7.186578:186600]
```
        case GOD_ZIN:
```

Insertion in crawl-ref/source/religion.cc at line 1493 [5.804403]

[5.840335]

        }
        break;
    case DID_NATURAL_EVIL_KILLED_BY_SERVANT:
        if (you.religion == GOD_SHINING_ONE)
        {
            simple_god_message(" accepts your collateral kill.");
            ret = true;
            
            if (random2(level + 10) > 5)
                piety_change = 1;

Deletion in crawl-ref/source/religion.cc at line 1606 [5.804403]
B:BD[7.188626] → [6.689:747]
∅:D[6.747] → [7.188684:188742]
B:BD[7.188684] → [7.188684:188742]
```
    case DID_KILL_NATURAL_EVIL:                 // unused
    case DID_NATURAL_EVIL_KILLED_BY_SERVANT:    // unused
```
Insertion in crawl-ref/source/monstuff.h at line 67 [5.1390580]
[8.40283]
[5.1391738]
```
bool is_mons_evil_demonic_or_undead(monsters *mon);
```

Insertion in crawl-ref/source/monstuff.cc at line 470 [5.1396662]

[9.4695]

[10.1308]

}
bool is_mons_evil_demonic_or_undead(monsters *mons)
{
    return (mons_holiness(mons) == MH_UNDEAD
            || mons_holiness(mons) == MH_DEMONIC
            || mons_is_evil(mons));
}
static bool is_mons_mutator_or_rotter(monsters *mons)
{
    if (mons->has_ench(ENCH_GLOWING_SHAPESHIFTER, ENCH_SHAPESHIFTER))
        return true;
        
    const int attk_flavour = mons_attack_spec(mons, 0).flavour;
    return (attk_flavour == AF_MUTATE || attk_flavour == AF_ROT);

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

B:BD[11.261] → [11.261:321]

                if (mons_class_flag(monster->type, M_EVIL))

[11.261]

[11.321]

                if (mons_class_flag(monster->type, M_EVIL)
                    && mons_holiness(monster) == MH_NATURAL)
                {

Insertion in crawl-ref/source/monstuff.cc at line 664 [5.1396662]
[12.4221]
[5.1410641]
```
                }
```

Insertion in crawl-ref/source/monstuff.cc at line 666 [5.1396662]

[5.1410642]

[13.1218]

                if (is_mons_mutator_or_rotter(monster))
                    did_god_conduct(DID_KILL_MUTATOR_OR_ROTTER,
                                    monster->hit_dice, true, monster);

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

B:BD[2.242] → [2.242:293]

                    && you.religion == GOD_MAKHLEB

[2.242]

[2.293]

                    && (you.religion == GOD_MAKHLEB
                        || you.religion == GOD_SHINING_ONE
                           && is_mons_evil_demonic_or_undead(monster))

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

B:BD[14.244410] → [14.244410:244490]

                && (you.religion == GOD_MAKHLEB || you.religion == GOD_VEHUMET)

[14.244410]

[5.1411821]

                && (you.religion == GOD_MAKHLEB || you.religion == GOD_VEHUMET
                    || you.religion == GOD_SHINING_ONE
                       && is_mons_evil_demonic_or_undead(monster))

Insertion in crawl-ref/source/monstuff.cc at line 820 [5.1396662]

[5.1414773]


                if (you.religion == GOD_SHINING_ONE
                    && is_mons_evil_demonic_or_undead(monster)
                    && (!player_under_penance() && random2(you.piety) >= 30))
                {
                    monsters *mon = &menv[i];
                    if (mon->hit_points < mon->max_hit_points)
                    {
                        simple_monster_message(mon, " looks healthier.");
                        mon->hit_points += 1 + random2(monster->hit_dice / 4);
                        if (mon->hit_points >  mon->max_hit_points)
                            mon->hit_points = mon->max_hit_points;
                    }
                }

Replacement in crawl-ref/source/mon-data.h at line 218 [5.1826214]
B:BD[5.1831459] → [7.493645:493672]
```
    M_WARM_BLOOD | M_EVIL,
```
[5.1831459]
[7.493672]
```
    M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 308 [5.1826214]
B:BD[5.1833674] → [7.494484:494511]
```
    M_WARM_BLOOD | M_EVIL,
```
[5.1833674]
[7.494511]
```
    M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 495 [5.1826214]
B:BD[5.1838425] → [3.375:416]
```
    M_WARM_BLOOD | M_EVIL | M_TWOWEAPON,
```
[5.1838425]
[7.496175]
```
    M_WARM_BLOOD | M_TWOWEAPON,
```
Replacement in crawl-ref/source/mon-data.h at line 528 [5.1826214]
B:BD[5.1839293] → [7.496505:496532]
```
    M_WARM_BLOOD | M_EVIL,
```
[5.1839293]
[7.496532]
```
    M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 605 [5.1826214]
B:BD[5.1841270] → [7.497363:497390]
```
    M_WARM_BLOOD | M_EVIL,
```
[5.1841270]
[7.497390]
```
    M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 660 [5.1826214]
B:BD[5.1842560] → [15.21899:21926]
```
    M_WARM_BLOOD | M_EVIL,
```
[5.1842560]
[7.497848]
```
    M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 739 [5.1826214]
B:BD[5.1844517] → [16.176:215]
```
    M_FIGHTER | M_WARM_BLOOD | M_EVIL,
```
[5.1844517]
[7.498627]
```
    M_FIGHTER | M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 761 [5.1826214]
B:BD[5.1845095] → [7.498824:498885]
```
    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL,
```
[5.1845095]
[7.498885]
```
    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 772 [5.1826214]
B:BD[5.1845387] → [16.216:255]
```
    M_FIGHTER | M_WARM_BLOOD | M_EVIL,
```
[5.1845387]
[7.498977]
```
    M_FIGHTER | M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 810 [5.1826214]
B:BD[5.1846388] → [7.499229:499256]
```
    M_WARM_BLOOD | M_EVIL,
```
[5.1846388]
[7.499256]
```
    M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 1580 [5.1826214]
B:BD[5.1866822] → [7.507701:507728]
```
    M_WARM_BLOOD | M_EVIL,
```
[5.1866822]
[7.507728]
```
    M_WARM_BLOOD,
```

Replacement in crawl-ref/source/mon-data.h at line 1657 [5.1826214]

B:BD[5.1868811] → [7.508560:508635]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_EVIL,

[5.1868811]

[7.508635]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD,

Replacement in crawl-ref/source/mon-data.h at line 1862 [5.1826214]
B:BD[5.1874102] → [7.510450:510477]
```
    M_WARM_BLOOD | M_EVIL,
```
[5.1874102]
[7.510477]
```
    M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 2534 [5.1826214]
B:BD[5.1891877] → [16.1469:1508]
```
    M_FIGHTER | M_WARM_BLOOD | M_EVIL,
```
[5.1891877]
[7.518435]
```
    M_FIGHTER | M_WARM_BLOOD,
```

Replacement in crawl-ref/source/mon-data.h at line 2669 [5.1826214]

B:BD[5.1894981] → [7.519363:519429]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS,

[5.1894981]

[7.519429]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL,

Replacement in crawl-ref/source/enum.h at line 625 [5.3287960]

B:BD[6.7032] → [6.7032:7072]

    DID_KILL_NATURAL_EVIL,    // unused

[6.7032]

[6.7072]

    DID_KILL_NATURAL_EVIL,    // TSO
    DID_KILL_MUTATOR_OR_ROTTER, // Zin

Replacement in crawl-ref/source/enum.h at line 634 [5.3287960]
B:BD[7.908913] → [7.908913:908963]
```
    DID_NATURAL_EVIL_KILLED_BY_SERVANT, // unused
```
[7.908913]
[7.908963]
```
    DID_NATURAL_EVIL_KILLED_BY_SERVANT, // TSO
```

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

B:BD[5.4129608] → [5.4129608:4129670]

#define MON_AFFECTED    2           // monster was unaffected

[5.4129608]

[5.4129670]

#define MON_AFFECTED    2           // monster was affected
#define MON_OTHER       3           // monster unaffected, but for other reasons

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

[5.4194778]

[17.36686]

        if (you.religion == GOD_SHINING_ONE
            && is_mons_evil_demonic_or_undead(monster))
        {
            simple_monster_message(monster, " is repulsed!");
            return (MON_OTHER);
        }

Deletion in crawl-ref/source/beam.cc at line 4193 [5.4128068]
B:BD[5.4244729] → [5.4244729:4244783]
```
        simple_monster_message(mon, " is enslaved.");
```

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

[7.1251672]

[5.4244818]

        if (you.religion == GOD_SHINING_ONE)
        {
            simple_monster_message(mon, " is repulsed!");
            return (MON_OTHER);
        }

Insertion in crawl-ref/source/beam.cc at line 4200 [5.4128068]
[5.4244819]
[5.4244819]
```
        simple_monster_message(mon, " is enslaved.");
```

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

[18.1680]

[5.4245303]

        beam.obvious_effect = true;
        if (you.religion == GOD_SHINING_ONE)
        {
            simple_monster_message(mon, " is repulsed!");
            return (MON_OTHER);
        }

Deletion in crawl-ref/source/beam.cc at line 4233 [5.4128068]
B:BD[5.4245357] → [7.1251719:1251755]
```
        beam.obvious_effect = true;
```

Replacement in crawl-ref/source/acr.cc at line 2660 [5.4397395]

B:BD[4.6480] → [4.6480:6539]

    if (you.duration[DUR_PIETY_POOL] && one_chance_in(20))

[4.6480]

[4.6539]

    if (you.duration[DUR_PIETY_POOL] && one_chance_in(5))

Change conducts of Zin and TSO (!)

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/religion.cc at line 1337 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 1344 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 1466 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 1484 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 1493 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 1606 [5.804403]

Insertion in crawl-ref/source/monstuff.h at line 67 [5.1390580]

Insertion in crawl-ref/source/monstuff.cc at line 470 [5.1396662]

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

Insertion in crawl-ref/source/monstuff.cc at line 664 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 666 [5.1396662]

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

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

Insertion in crawl-ref/source/monstuff.cc at line 820 [5.1396662]

Replacement in crawl-ref/source/mon-data.h at line 218 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 308 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 495 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 528 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 605 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 660 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 739 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 761 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 772 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 810 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1580 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1657 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1862 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2534 [5.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2669 [5.1826214]

Replacement in crawl-ref/source/enum.h at line 625 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 634 [5.3287960]

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

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

Deletion in crawl-ref/source/beam.cc at line 4193 [5.4128068]

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

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

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

Deletion in crawl-ref/source/beam.cc at line 4233 [5.4128068]

Replacement in crawl-ref/source/acr.cc at line 2660 [5.4397395]