fiddlerwoaroof/crawl - Change CQD3RU44235F3CYFDZBC3JRT2H3AE7PXJNVBBMCRF65Q5LPA3EHQC

Remove Zin's Smiting, and move Revitalisation into its place.

Allow for easier switching between the good gods: starting piety after switching is up to 30 instead of 15.

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

Created by j-p-e-g on March 20, 2008

CQD3RU44235F3CYFDZBC3JRT2H3AE7PXJNVBBMCRF65Q5LPA3EHQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/religion.cc at line 197 [10.804403]
∅:D[8.2551] → [9.5554:5579]
B:BD[9.5554] → [9.5554:5579]
```
      "smite your foes",
```
Insertion in crawl-ref/source/religion.cc at line 198 [10.804403]
[9.5621]
[9.5621]
```
      "",
```
Deletion in crawl-ref/source/religion.cc at line 283 [10.804403]
∅:D[8.2588] → [9.5689:5714]
B:BD[9.5689] → [9.5689:5714]
```
      "smite your foes",
```
Insertion in crawl-ref/source/religion.cc at line 284 [10.804403]
[9.5756]
[9.5756]
```
      "",
```
Replacement in crawl-ref/source/religion.cc at line 2413 [10.804403]
B:BD[9.8821] → [11.2915:2938]
```
    } // plus Smiting?
```
[9.8821]
[12.2668]
```
    }
```

Insertion in crawl-ref/source/religion.cc at line 2415 [10.804403]

[12.2686]

}
static void ely_destroy_inventory_weapon()
{
    int count = 0;
    int item  = ENDOFPACK;
    for (int i = 0; i < ENDOFPACK; i++)
    {
         if (!is_valid_item( you.inv[i] ))
             continue;
         if (you.inv[i].base_type == OBJ_WEAPONS
             || you.inv[i].base_type == OBJ_MISSILES)
         {
             if (is_artefact(you.inv[i]))
                 continue;
             // item is valid for destroying, so give it a chance
             count++;
             if (one_chance_in( count ))
                 item = i;
         }
    }
    // any item to destroy?
    if (item == ENDOFPACK)
        return;
    int value = 1;
    bool wielded = false;
    // increase value wielded weapons or large stacks of ammo
    if (you.inv[item].base_type == OBJ_WEAPONS
        && you.inv[item].link == you.equip[EQ_WEAPON])
    {
        wielded = true;
        value += 2;
    }
    else if (you.inv[item].quantity > random2(you.penance[GOD_ELYVILON]))
        value += 1 + random2(2);
    std::ostream& strm = msg::streams(MSGCH_GOD);
    strm << you.inv[item].name(DESC_CAP_YOUR);
    if (value == 1)
        strm << " barely";
    if ( you.inv[item].quantity == 1 )
         strm << " shimmers and breaks into pieces." << std::endl;
    else
         strm << " shimmer and break into pieces." << std::endl;
    if (wielded)
    {
        unwield_item(true);
        you.wield_change = true;
    }
    // just in case
    you.quiver_change = true;
    destroy_item(you.inv[item]);
    burden_change();
    dec_penance(GOD_ELYVILON, value);

Insertion in crawl-ref/source/religion.cc at line 2482 [10.804403]

[12.2689]

static bool elyvilon_retribution()
{
    // healing theme and interfering with fighting
    // doesn't care unless you've gone over to evil
    if ( !is_evil_god(you.religion) )
        return false;
    const god_type god = GOD_ELYVILON;
    simple_god_message("'s displeasure finds you.", god);
    switch (random2(5))
    {
    case 0:
    case 1:
        confuse_player( 3 + random2(10), false );
        break;
    case 2: // mostly flavour messages
        miscast_effect(SPTYP_POISON, 0, 0, one_chance_in(3),
                       "the will of Elyvilon");
        break;
    case 3:
    case 4: // destroy weapons in your inventory
        ely_destroy_inventory_weapon();
        break;
    }
    return true;
}

Deletion in crawl-ref/source/religion.cc at line 2974 [10.804403]

B:BD[12.18656] → [7.2509:2601]


static void ely_destroy_inventory_weapon()
{
    int count = 0;
    int item  = ENDOFPACK;

Deletion in crawl-ref/source/religion.cc at line 2975 [10.804403]

B:BD[7.2602] → [7.2602:3144]

∅:D[7.3144] → [10.875671:875672]

∅:D[12.18656] → [10.875671:875672]

B:BD[10.875671] → [10.875671:875672]

B:BD[10.875672] → [7.3145:4742]

    for (int i = 0; i < ENDOFPACK; i++)
    {
         if (!is_valid_item( you.inv[i] ))
             continue;
         if (you.inv[i].base_type == OBJ_WEAPONS
             || you.inv[i].base_type == OBJ_MISSILES)
         {
             if (is_artefact(you.inv[i]))
                 continue;
             // item is valid for destroying, so give it a chance
             count++;
             if (one_chance_in( count ))
                 item = i;
         }
    }
    // any item to destroy?
    if (item == ENDOFPACK)
        return;
    int value = 1;
    bool wielded = false;
    
    // increase value wielded weapons or large stacks of ammo
    if (you.inv[item].base_type == OBJ_WEAPONS
        && you.inv[item].link == you.equip[EQ_WEAPON])
    {
        wielded = true;
        value += 2;
    }
    else if (you.inv[item].quantity > random2(you.penance[GOD_ELYVILON]))
        value += 1 + random2(2);
    std::ostream& strm = msg::streams(MSGCH_GOD);
    strm << you.inv[item].name(DESC_CAP_YOUR);
    if (value == 1)
        strm << " barely";
    if ( you.inv[item].quantity == 1 )
         strm << " shimmers and breaks into pieces." << std::endl;
    else
         strm << " shimmer and break into pieces." << std::endl;
    if (wielded)
    {
        unwield_item(true);
        you.wield_change = true;
    }
    // just in case
    you.quiver_change = true;
    
    destroy_item(you.inv[item]);
    burden_change();
    dec_penance(GOD_ELYVILON, value);
}
// comparatively lenient
static bool elyvilon_retribution()
{
    const god_type god = GOD_ELYVILON;
    simple_god_message("'s displeasure finds you.", god);
    // healing theme and interfering with fighting
    switch (random2(5))
    {
    case 0:
    case 1:
        confuse_player( 3 + random2(10), false );
        break;
    case 2: // mostly flavour messages
        miscast_effect(SPTYP_POISON, 0, 0, one_chance_in(3),
                       "the will of Elyvilon");
        break;
        
    case 3:
    case 4: // destroy weapons in your inventory
        ely_destroy_inventory_weapon();
        break;
    }
    
    return true;
}

Insertion in crawl-ref/source/religion.cc at line 3495 [10.804403]
[13.30347]
[14.953]
```
    ASSERT(old_god != new_god);
    
```
Deletion in crawl-ref/source/religion.cc at line 3587 [10.804403]
∅:D[15.3224] → [10.879335:879351]
B:BD[10.879335] → [10.879335:879351]
B:BD[10.879351] → [7.4813:4872]
```
        break;
    case GOD_ELYVILON:
        inc_penance( old_god, 50 );
```
Deletion in crawl-ref/source/religion.cc at line 3590 [10.804403]
B:BD[16.4009] → [6.5217:5267]
```
        mpr("Your divine halo starts to fade.");
```

Replacement in crawl-ref/source/religion.cc at line 3609 [10.804403]

B:BD[9.8910] → [9.8910:8945]

        // deliberate fall-through

[9.8910]

[15.3241]

        inc_penance( old_god, 25 );
        break;
        
    case GOD_ELYVILON:
        inc_penance( old_god, 30 );
        break;

Insertion in crawl-ref/source/religion.cc at line 4088 [10.804403]

[17.2100]

    const int old_piety = you.piety;
    // Are you switching between good gods?
    const bool good_god_switch = is_good_god(you.religion)
                                 && is_good_god(which_god);

Replacement in crawl-ref/source/religion.cc at line 4108 [10.804403]

B:BD[13.30633] → [13.30633:30712]

        you.piety = 15;             // to prevent near instant excommunication

[13.30633]

[5.3943]

        you.piety = 15; // to prevent near instant excommunication

Insertion in crawl-ref/source/religion.cc at line 4146 [10.804403]

[18.3947]

[19.3636]

        // piety bonus when switching between good gods
        if (good_god_switch && old_piety > 15)
            gain_piety(std::min(30, old_piety - 15));

Replacement in crawl-ref/source/religion.cc at line 4153 [10.804403]
B:BD[18.4069] → [18.4069:4070]
∅:D[18.4070] → [15.3748:3783]
B:BD[10.883757] → [15.3748:3783]
```
    if (is_evil_god(you.religion))
```
[18.4069]
[10.883905]
```
    else if (is_evil_god(you.religion))
```
Deletion in crawl-ref/source/enum.h at line 78 [10.3287960]
B:BD[8.2937] → [4.3180:3202]
```
    ABIL_ZIN_SMITING,
```

Replacement in crawl-ref/source/describe.cc at line 2413 [10.3736416]

B:BD[2.373] → [2.373:502]

∅:D[2.502] → [20.2152:2375]

B:BD[20.2152] → [20.2152:2375]

                (which_god == GOD_ZIN) ? "Champion of Law" :
                (which_god == GOD_SHINING_ONE) ? "Divine Warrior" :
                (which_god == GOD_ELYVILON) ? "Champion of Light" :
                (which_god == GOD_OKAWARU) ? "Master of a Thousand Battles" :
                (which_god == GOD_YREDELEMNUL) ? "Master of Eternal Death" :

[2.373]

[20.2375]

                (which_god == GOD_ZIN)           ? "Champion of Law" :
                (which_god == GOD_SHINING_ONE)   ? "Divine Warrior" :
                (which_god == GOD_ELYVILON)      ? "Champion of Light" :
                (which_god == GOD_OKAWARU)       ? "Master of a Thousand Battles" :
                (which_god == GOD_YREDELEMNUL)   ? "Master of Eternal Death" :

Replacement in crawl-ref/source/describe.cc at line 2419 [10.3736416]

B:BD[20.2447] → [20.2447:2642]

                (which_god == GOD_MAKHLEB) ? "Champion of Chaos" :
                (which_god == GOD_VEHUMET) ? "Lord of Destruction" :
                (which_god == GOD_TROG) ? "Great Slayer" :

[20.2447]

[20.2642]

                (which_god == GOD_MAKHLEB)       ? "Champion of Chaos" :
                (which_god == GOD_VEHUMET)       ? "Lord of Destruction" :
                (which_god == GOD_TROG)          ? "Great Slayer" :

Replacement in crawl-ref/source/describe.cc at line 2423 [10.3736416]

B:BD[20.2713] → [20.2713:2904]

B:BD[20.2904] → [2.503:559]

∅:D[2.559] → [20.2961:3007]

B:BD[20.2961] → [20.2961:3007]

                (which_god == GOD_SIF_MUNA) ? "Master of the Arcane" :
                (which_god == GOD_LUGONU) ? "Agent of Entropy" :
                (which_god == GOD_BEOGH) ? "Messiah" :
                (which_god == GOD_XOM) ? "Teddy Bear" :
                "Bogy the Lord of the Bugs");

[20.2713]

[10.3950763]

                (which_god == GOD_SIF_MUNA)      ? "Master of the Arcane" :
                (which_god == GOD_LUGONU)        ? "Agent of Entropy" :
                (which_god == GOD_BEOGH)         ? "Messiah" :
                (which_god == GOD_XOM)           ? "Teddy Bear"
                                                 : "Bogy the Lord of the Bugs");

Replacement in crawl-ref/source/abl-show.cc at line 114 [10.4494389]

B:BD[21.8967] → [8.9025:9091]

    { ABIL_ZIN_RECITE, ABIL_ZIN_SMITING, ABIL_ZIN_REVITALISATION,

[21.8967]

[9.19701]

    { ABIL_ZIN_RECITE, ABIL_ZIN_REVITALISATION, ABIL_NON_ABILITY,

Replacement in crawl-ref/source/abl-show.cc at line 236 [10.4494389]

∅:D[3.4044] → [9.19748:19916]

∅:D[8.9155] → [9.19748:19916]

B:BD[10.4500147] → [9.19748:19916]

    { ABIL_ZIN_SMITING, "Smiting",
      3, 0, 50, generic_cost::fixed(2), ABFLAG_NONE },
    { ABIL_ZIN_REVITALISATION, "Revitalisation", 0, 0, 100, 3, ABFLAG_NONE },

[3.4044]

[11.7201]

    { ABIL_ZIN_REVITALISATION, "Revitalisation", 0, 0, 100, 2, ABFLAG_NONE },

Replacement in crawl-ref/source/abl-show.cc at line 673 [10.4494389]
B:BD[22.11035] → [9.19986:20013]
```
    case ABIL_ZIN_SMITING:
```
[22.11035]
[16.5672]
```
    case ABIL_ZIN_REVITALISATION:
```
Deletion in crawl-ref/source/abl-show.cc at line 697 [10.4494389]
B:BD[22.11749] → [9.20014:20048]
```
    case ABIL_ZIN_REVITALISATION:
```

Deletion in crawl-ref/source/abl-show.cc at line 1344 [10.4494389]

∅:D[8.9513] → [16.5706:5960]

B:BD[10.4519189] → [16.5706:5960]

∅:D[16.5960] → [10.4519285:4519286]

B:BD[10.4519285] → [10.4519285:4519286]

    case ABIL_ZIN_SMITING:
        if (your_spells( SPELL_SMITING, (2 + skill_bump(SK_INVOCATIONS)) * 6,
                         false ) == SPRET_ABORT)
            return (false);
        exercise( SK_INVOCATIONS, (coinflip()? 3 : 2) );
        break;

Remove Zin's Smiting, and move Revitalisation into its place.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/religion.cc at line 197 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 198 [10.804403]

Deletion in crawl-ref/source/religion.cc at line 283 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 284 [10.804403]

Replacement in crawl-ref/source/religion.cc at line 2413 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 2415 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 2482 [10.804403]

Deletion in crawl-ref/source/religion.cc at line 2974 [10.804403]

Deletion in crawl-ref/source/religion.cc at line 2975 [10.804403]

Insertion in crawl-ref/source/religion.cc at line 3495 [10.804403]

Deletion in crawl-ref/source/religion.cc at line 3587 [10.804403]

Deletion in crawl-ref/source/religion.cc at line 3590 [10.804403]