fiddlerwoaroof/crawl - Change 2H32CFFM2FNS63JJPNM2S6HMO543EX72GMPOU5GI6HTMQYPL6I3AC

* Add Cannibalism to list of forbidded actions for good gods.

Add simple warning message (god "did not appreciate that!") when using unID'd items that would otherwise be penalized.
Change protection from harm to be independent of prayer.

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

Created by j-p-e-g on November 13, 2007

2H32CFFM2FNS63JJPNM2S6HMO543EX72GMPOU5GI6HTMQYPL6I3AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells2.cc at line 4 [8.569242]
[8.569332]
[8.569332]
```
 *              Mostly Necromancy and Summoning.
```

Replacement in crawl-ref/source/spells2.cc at line 1142 [8.569242]

B:BD[9.334] → [10.198:260]

            did_god_conduct( DID_ATTACK_FRIEND, 5, monster );

[9.334]

[9.335]

            did_god_conduct( DID_ATTACK_FRIEND, 5, true, monster );

Insertion in crawl-ref/source/spells1.cc at line 4 [8.616635]
[8.616725]
[8.616725]
```
 *              Mostly Translocations.
```

Replacement in crawl-ref/source/religion.h at line 30 [8.800304]

B:BD[11.28860] → [10.285:342]

bool did_god_conduct(conduct_type thing_done, int pgain,

[11.28860]

[10.342]

bool did_god_conduct(conduct_type thing_done, int pgain, bool known = true,

Replacement in crawl-ref/source/religion.cc at line 1208 [8.804403]

B:BD[12.181765] → [10.394:474]

bool did_god_conduct( conduct_type thing_done, int level, const actor *victim )

[12.181765]

[8.836718]

bool did_god_conduct( conduct_type thing_done, int level, bool known,
                      const actor *victim )

Insertion in crawl-ref/source/religion.cc at line 1225 [8.804403]

[13.3488]

        case GOD_SHINING_ONE:
            if (!known)
            {
                simple_god_message(" did not appreciate that!");
                break;
            }
            penance = level;
            // deliberate fall-through

Insertion in crawl-ref/source/religion.cc at line 1234 [8.804403]

[13.3510]

        case GOD_ELYVILON:
            if (!known)
            {
                simple_god_message(" did not appreciate that!");
                break;
            }
            piety_change = -2*level;
            ret = true;
            break;
        default:
            break;
        }
        break;
    case DID_CANNIBALISM:
        switch (you.religion)
        {
        case GOD_ZIN:

Replacement in crawl-ref/source/religion.cc at line 1254 [8.804403]

B:BD[13.3567] → [13.3567:3662]

            // no penance as this can happen accidentally
            piety_change = -2*level;

[13.3567]

[13.3662]

            piety_change = -level;
            penance = level;

Replacement in crawl-ref/source/religion.cc at line 1263 [8.804403]

B:BD[13.3767] → [14.163:237]

    // If you make some god like these acts, modify did_god_conduct call

[13.3767]

[14.237]

    // If you make some god like these acts, modify did_god_conduct call

Insertion in crawl-ref/source/religion.cc at line 1273 [8.804403]

[12.182165]

            if (!known)
            {
                simple_god_message(" did not appreciate that!");
                break;
            }

Replacement in crawl-ref/source/religion.cc at line 1279 [8.804403]

B:BD[12.182200] → [12.182200:182267]

            penance = level * ((you.religion == GOD_ZIN) ? 2 : 1);

[12.182200]

[12.182267]

            penance = level * ((you.religion == GOD_SHINING_ONE) ? 2 : 1);

Replacement in crawl-ref/source/religion.cc at line 1691 [8.804403]

B:BD[12.189931] → [12.189931:190175]

          "Kill Wizard",
          "Kill Priest", "Kill Angel", "Undead Slave Kill Living", 
          "Servant Kill Living", "Servant Kill Undead", 
          "Servant Kill Demon", "Servant Kill Natural Evil", 
          "Servant Kill Angel",

[12.189931]

[12.190175]

          "Kill Wizard", "Kill Priest", "Kill Angel", "Undead Slave Kill Living",
          "Servant Kill Living", "Servant Kill Undead", "Servant Kill Demon",
          "Servant Kill Natural Evil", "Servant Kill Angel",

Replacement in crawl-ref/source/religion.cc at line 1695 [8.804403]

B:BD[12.190255] → [15.421:496]

          "Cards", "Stimulants", "Drink Blood", "Eat Meat", "Create Life"

[12.190255]

[12.190315]

          "Cards", "Stimulants", "Drink Blood", "Cannibalism", "Eat Meat",
          "Create Life"

Insertion in crawl-ref/source/player.h at line 329 [8.945993]
[5.549]
[8.958772]
```
bool is_player_same_species( const int mon );
```

Insertion in crawl-ref/source/player.cc at line 410 [8.962854]

[8.966926]

[16.295]


bool is_player_same_species(const int mon)
{
    switch (you.species)
    {
        case SP_HUMAN:
            if (mons_species(mon) == MONS_HUMAN)
                return (true);
            return (false);
        case SP_CENTAUR:
            if (mons_species(mon) == MONS_CENTAUR)
                return (true);
            return (false);
        case SP_OGRE:
        case SP_OGRE_MAGE:
            if (mons_species(mon) == MONS_OGRE)
                return (true);
            return (false);
        case SP_TROLL:
            if (mons_species(mon) == MONS_TROLL)
                return (true);
            return (false);
        case SP_MUMMY:
            if (mons_species(mon) == MONS_MUMMY)
                return (true);
            return (false);
        case SP_VAMPIRE:
            if (mons_species(mon) == MONS_VAMPIRE)
                return (true);
            return (false);
        case SP_MINOTAUR:
            if (mons_species(mon) == MONS_MINOTAUR)
                return (true);
            return (false);
        case SP_NAGA:
            if (mons_species(mon) == MONS_NAGA)
                return (true);
            return (false);
        case SP_HILL_ORC:
            if (mons_species(mon) == MONS_ORC)
                return (true);
            return (false);
        case SP_MERFOLK:
            if (mons_species(mon) == MONS_MERFOLK
                || mons_species(mon) == MONS_MERMAID)
            {
                return (true);
            }
            return (false);

Insertion in crawl-ref/source/player.cc at line 460 [8.962854]

[16.296]

        case SP_GREY_ELF:
        case SP_HIGH_ELF:
        case SP_DEEP_ELF:
        case SP_SLUDGE_ELF:
            if (mons_species(mon) == MONS_ELF)
                return (true);
            return (false);
        case SP_RED_DRACONIAN:
        case SP_WHITE_DRACONIAN:
        case SP_GREEN_DRACONIAN:
        case SP_GOLDEN_DRACONIAN:
        case SP_GREY_DRACONIAN:
        case SP_BLACK_DRACONIAN:
        case SP_PURPLE_DRACONIAN:
        case SP_MOTTLED_DRACONIAN:
        case SP_PALE_DRACONIAN:
            if (mons_species(mon) == MONS_DRACONIAN)
                return (true);
            return (false);
        case SP_KOBOLD:
            if (mons_species(mon) == MONS_KOBOLD)
                return (true);
            return (false);
        default: // no monster equivalent
            return (false);
    }
}

Replacement in crawl-ref/source/player.cc at line 5753 [8.962854]

B:BD[10.763] → [10.763:820]

            did_god_conduct(DID_ATTACK_FRIEND, 5, mons);

[10.763]

[17.6886]

            did_god_conduct(DID_ATTACK_FRIEND, 5, true, mons);

Replacement in crawl-ref/source/ouch.cc at line 794 [8.1104358]

B:BD[8.1119639] → [8.1119639:1119697]

B:BD[8.1119697] → [18.389:434]

            if (dam >= you.hp && you.duration[DUR_PRAYER]
                && random2(you.piety) >= 30)

[8.1119639]

[8.1119774]

            if (dam >= you.hp
                && (one_chance_in(10) || you.piety > random2(1000)))

Replacement in crawl-ref/source/monstuff.cc at line 716 [8.1396662]

B:BD[10.922] → [10.922:964]

                                monster);

[10.922]

[8.1413220]

                                true, monster);

Replacement in crawl-ref/source/mon-data.h at line 3589 [8.1826214]

B:BD[8.1915992] → [19.50671:50737]

    2, 13, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_NORMAL,

[8.1915992]

[19.50737]

    2, 13, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL,

Replacement in crawl-ref/source/mon-data.h at line 4010 [8.1826214]

B:BD[20.8161] → [20.8161:8230]

    4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH,

[20.8161]

[3.214]

    4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL,

Replacement in crawl-ref/source/mon-data.h at line 4022 [8.1826214]

B:BD[20.8597] → [20.8597:8666]

    4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH,

[20.8597]

[3.274]

    4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL,

Insertion in crawl-ref/source/itemname.h at line 97 [8.2661173]
[21.359873]
[22.1241]
```
bool item_type_known( const object_class_type base_type, const int sub_type );
```

Insertion in crawl-ref/source/itemname.cc at line 1608 [8.2667494]

[22.1589]

bool item_type_known(const object_class_type base_type, const int sub_type)
{
    const item_type_id_type idt = objtype_to_idtype(base_type);
    if ( idt != NUM_IDTYPE && sub_type < 50  )
        return ( type_ids[idt][sub_type] == ID_KNOWN_TYPE );
    else
        return false;
}

Replacement in crawl-ref/source/item_use.cc at line 3454 [8.2781507]

B:BD[23.571] → [23.571:696]

        if (get_ident_type(OBJ_SCROLLS, SCR_ENCHANT_WEAPON_III)==ID_KNOWN_TYPE)
            did_god_conduct(DID_UNHOLY, 10);

[23.571]

[23.696]

        did_god_conduct(DID_UNHOLY, 10,
            get_ident_type(OBJ_SCROLLS, SCR_ENCHANT_WEAPON_III)==ID_KNOWN_TYPE);

Replacement in crawl-ref/source/item_use.cc at line 3903 [8.2781507]
B:BD[8.2862567] → [7.534:571]
∅:D[7.571] → [12.762390:762435]
∅:D[22.3497] → [12.762390:762435]
B:BD[8.2862650] → [12.762390:762435]
```
        if (item_type_known(scroll))
            did_god_conduct(DID_UNHOLY, 10);
```
[8.2862567]
[8.2862701]
```
        did_god_conduct(DID_UNHOLY, 10, item_type_known(scroll));
```
Replacement in crawl-ref/source/it_use2.cc at line 50 [8.2904329]
B:BD[8.2905527] → [8.2905527:2905528]
[8.2905527]
[8.2905528]
```
    bool was_known = item_type_known(OBJ_POTIONS, (int) pot_eff);
```

Replacement in crawl-ref/source/it_use2.cc at line 123 [8.2904329]

B:BD[8.2907024] → [24.3877:3936]

        did_god_conduct( DID_STIMULANTS, 4 + random2(4) );

[8.2907024]

[8.2907093]

        did_god_conduct( DID_STIMULANTS, 4 + random2(4), was_known );

Replacement in crawl-ref/source/it_use2.cc at line 338 [8.2904329]

B:BD[13.15306] → [25.300:358]

        did_god_conduct(DID_DRINK_BLOOD, 1 + random2(3));

[13.15306]

        did_god_conduct(DID_DRINK_BLOOD, 1 + random2(3), was_known);

Replacement in crawl-ref/source/food.cc at line 58 [8.3043806]
B:BD[8.3044834] → [8.3044834:3044878]
```
static void  eat_chunk( int chunk_effect );
```
[8.3044834]
[8.3044937]
```
static void  eat_chunk( int chunk_effect, bool cannibal );
```
Insertion in crawl-ref/source/food.cc at line 673 [8.3043806]
[8.3062215]
[12.853913]
```
        const bool cannibal = is_player_same_species(mons_type);
```

Replacement in crawl-ref/source/food.cc at line 680 [8.3043806]

B:BD[8.3062355] → [8.3062355:3062422]

        eat_chunk( determine_chunk_effect( chunk_type, rotten ) );

[8.3062355]

[8.3062422]

        eat_chunk( determine_chunk_effect( chunk_type, rotten ), cannibal );

Insertion in crawl-ref/source/food.cc at line 722 [8.3043806]

[12.854053]

[21.430635]

        const bool cannibal = is_player_same_species( mitm[item_link].plus );

Replacement in crawl-ref/source/food.cc at line 726 [8.3043806]

∅:D[26.1132] → [21.430697:430764]

B:BD[8.3062681] → [21.430697:430764]

        eat_chunk( determine_chunk_effect( chunk_type, rotten ) );

[26.1122]

[21.430764]

        eat_chunk( determine_chunk_effect( chunk_type, rotten ), cannibal );

Replacement in crawl-ref/source/food.cc at line 859 [8.3043806]
B:BD[8.3064199] → [8.3064199:3064241]
```
static void eat_chunk( int chunk_effect )
```
[8.3064199]
[8.3064241]
```
static void eat_chunk( int chunk_effect, bool cannibal )
```

Insertion in crawl-ref/source/food.cc at line 941 [8.3043806]

[8.3065933]

[4.5246]

    if (cannibal)
        did_god_conduct( DID_CANNIBALISM, 10 );

Insertion in crawl-ref/source/enum.h at line 635 [8.3287960]
[13.24369]
[12.909182]
```
    DID_CANNIBALISM,
```

Insertion in crawl-ref/source/delay.cc at line 640 [8.3963459]

[12.1005790]

[27.579]

            if (is_good_god(you.religion) && is_player_same_species(item.plus))
                simple_god_message(" expects more respect for your departed "
                                   "relatives.");

Replacement in crawl-ref/source/beam.cc at line 1673 [8.4128068]

B:BD[8.4183379] → [2.2144:2272]

            if (YOU_KILL(pbolt.thrower) && pbolt.effect_known)
                did_god_conduct(DID_NECROMANCY, 2 + random2(3));

[8.4183379]

[28.293]

            if (YOU_KILL(pbolt.thrower))
                did_god_conduct(DID_NECROMANCY, 2 + random2(3), pbolt.effect_known);

Replacement in crawl-ref/source/beam.cc at line 3678 [8.4128068]

B:BD[10.1172] → [10.1172:1238]

                    did_god_conduct( DID_ATTACK_FRIEND, 5, mon );

[10.1172]

[12.1248011]

                    did_god_conduct( DID_ATTACK_FRIEND, 5, true, mon );

Replacement in crawl-ref/source/beam.cc at line 3681 [8.4128068]

B:BD[12.1248065] → [10.1239:1315]

                    did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, mon );

[12.1248065]

[6.1489]

                    did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, true, mon );

Replacement in crawl-ref/source/beam.cc at line 3834 [8.4128068]

B:BD[12.1249523] → [10.1316:1378]

                did_god_conduct( DID_ATTACK_FRIEND, 5, mon );

[12.1249523]

[12.1249580]

                did_god_conduct( DID_ATTACK_FRIEND, 5, true, mon );

Replacement in crawl-ref/source/beam.cc at line 3837 [8.4128068]

B:BD[12.1249630] → [10.1379:1451]

                did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, mon );

[12.1249630]

[8.4239223]

                did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, true, mon );