fiddlerwoaroof/crawl - Change KKEPQAZMWQFWPQ4P4KT5PWG2YFPG7H4JHL5K7USVHQ3Y6L4NWURQC

Replace TSO's Smiting with Divine Shield.

Actually, I wasn't entirely sure which of the many attack invocations to replace and I chose Smiting mostly because of the new overlap with Zin and because such a change is easiest to revert (copy code from Zin). :p

Divine Shield strengthens existing shields (also magical, which might have to be excluded) or else creates a new magical one. Either way, the shields value is increased by 3 + skills(SHIELDS)/5 and this bonus lasts for 5 + (skills(SHIELS) + 2*skills(INVOCATIONS))/6 turns, after which it is decreased by 1 every two out of three turns until it reaches 0.

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

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

KKEPQAZMWQFWPQ4P4KT5PWG2YFPG7H4JHL5K7USVHQ3Y6L4NWURQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells4.h at line 29 [4.434549]
[4.435140]
[4.435140]
```
void cast_divine_shield(void);
```
Insertion in crawl-ref/source/spells4.cc at line 47 [4.436250]
[4.437126]
[4.437148]
```
#include "religion.h"
```

Insertion in crawl-ref/source/spells4.cc at line 2819 [4.436250]

[4.523693]


// shield bonus = attribute for duration turns, then decreasing by 1
//                every two out of three turns
// overall shield duration = duration + attribute
// recasting simply resets those two values (to better values, presumably)
void cast_divine_shield()
{
    if (!you.duration[DUR_DIVINE_SHIELD])
    {
        you.redraw_armour_class = true;
        if (you.shield() || you.duration[DUR_FIRE_SHIELD]
            || you.duration[DUR_CONDENSATION_SHIELD])
        {
            mprf("Your shield is strengthened by %s's divine power.",
                 god_name(you.religion).c_str());
        }
        else
            mpr("A divine shield forms around you!");
    }
    
    // duration of complete shield bonus up to 18 turns
    you.duration[DUR_DIVINE_SHIELD]
       = 5 + (you.skills[SK_SHIELDS] + you.skills[SK_INVOCATIONS]*2)/6;

Insertion in crawl-ref/source/spells4.cc at line 2843 [4.436250]

[4.523694]

    // shield bonus up to 8
    you.attribute[ATTR_DIVINE_SHIELD] = 3 + you.skills[SK_SHIELDS]/5;
        
    return;
}

Replacement in crawl-ref/source/religion.cc at line 198 [4.804403]
B:BD[5.608] → [5.608:633]
```
      "smite your foes",
```
[5.608]
[5.633]
```
      "call upon The Shining One for a divine shield",
```
Replacement in crawl-ref/source/religion.cc at line 283 [4.804403]
B:BD[5.2797] → [5.2797:2822]
```
      "smite your foes",
```
[5.2797]
[5.2822]
```
      "call upon The Shining One for a divine shield",
```

Insertion in crawl-ref/source/religion.cc at line 429 [4.804403]

[6.348]

[7.867]

        else if (god == GOD_SHINING_ONE && you.duration[DUR_DIVINE_SHIELD])
        {   // nor does TSO's divine shield
            mpr("Your divine shield disappears!");
            you.duration[DUR_DIVINE_SHIELD] = 0;
            you.attribute[ATTR_DIVINE_SHIELD] = 0;
            you.redraw_armour_class = true;
        }

Insertion in crawl-ref/source/religion.cc at line 3004 [4.804403]

[8.3240]

        
    case GOD_SHINING_ONE:
        if (you.duration[DUR_DIVINE_SHIELD])
        {
            mpr("Your divine shield disappears!");
            you.duration[DUR_DIVINE_SHIELD] = 0;
            you.attribute[ATTR_DIVINE_SHIELD] = 0;
            you.redraw_armour_class = true;
        }
        inc_penance( old_god, 50 );
        break;

Insertion in crawl-ref/source/player.cc at line 2347 [4.962854]

[4.1002538]

    if (you.duration[DUR_DIVINE_SHIELD])
        base_shield += you.attribute[ATTR_DIVINE_SHIELD];

Replacement in crawl-ref/source/output.cc at line 311 [4.1088282]

B:BD[4.1092882] → [4.1092882:1092961]

        if (you.duration[DUR_CONDENSATION_SHIELD])      //jmf: added 24mar2000

[4.1092882]

[4.1092961]

        if (you.duration[DUR_CONDENSATION_SHIELD]
            || you.duration[DUR_DIVINE_SHIELD])
        {

Replacement in crawl-ref/source/output.cc at line 315 [4.1088282]
B:BD[4.1093026] → [4.1093026:1093027]
[4.1093026]
[4.1093027]
```
        }
```
Replacement in crawl-ref/source/enum.h at line 82 [4.3287960]
B:BD[4.3290750] → [4.3290750:3290772]
```
    ABIL_TSO_SMITING,
```
[4.3290750]
[4.3290772]
```
    ABIL_TSO_DIVINE_SHIELD,
```
Insertion in crawl-ref/source/enum.h at line 177 [4.3287960]
[9.17263]
[10.6947]
```
    ATTR_DIVINE_SHIELD,         // strength of TSO's Divine Shield
```
Insertion in crawl-ref/source/enum.h at line 1049 [4.3287960]
[3.5545]
[4.3311440]
```
    DUR_DIVINE_SHIELD,          // duration of TSO's Divine Shield
```

Insertion in crawl-ref/source/acr.cc at line 2413 [4.4397395]

[4.4443032]

    if (you.duration[DUR_DIVINE_SHIELD])
    {
        if (you.duration[DUR_DIVINE_SHIELD] > 1)
        {
            if (--you.duration[DUR_DIVINE_SHIELD] == 1)
                mpr("Your divine shield starts to fade.");
        }
        
        if (you.duration[DUR_DIVINE_SHIELD] == 1 && !one_chance_in(3))
        {
            you.redraw_armour_class = true;
            if (--you.attribute[ATTR_DIVINE_SHIELD] == 0)
            {
                you.duration[DUR_DIVINE_SHIELD] = 0;
                mpr("Your divine shield fades completely.");
            }
        }
    }

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

B:BD[5.9100] → [5.9100:9175]

    { ABIL_TSO_REPEL_UNDEAD, ABIL_TSO_SMITING, ABIL_TSO_ANNIHILATE_UNDEAD,

[5.9100]

[5.9175]

    { ABIL_TSO_REPEL_UNDEAD, ABIL_TSO_DIVINE_SHIELD, ABIL_TSO_ANNIHILATE_UNDEAD,

Replacement in crawl-ref/source/abl-show.cc at line 242 [4.4494389]

B:BD[4.4500606] → [2.375:465]

    { ABIL_TSO_SMITING, "Smiting",
      3, 0, 50, generic_cost::fixed(2), ABFLAG_NONE },

[4.4500606]

[4.4500669]

    { ABIL_TSO_DIVINE_SHIELD, "Divine Shield", 3, 0, 50, 2, ABFLAG_NONE },

Replacement in crawl-ref/source/abl-show.cc at line 681 [4.4494389]
∅:D[11.20013] → [12.11062:11089]
B:BD[12.11062] → [12.11062:11089]
```
    case ABIL_TSO_SMITING:
```
[11.20013]
[13.23142]
```
    case ABIL_TSO_DIVINE_SHIELD:
```

Replacement in crawl-ref/source/abl-show.cc at line 1321 [4.4494389]

B:BD[4.4519221] → [4.4519221:4519285]

    case ABIL_TSO_REPEL_UNDEAD:
        turn_undead(you.piety);

[4.4519189]

[4.4519285]

    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;

Replacement in crawl-ref/source/abl-show.cc at line 1328 [4.4494389]

B:BD[4.4519286] → [4.4519286:4519516]

        if (!you.duration[DUR_REPEL_UNDEAD])
            mpr( "You feel a holy aura protecting you." );
        you.duration[DUR_REPEL_UNDEAD] += 8 
                                + roll_dice(2, 2 * you.skills[SK_INVOCATIONS]);

[4.4519286]

[4.4519516]

    case ABIL_ZIN_REVITALISATION:
        if (cast_revitalisation( 3 + (you.skills[SK_INVOCATIONS] / 6) ))
            exercise(SK_INVOCATIONS, 1 + random2(3));
        break;

Replacement in crawl-ref/source/abl-show.cc at line 1333 [4.4494389]

B:BD[4.4519517] → [4.4519517:4519657]

        if (you.duration[ DUR_REPEL_UNDEAD ] > 50)
            you.duration[ DUR_REPEL_UNDEAD ] = 50;
        exercise(SK_INVOCATIONS, 1);

[4.4519517]

[4.4519657]

    case ABIL_ZIN_SANCTUARY:
        if (cast_sanctuary(you.skills[SK_INVOCATIONS] * 4))
            exercise(SK_INVOCATIONS, 5 + random2(8));

Replacement in crawl-ref/source/abl-show.cc at line 1360 [4.4494389]

B:BD[4.4520480] → [11.20148:20324]

    case ABIL_ZIN_REVITALISATION:
        if (cast_revitalisation( 3 + (you.skills[SK_INVOCATIONS] / 6) ))
            exercise(SK_INVOCATIONS, 1 + random2(3));
        break;

[4.4520480]

[11.20324]

    case ABIL_TSO_REPEL_UNDEAD:
        turn_undead(you.piety);
        if (!you.duration[DUR_REPEL_UNDEAD])
            mpr( "You feel a holy aura protecting you." );

Replacement in crawl-ref/source/abl-show.cc at line 1366 [4.4494389]

B:BD[11.20325] → [11.20325:20468]

    case ABIL_ZIN_SANCTUARY:
        if (cast_sanctuary(you.skills[SK_INVOCATIONS] * 4))
            exercise(SK_INVOCATIONS, 5 + random2(8));

[11.20325]

[11.20468]

        you.duration[DUR_REPEL_UNDEAD] += 8
                                + roll_dice(2, 2 * you.skills[SK_INVOCATIONS]);
        if (you.duration[ DUR_REPEL_UNDEAD ] > 50)
            you.duration[ DUR_REPEL_UNDEAD ] = 50;
        exercise(SK_INVOCATIONS, 1);

Replacement in crawl-ref/source/abl-show.cc at line 1375 [4.4494389]

B:BD[11.20484] → [11.20484:20511]

∅:D[11.20511] → [4.4520480:4520507]

B:BD[4.4520480] → [4.4520480:4520507]

B:BD[4.4520507] → [14.31183:31338]

    case ABIL_ZIN_SMITING:
    case ABIL_TSO_SMITING:
        if (your_spells( SPELL_SMITING, (2 + skill_bump(SK_INVOCATIONS)) * 6,
                         false ) == SPRET_ABORT)
            return (false);

[11.20484]

[4.4520563]

    case ABIL_TSO_DIVINE_SHIELD:
        cast_divine_shield();

Replace TSO's Smiting with Divine Shield.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spells4.h at line 29 [4.434549]

Insertion in crawl-ref/source/spells4.cc at line 47 [4.436250]

Insertion in crawl-ref/source/spells4.cc at line 2819 [4.436250]

Insertion in crawl-ref/source/spells4.cc at line 2843 [4.436250]

Replacement in crawl-ref/source/religion.cc at line 198 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 283 [4.804403]