fiddlerwoaroof/crawl - Change WZNB427K3EUNV3FMVXLQTM4UIHER4FIKQXWLUUXRNQC3OQ33VQYAC

First part of godly changes.

Ely now has "Destroy Weapon" ability, and Trog "Burn Books". The latter is very powerful as it explicitly allows burning monsters, which is cool but might be too strong. I couldn't think of a rationale for Trog not to allow this, though.

Also, all killings are now accepted without prayer, and sacrifice-loving gods won't acccept rotten corpses anymore.

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

Created by j-p-e-g on August 3, 2007

WZNB427K3EUNV3FMVXLQTM4UIHER4FIKQXWLUUXRNQC3OQ33VQYAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.h at line 49 [5.800304]
[3.188]
[4.29175]
```
void ely_destroy_weapons();
void trog_burn_books();
```
Insertion in crawl-ref/source/religion.cc at line 39 [5.804403]
[6.98]
[5.805333]
```
#include "cloud.h"
```
Insertion in crawl-ref/source/religion.cc at line 66 [5.804403]
[5.805742]
[5.805742]
```
#include "spl-book.h"
```
Replacement in crawl-ref/source/religion.cc at line 1061 [5.804403]
B:BD[5.837356] → [7.183536:183572]
```
    case DID_DEDICATED_KILL_LIVING:
```
[5.837356]
[5.837385]
```
    case DID_KILL_LIVING:
```

Replacement in crawl-ref/source/religion.cc at line 1065 [5.804403]

B:BD[7.183600] → [7.183600:183753]

            simple_god_message(" did not appreciate that!");
            ret = true;
            piety_change = -level;
            penance = level * 2;

[7.183600]

[7.183753]

            // killing only disapproved during prayer
            if (you.duration[DUR_PRAYER])
            { 
                simple_god_message(" did not appreciate that!");
                ret = true;
                piety_change = -level;
                penance = level * 2;
            }

Replacement in crawl-ref/source/religion.cc at line 1094 [5.804403]
B:BD[5.837727] → [7.183986:184022]
```
    case DID_DEDICATED_KILL_UNDEAD:
```
[5.837727]
[5.837755]
```
    case DID_KILL_UNDEAD:
```
Replacement in crawl-ref/source/religion.cc at line 1115 [5.804403]
B:BD[5.838097] → [7.184150:184187]
```
    case DID_DEDICATED_KILL_DEMON:  
```
[5.838097]
[5.838158]
```
    case DID_KILL_DEMON:  
```
Replacement in crawl-ref/source/religion.cc at line 1134 [5.804403]
B:BD[5.838453] → [8.5856:5892]
```
    case DID_DEDICATED_KILL_PRIEST:
```
[5.838453]
[8.5892]
```
    case DID_KILL_PRIEST:
```
Replacement in crawl-ref/source/religion.cc at line 1145 [5.804403]
∅:D[8.6156] → [7.184369:184405]
B:BD[5.838453] → [7.184369:184405]
```
    case DID_DEDICATED_KILL_WIZARD:
```
[8.6156]
[5.838573]
```
    case DID_KILL_WIZARD:
```

Replacement in crawl-ref/source/religion.cc at line 1318 [5.804403]

B:BD[7.188626] → [7.188626:188684]

    case DID_DEDICATED_KILL_NATURAL_EVIL:       // unused

[7.188626]

[7.188684]

    case DID_KILL_NATURAL_EVIL:                 // unused

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

[9.609]

}
void ely_destroy_weapons()
{
    if (you.religion != GOD_ELYVILON)
        return;
        
    bool success;
    int i = igrd[you.x_pos][you.y_pos];
    while (i != NON_ITEM)
    {
        const int next = mitm[i].link;  // in case we can't get it later.
        if (mitm[i].base_type != OBJ_WEAPONS
            && mitm[i].base_type != OBJ_MISSILES)
        {
            i = next;
            continue;
        }
        
        const char *ssuffix = mitm[i].quantity == 1? "s" : "";
        std::string text = mitm[i].name(DESC_CAP_THE);
        text += " shimmer"; text += ssuffix;
        text += " and break"; text += ssuffix;
        text += " into pieces.";
        mpr(text.c_str());
        const int value = item_value( mitm[i], true );
#ifdef DEBUG_DIAGNOSTICS
        mprf(MSGCH_DIAGNOSTICS, "Destroyed weapon value: %d", value);
#endif
        if (random2(value) >= random2(50)
            || (mitm[i].base_type == OBJ_WEAPONS
                && (you.piety < 30 || player_under_penance())))
        {
                gain_piety(1);
        }
        
        destroy_item(i);
        success = true;
        i = next;
    }
    if (!success)
    {
        mpr("There are no weapons here to destroy!");
    }
}
void trog_burn_books()
{
    if (you.religion != GOD_TROG)
        return;
    int i = igrd[you.x_pos][you.y_pos];
    while (i != NON_ITEM)
    {
        const int next = mitm[i].link;  // in case we can't get it later.
        if (mitm[i].base_type == OBJ_BOOKS
            && mitm[i].sub_type != BOOK_MANUAL)
        {
            mpr("Burning your own feet might not be such a smart idea!");
            return;
        }
        i = next;
    }
    
    int totalcount = 0;
    for (int xpos = you.x_pos - 8; xpos < you.x_pos + 8; xpos++)
        for (int ypos = you.y_pos - 8; ypos < you.y_pos + 8; ypos++)
        {
             // checked above
             if (xpos == you.x_pos && ypos == you.y_pos)
             {
                 continue;
             }
             // burn only squares in sight
             if (!see_grid(xpos, ypos))
             {
                 continue;
             }
             // if a grid is blocked, books lying there will be ignored
             // allow bombing of monsters
             const int cloud = env.cgrid[xpos][ypos];
             if (grid_is_solid(grd[ xpos ][ ypos ]) ||
//                 mgrd[ xpos ][ ypos ] != NON_MONSTER ||
                 (cloud != EMPTY_CLOUD && env.cloud[cloud].type != CLOUD_FIRE))
             {
                 continue;
             }
             
             int count = 0;
             int rarity = 0;
             i = igrd[xpos][ypos];
             while (i != NON_ITEM)
             {
                 const int next = mitm[i].link;  // in case we can't get it later.
                 if (mitm[i].base_type != OBJ_BOOKS
                     || mitm[i].sub_type == BOOK_MANUAL)
                 {
                     i = next;
                     continue;
                 }
                 rarity += book_rarity(mitm[i].sub_type);
                 
#ifdef DEBUG_DIAGNOSTICS
                 mprf(MSGCH_DIAGNOSTICS, "Burned book rarity: %d", rarity);
#endif
                 destroy_item(i);
                 count++;
                 i = next;
             }
             if (count)
             {
                  totalcount += count;
                  if ( cloud != EMPTY_CLOUD )
                  {
                     // reinforce the cloud
                     mpr( "The fire roars with new energy!" );
                     const int extra_dur = count + random2(rarity/2);
                     env.cloud[cloud].decay += extra_dur * 5;
                     env.cloud[cloud].whose = KC_YOU;
                     continue;
                  }
                  int durat = 4 + count + random2(rarity/2);
                  if (durat > 23)
                      durat = 23;
                  place_cloud( CLOUD_FIRE, xpos, ypos, durat, KC_YOU );
                  const char *plural = count == 1? "" : "s";
                  const char *ssuffix = count == 1? "s" : "";
                  std::string text = "The book"; text += plural;
                  text += " burst"; text += ssuffix;
                  text += " into flames.";
                  mpr(text.c_str());
             }
        }
        
    if (!totalcount)
    {
         mpr("There are no books in sight to burn!");
    }
    else
    {
         simple_god_message(" is delighted!", GOD_TROG);
         gain_piety(totalcount*5);
    }

Replacement in crawl-ref/source/religion.cc at line 2682 [5.804403]
B:BD[2.357] → [2.357:423]
```
    case GOD_NEMELEX_XOBEH:                    case GOD_ELYVILON:
```
[2.357]
[2.423]
```
    case GOD_NEMELEX_XOBEH:
```
Insertion in crawl-ref/source/religion.cc at line 2687 [5.804403]
[2.579]
[2.579]
```
    case GOD_ELYVILON:
```

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

B:BD[2.913] → [2.913:1041]

    case GOD_ELYVILON:
        return
            item.base_type == OBJ_WEAPONS ||
            item.base_type == OBJ_MISSILES;

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

B:BD[5.881314] → [5.881314:881361]

B:BD[5.881679] → [5.881679:881907]

            break;
        case GOD_ELYVILON:
            if (random2(value) >= random2(50) 
                || (mitm[i].base_type == OBJ_WEAPONS 
                    && (you.piety < 30 || player_under_penance())))
            {
                gain_piety(1);
            }

Deletion in crawl-ref/source/ouch.cc at line 771 [5.1104358]
B:BD[5.1119922] → [5.1119922:1119983]
```
        // Damage applied here:
        dec_hp( dam, true );
```

Insertion in crawl-ref/source/ouch.cc at line 775 [5.1104358]

[5.1120170]

[4.34924]

        {
            if (you.religion == GOD_ELYVILON && one_chance_in(3))
            {
                simple_god_message( " shields you from harm!" );
                return;
            }
            // Damage applied here:
            dec_hp( dam, true );

Insertion in crawl-ref/source/ouch.cc at line 784 [5.1104358]

[4.34984]

[5.1120231]

        }
        else
            dec_hp( dam, true );

Insertion in crawl-ref/source/ouch.cc at line 788 [5.1104358]
[5.1120232]
[4.34985]

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

B:BD[5.1410009] → [5.1410009:1410073]

B:BD[5.1410073] → [7.412601:412791]

                if (you.duration[DUR_PRAYER])
                {
                    if (mons_holiness(monster) == MH_NATURAL)
                        did_god_conduct(DID_DEDICATED_KILL_LIVING, 
                                        monster->hit_dice);

[5.1410009]

[5.1410215]

                if (mons_holiness(monster) == MH_NATURAL)
                    did_god_conduct(DID_KILL_LIVING,
                                    monster->hit_dice);

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

B:BD[5.1410216] → [7.412792:412981]

                    if (mons_holiness(monster) == MH_UNDEAD)
                        did_god_conduct(DID_DEDICATED_KILL_UNDEAD, 
                                        monster->hit_dice);

[5.1410216]

[5.1410499]

                if (mons_holiness(monster) == MH_UNDEAD)
                    did_god_conduct(DID_KILL_UNDEAD,
                                    monster->hit_dice);

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

B:BD[5.1410500] → [7.412982:413171]

                    if (mons_holiness(monster) == MH_DEMONIC)
                        did_god_conduct(DID_DEDICATED_KILL_DEMON, 
                                        monster->hit_dice);

[5.1410500]

[5.1410641]

                if (mons_holiness(monster) == MH_DEMONIC)
                    did_god_conduct(DID_KILL_DEMON,
                                    monster->hit_dice);

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

B:BD[5.1410642] → [5.1410642:1410688]

B:BD[5.1410688] → [10.73:126]

∅:D[10.126] → [7.413245:413372]

B:BD[7.413245] → [7.413245:413372]

                    //jmf: Trog hates wizards
                    if (mons_is_magic_user(monster))
                        did_god_conduct(DID_DEDICATED_KILL_WIZARD,
                                        monster->hit_dice);

[5.1410642]

[5.1410829]

                //jmf: Trog hates wizards
                if (mons_is_magic_user(monster))
                    did_god_conduct(DID_KILL_WIZARD,
                                    monster->hit_dice);

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

B:BD[5.1410830] → [5.1410830:1410886]

B:BD[5.1410886] → [7.413373:413567]

∅:D[7.413567] → [5.1411193:1411211]

B:BD[5.1411193] → [5.1411193:1411211]

                    //jmf: maybe someone hates priests?
                    if (mons_class_flag(monster->type, M_PRIEST))
                        did_god_conduct(DID_DEDICATED_KILL_PRIEST, 
                                        monster->hit_dice);
                }

[5.1410830]

[7.413568]

                //Beogh hates priests
                if (mons_class_flag(monster->type, M_PRIEST))
                    did_god_conduct(DID_KILL_PRIEST,
                                    monster->hit_dice);

Replacement in crawl-ref/source/food.cc at line 328 [5.3043806]

B:BD[5.3054681] → [11.2323:2367]

            if (you.duration[DUR_PRAYER] &&

[5.3054681]

[12.1166]

            bool rotten = (mitm[objl].special < 100);
            if (you.duration[DUR_PRAYER] && !rotten &&

Replacement in crawl-ref/source/enum.h at line 96 [5.3287960]
B:BD[5.3291328] → [5.3291328:3291354]
```
    ABIL_OKAWARU_HEALING,
```
[5.3291328]
[5.3291354]
```
    // Okawaru no longer heals (JPEG)
```
Insertion in crawl-ref/source/enum.h at line 104 [5.3287960]
[7.903454]
[5.3291655]
```
    ABIL_TROG_BURN_BOOKS,
```
Insertion in crawl-ref/source/enum.h at line 108 [5.3287960]
[5.3291774]
[5.3291774]
```
    ABIL_ELYVILON_DESTROY_WEAPONS,
```

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

B:BD[7.908400] → [7.908400:908573]

B:BD[7.908573] → [8.20692:20723]

∅:D[8.20723] → [7.908623:908753]

B:BD[7.908623] → [7.908623:908753]

    DID_DEDICATED_KILL_LIVING,
    DID_DEDICATED_KILL_UNDEAD,
    DID_DEDICATED_KILL_DEMON,
    DID_DEDICATED_KILL_NATURAL_EVIL,    // unused
    DID_DEDICATED_KILL_WIZARD,
    DID_DEDICATED_KILL_PRIEST,
    // [dshaligram] No distinction between killing Angels during prayer or
    //              otherwise, borrowed from bwr 4.1.

[7.908400]

[7.908753]

    // killings need no longer be dedicated (JPEG)
    DID_KILL_LIVING,
    DID_KILL_UNDEAD,
    DID_KILL_DEMON,
    DID_KILL_NATURAL_EVIL,    // unused
    DID_KILL_WIZARD,
    DID_KILL_PRIEST,

Replacement in crawl-ref/source/abl-show.cc at line 116 [5.4494389]

B:BD[13.9802] → [13.9802:9868]

    { ABIL_OKAWARU_MIGHT, ABIL_OKAWARU_HEALING, ABIL_NON_ABILITY,

[13.9802]

[13.9868]

    { ABIL_OKAWARU_MIGHT, ABIL_NON_ABILITY, ABIL_NON_ABILITY,

Deletion in crawl-ref/source/abl-show.cc at line 245 [5.4494389]
B:BD[5.4501746] → [5.4501746:4501813]
```
    { ABIL_OKAWARU_HEALING, "Healing", 2, 0, 75, 1, ABFLAG_NONE },
```
Insertion in crawl-ref/source/abl-show.cc at line 258 [5.4494389]
[5.4502384]
[5.4502384]
```
    { ABIL_TROG_BURN_BOOKS, "Burn Books", 0, 0, 10, 0, ABFLAG_NONE },
```

Insertion in crawl-ref/source/abl-show.cc at line 264 [5.4494389]

[5.4502598]

[14.481]

    { ABIL_ELYVILON_DESTROY_WEAPONS, "Destroy Weapons", 0, 0, 0, 0, ABFLAG_NONE },

Insertion in crawl-ref/source/abl-show.cc at line 621 [5.4494389]

[15.10364]

        break;
        
    // destroying stuff doesn't train anything
    case ABIL_ELYVILON_DESTROY_WEAPONS:
        invoc = true;
        failure = 0;

Insertion in crawl-ref/source/abl-show.cc at line 629 [5.4494389]

[15.10380]

    case ABIL_TROG_BURN_BOOKS:
        invoc = true;
        failure = 0;
        break;

Deletion in crawl-ref/source/abl-show.cc at line 658 [5.4494389]
∅:D[8.23171] → [15.11089:11120]
B:BD[15.11089] → [15.11089:11120]
```
    case ABIL_OKAWARU_HEALING:
```

Deletion in crawl-ref/source/abl-show.cc at line 1390 [5.4494389]

B:BD[5.4523374] → [5.4523374:4523558]

        break;
    case ABIL_OKAWARU_HEALING:
        if (!cast_healing( 3 + (you.skills[SK_INVOCATIONS] / 6) ))
            break;
        exercise(SK_INVOCATIONS, 2 + random2(5));

Insertion in crawl-ref/source/abl-show.cc at line 1482 [5.4494389]

[5.4526903]

        break;
    case ABIL_TROG_BURN_BOOKS:
        trog_burn_books();

Insertion in crawl-ref/source/abl-show.cc at line 1513 [5.4494389]

[5.4527571]

    case ABIL_ELYVILON_DESTROY_WEAPONS:
    {
        int i = igrd[you.x_pos][you.y_pos];
        if (i != NON_ITEM)
        {
            ely_destroy_weapons();
            break;
        }
        mpr("There are no items here.");
        break;
    }

Insertion in crawl-ref/source/abl-show.cc at line 1895 [5.4494389]

[16.27406]

[5.4537638]

    if (you.religion == GOD_ELYVILON)
    {
        add_talent(talents, ABIL_ELYVILON_DESTROY_WEAPONS, check_confused );
    }
    else if (you.religion == GOD_TROG)
    {
        add_talent(talents, ABIL_TROG_BURN_BOOKS, check_confused );
    }

First part of godly changes.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/religion.h at line 49 [5.800304]

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

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

Replacement in crawl-ref/source/religion.cc at line 1061 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1065 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1094 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1115 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1134 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1145 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1318 [5.804403]

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

Replacement in crawl-ref/source/religion.cc at line 2682 [5.804403]

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