fiddlerwoaroof/crawl - Change 7X6BEFHZQG2F2CGENA3NBPWZ3PJFGYILE6DLDNCXVI7IKVRU7SOAC

Vehumet modifications. Remove the warding effect, replace it with extended range for conjurations spells. Starting at **** piety reduce the cost of high level (>=5) conjurations and summonings spells by 1.

(Additional wording tweaks by Eino)

Signed-off-by: evktalo <evktalo@users.sourceforge.net>

Created by Charles Otto on September 27, 2009

7X6BEFHZQG2F2CGENA3NBPWZ3PJFGYILE6DLDNCXVI7IKVRU7SOAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-util.h at line 57 [8.242902]

B:BD[6.202] → [7.378:438]

int spell_range(spell_type spell, int pow, bool real_cast);

[6.202]

[9.262]

int spell_range(spell_type spell, int pow, bool real_cast,
                bool player_spell=true);

Insertion in crawl-ref/source/spl-util.cc at line 40 [8.245665]
[8.246569]
[8.246569]
```
#include "religion.h"
```

Insertion in crawl-ref/source/spl-util.cc at line 391 [8.245665]

[8.249700]

[10.496]

    if(spell_typematch(which_spell, SPTYP_CONJURATION | SPTYP_SUMMONING)
       && you.religion == GOD_VEHUMET
       && !player_under_penance()
       && you.piety >= piety_breakpoint(3)
       && _seekspell(which_spell)->level >= 5)
    {
        return _seekspell(which_spell)->level -1;
    }

Replacement in crawl-ref/source/spl-util.cc at line 999 [8.245665]

∅:D[3.588] → [7.588:647]

B:BD[7.588] → [7.588:647]

int spell_range(spell_type spell, int pow, bool real_cast)

[3.588]

[7.647]

int spell_range(spell_type spell, int pow, bool real_cast, bool player_spell)

Replacement in crawl-ref/source/spl-util.cc at line 1001 [8.245665]

B:BD[7.649] → [7.649:759]

    const int minrange = _seekspell(spell)->min_range;
    const int maxrange = _seekspell(spell)->max_range;

[7.649]

[7.759]

    int minrange = _seekspell(spell)->min_range;
    int maxrange = _seekspell(spell)->max_range;

Insertion in crawl-ref/source/spl-util.cc at line 1004 [8.245665]

[7.793]


     if(player_spell
        && spell_typematch(spell, SPTYP_CONJURATION)
        && you.religion == GOD_VEHUMET
        && !player_under_penance()
        && you.piety >= piety_breakpoint(2))
    {
        if(maxrange < LOS_RADIUS)
            maxrange++;

Insertion in crawl-ref/source/spl-util.cc at line 1014 [8.245665]

[7.794]

[3.589]

        if(minrange < LOS_RADIUS)
            minrange++;
    }

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

B:BD[2.2580] → [2.2580:2639]

∅:D[2.2639] → [11.2580:2590]

B:BD[12.1398] → [11.2580:2590]

      "Vehumet is shielding you from summoned creatures.",
      "",

[2.2580]

[11.2590]

      "Vehumet is extending the range of your conjurations.",
      "Vehumet is reducing the cost of your destructive magics.",

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

B:BD[12.3492] → [12.3492:3570]

      "Vehumet will no longer shield you from summoned creatures.",
      "",

[12.3492]

[12.3570]

      "Vehumet will no extend the range of your conjurations.",
      "Vehumet will no longer reduce the cost of your destructive magics.",

Deletion in crawl-ref/source/player.cc at line 6825 [8.962854]

B:BD[13.2872] → [13.2872:2873]

B:BD[13.2873] → [14.2843:2943]

∅:D[14.2943] → [13.2997:3069]

B:BD[13.2997] → [13.2997:3069]

B:BD[13.3069] → [5.2846:2903]

∅:D[5.2903] → [13.3125:3168]

B:BD[13.3125] → [13.3125:3168]


    if (religion == GOD_VEHUMET && !player_under_penance()
        && piety >= piety_breakpoint(2))
    {
        // Clamp piety at 160 and scale that down to a max of 30.
        const int wardpiety = piety > 160 ? 160 : piety;
        return (wardpiety * 3 / 16);
    }

Replacement in crawl-ref/source/output.cc at line 2158 [8.1088282]

B:BD[15.58486] → [14.3158:3365]

    const int rward = (wearing_amulet(AMU_WARDING, calc_unid)
                       || you.religion == GOD_VEHUMET && !player_under_penance()
                          && you.piety >= piety_breakpoint(2));

[15.58486]

[5.2910]

    const int rward = wearing_amulet(AMU_WARDING, calc_unid);

Replacement in crawl-ref/source/mstuff2.cc at line 1768 [8.1340842]

B:BD[4.2732] → [4.2732:2791]

        beam.range = spell_range(spell_cast, power, true);

[4.2732]

[16.6146]

        beam.range = spell_range(spell_cast, power, true, false);