fiddlerwoaroof/crawl - Change KX6HOBTF5OBZLH2VNEFHH6YAX66FSE6JGBY5I2WIAW5IEJUGNL6AC

Implement [1891388]: Make Holy Word available in scroll form.

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

Created by dolorous on February 21, 2008

KX6HOBTF5OBZLH2VNEFHH6YAX66FSE6JGBY5I2WIAW5IEJUGNL6AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1248 [8.293070]
B:BD[8.323460] → [8.323460:323483]
```
        holy_word(50);
```
[8.323460]
[8.323483]
```
        holy_word(50, HOLY_WORD_SPELL);
```
Insertion in crawl-ref/source/spells3.cc at line 32 [8.531613]
[8.532213]
[9.46753]
```
#include "effects.h" // holy word
```
Deletion in crawl-ref/source/spells3.cc at line 50 [8.531613]
B:BD[8.532443] → [10.1677:1711]
```
#include "spells2.h" // holy word
```
Replacement in crawl-ref/source/spells3.cc at line 898 [8.531613]
B:BD[10.3248] → [10.3248:3276]
```
    holy_word( 100, true );
```
[10.3248]
[7.744]
```
    holy_word( 100, HOLY_WORD_GENERIC, true );
```

Deletion in crawl-ref/source/spells2.h at line 124 [8.562867]

B:BD[8.566923] → [8.566923:567033]

B:BD[8.567033] → [11.148618:148664]

∅:D[11.148664] → [8.567058:567167]

B:BD[8.567058] → [8.567058:567167]

 * called from: ability - spell
 * *********************************************************************** */
void holy_word(int pow, bool silent = false);
// last updated 24may2000 {dlb}
/* ***********************************************************************

Deletion in crawl-ref/source/spells2.cc at line 800 [8.569242]

B:BD[8.588338] → [8.588338:588339]

B:BD[8.588339] → [11.151526:151563]

∅:D[11.151563] → [8.588363:588396]

B:BD[8.588363] → [8.588363:588396]

B:BD[8.588396] → [11.151564:151632]

∅:D[11.151632] → [8.588443:588713]

B:BD[8.588443] → [8.588443:588713]

B:BD[8.588713] → [11.151633:151681]

B:BD[11.151681] → [2.160:213]

∅:D[2.213] → [8.588830:588901]

∅:D[11.151738] → [8.588830:588901]

B:BD[8.588830] → [8.588830:588901]

B:BD[8.588901] → [2.214:273]

∅:D[2.273] → [8.588901:589223]

B:BD[8.588901] → [8.588901:589223]


void holy_word(int pow, bool silent)
{
    struct monsters *monster;
    if (!silent)
        mpr("You speak a Word of immense power!");
    // doubt this will ever happen, but it's here as a safety -- bwr
    if (pow > 300)
        pow = 300;
    for (int tu = 0; tu < MAX_MONSTERS; tu++)
    {
        monster = &menv[tu];
        if (monster->type == -1 || !mons_near(monster))
            continue;
        if (mons_holiness(monster) == MH_UNDEAD
            || mons_holiness(monster) == MH_DEMONIC)
        {
            simple_monster_message(monster, " convulses!");
            behaviour_event( monster, ME_ANNOY, MHITYOU );
            hurt_monster( monster, roll_dice( 2, 15 ) + (random2(pow) / 3) );
            if (monster->hit_points < 1)
            {
                monster_die(monster, KILL_YOU, 0);
                continue;
            }
            if (monster->speed_increment >= 25)
                monster->speed_increment -= 20;

Deletion in crawl-ref/source/spells2.cc at line 801 [8.569242]

B:BD[8.589224] → [12.3868:3910]

∅:D[12.3910] → [8.589271:589428]

B:BD[8.589271] → [8.589271:589428]

B:BD[8.589428] → [3.182:183]

            monster->add_ench(ENCH_FEAR);
        }                       // end "if mons_holiness"
    }                           // end "for tu"
}                               // end holy_word()

Insertion in crawl-ref/source/shopping.cc at line 1238 [8.759950]
[8.790480]
[8.790480]
```
            case SCR_HOLY_WORD:
```
Replacement in crawl-ref/source/religion.cc at line 3275 [8.804403]
∅:D[13.684] → [14.3322:3358]
∅:D[6.3591] → [14.3322:3358]
B:BD[14.3322] → [14.3322:3358]
```
            holy_word( 100, true );
```
[6.3591]
[6.3592]
```
            holy_word( 100, HOLY_WORD_GENERIC, true );
```
Replacement in crawl-ref/source/makeitem.cc at line 2335 [16.927]
B:BD[15.43705] → [15.43705:43749]
```
        const int temp_rand = random2(920);
```
[15.43705]
[15.43749]
```
        const int temp_rand = random2(935);
```

Replacement in crawl-ref/source/makeitem.cc at line 2338 [16.927]

B:BD[15.43782] → [15.43782:44921]

            ((temp_rand > 751) ? SCR_IDENTIFY :          // 18.26%
             (temp_rand > 629) ? SCR_REMOVE_CURSE :      // 13.26%
             (temp_rand > 554) ? SCR_TELEPORTATION :     //  8.15%
             (temp_rand > 494) ? SCR_DETECT_CURSE :      //  6.52%
             (temp_rand > 464) ? SCR_FEAR :              //  3.26%
             (temp_rand > 434) ? SCR_NOISE :             //  3.26%
             (temp_rand > 404) ? SCR_MAGIC_MAPPING :     //  3.26%
             (temp_rand > 374) ? SCR_FOG :               //  3.26%
             (temp_rand > 344) ? SCR_RANDOM_USELESSNESS ://  3.26%
             (temp_rand > 314) ? SCR_CURSE_WEAPON :      //  3.26%
             (temp_rand > 284) ? SCR_CURSE_ARMOUR :      //  3.26%
             (temp_rand > 254) ? SCR_RECHARGING :        //  3.26%
             (temp_rand > 224) ? SCR_BLINKING :          //  3.26%
             (temp_rand > 194) ? SCR_PAPER :             //  3.26%
             (temp_rand > 164) ? SCR_ENCHANT_ARMOUR :    //  3.26%
             (temp_rand > 134) ? SCR_ENCHANT_WEAPON_I :  //  3.26%
             (temp_rand > 104) ? SCR_ENCHANT_WEAPON_II : //  3.26%

[15.43782]

[16.84696]

            ((temp_rand > 766) ? SCR_IDENTIFY :          // 17.97%
             (temp_rand > 644) ? SCR_REMOVE_CURSE :      // 13.05%
             (temp_rand > 569) ? SCR_TELEPORTATION :     //  8.02%
             (temp_rand > 509) ? SCR_DETECT_CURSE :      //  6.42%
             (temp_rand > 479) ? SCR_FEAR :              //  3.21%
             (temp_rand > 449) ? SCR_NOISE :             //  3.21%
             (temp_rand > 419) ? SCR_MAGIC_MAPPING :     //  3.21%
             (temp_rand > 389) ? SCR_FOG :               //  3.21%
             (temp_rand > 359) ? SCR_RANDOM_USELESSNESS ://  3.21%
             (temp_rand > 329) ? SCR_CURSE_WEAPON :      //  3.21%
             (temp_rand > 299) ? SCR_CURSE_ARMOUR :      //  3.21%
             (temp_rand > 269) ? SCR_RECHARGING :        //  3.21%
             (temp_rand > 239) ? SCR_BLINKING :          //  3.21%
             (temp_rand > 209) ? SCR_PAPER :             //  3.21%
             (temp_rand > 179) ? SCR_ENCHANT_ARMOUR :    //  3.21%
             (temp_rand > 149) ? SCR_ENCHANT_WEAPON_I :  //  3.21%
             (temp_rand > 119) ? SCR_ENCHANT_WEAPON_II : //  3.21%

Replacement in crawl-ref/source/makeitem.cc at line 2360 [16.927]
B:BD[15.45160] → [15.45160:45192]
```
             (temp_rand > 74) ?
```
[15.45160]
[15.45192]
```
             (temp_rand > 89) ?
```

Replacement in crawl-ref/source/makeitem.cc at line 2362 [16.927]

B:BD[15.45243] → [15.45243:45322]

              : SCR_IMMOLATION) :    //  3.26%
             (temp_rand > 59) ?

[15.45243]

[15.45322]

              : SCR_IMMOLATION) :    //  3.21%
             (temp_rand > 74) ?

Replacement in crawl-ref/source/makeitem.cc at line 2365 [16.927]

B:BD[15.45372] → [15.45372:45419]

              : SCR_ACQUIREMENT) :   //  1.63%

[15.45372]

[15.45419]

              : SCR_ACQUIREMENT) :   //  1.60%
             (temp_rand > 59) ?
             ((depth_mod < 4) ? SCR_DETECT_CURSE
              : SCR_SUMMONING) :     //  1.60%

Replacement in crawl-ref/source/makeitem.cc at line 2370 [16.927]

B:BD[15.45451] → [15.45451:45642]

             ((depth_mod < 4) ? SCR_DETECT_CURSE
              : SCR_SUMMONING) :     //  1.63%
             (temp_rand > 29) ?
             ((depth_mod < 4) ? SCR_TELEPORTATION    //  1.63%

[15.45451]

[15.45642]

             ((depth_mod < 4) ? SCR_TELEPORTATION    //  1.60%

Insertion in crawl-ref/source/makeitem.cc at line 2372 [16.927]

[15.45684]

             (temp_rand > 29) ?
             ((depth_mod < 7) ? SCR_DETECT_CURSE
              : SCR_TORMENT) :       //  1.60%

Replacement in crawl-ref/source/makeitem.cc at line 2377 [16.927]

B:BD[15.45765] → [15.45765:45812]

              : SCR_TORMENT)         //  1.63%

[15.45765]

[15.45812]

              : SCR_HOLY_WORD)       //  1.60%

Replacement in crawl-ref/source/makeitem.cc at line 2379 [16.927]

B:BD[15.45837] → [15.45837:45902]

             : ((depth_mod < 7) ? SCR_TELEPORTATION    //  1.63%

[15.45837]

[15.45902]

             : ((depth_mod < 7) ? SCR_TELEPORTATION    //  1.60%

Replacement in crawl-ref/source/makeitem.cc at line 2387 [16.927]

B:BD[15.46124] → [15.46124:46164]

         item.sub_type == SCR_TORMENT )

[15.46124]

[15.46164]

         item.sub_type == SCR_TORMENT ||
         item.sub_type == SCR_HOLY_WORD )

Insertion in crawl-ref/source/itemprop.h at line 323 [11.641567]
[9.81843]
[9.81843]
```
    SCR_HOLY_WORD,
```
Insertion in crawl-ref/source/itemname.cc at line 551 [8.2667494]
[17.12197]
[17.12197]
```
    case SCR_HOLY_WORD:          return "holy word";
```

Insertion in crawl-ref/source/item_use.cc at line 4324 [8.2781507]

[8.2867777]

[18.723]


    case SCR_HOLY_WORD:
        {
            int pow = 100;
            if (is_good_god(you.religion))
            {
                pow += (you.religion == GOD_SHINING_ONE) ? you.piety :
                                                           you.piety / 2;
            }
            if (!holy_word(pow, HOLY_WORD_SCROLL, !item_type_known(scroll)))
            {
                canned_msg(MSG_NOTHING_HAPPENS);
                id_the_scroll = false;
            }

Insertion in crawl-ref/source/item_use.cc at line 4341 [8.2781507]

[18.724]

[8.2867777]

            // good gods like this, regardless of whether it damages anything
            if (is_good_god(you.religion))
            {
                you.duration[DUR_PIETY_POOL] += 10;
                if (you.duration[DUR_PIETY_POOL] > 500)
                    you.duration[DUR_PIETY_POOL] = 500;
            }
        }

Insertion in crawl-ref/source/enum.h at line 1225 [8.3287960]

[8.3320153]

[11.916250]

enum holy_word_source_type
{
    HOLY_WORD_GENERIC = -1,
    HOLY_WORD_SCROLL = -2,
    HOLY_WORD_SPELL = -3        // SPELL_HOLY_WORD
};

Insertion in crawl-ref/source/effects.h at line 99 [8.3378996]

[8.3381748]

// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: item_use - spell
 * *********************************************************************** */
bool holy_word(int pow, int caster, bool silent = false);

Insertion in crawl-ref/source/effects.cc at line 62 [8.3382105]

[19.17652]

[8.3382866]


bool holy_word(int pow, int caster, bool silent)
{
    bool holy_influenced = false;
    struct monsters *monster;
    if (!silent)
        mpr("You speak a Word of immense power!");
    // doubt this will ever happen, but it's here as a safety -- bwr
    if (pow > 300)
        pow = 300;
    if (you.is_undead || you.species == SP_DEMONSPAWN)
    {
        int hploss = you.hp / 2 - 1;
        if (hploss >= you.hp)
            hploss = you.hp - 1;
        if (hploss < 0)
            hploss = 0;
        if (hploss)
        {
            holy_influenced = true;
            mpr("You are blasted by holy energy!");

Insertion in crawl-ref/source/effects.cc at line 89 [8.3382105]

[8.3382867]

            const char *aux = "holy word";
            if (caster < 0)
            {
                switch (caster)
                {
                case HOLY_WORD_SCROLL:
                    aux = "scroll of holy word";
                    break;
                }
                caster = HOLY_WORD_GENERIC;
            }
            ouch(hploss, caster,
                    caster != HOLY_WORD_GENERIC ? KILLED_BY_MONSTER
                                                : KILLED_BY_SOMETHING,
                    aux);
        }
    }
    for (int tu = 0; tu < MAX_MONSTERS; tu++)
    {
        monster = &menv[tu];
        if (monster->type == -1 || !mons_near(monster))
            continue;
        if (mons_holiness(monster) == MH_UNDEAD
            || mons_holiness(monster) == MH_DEMONIC)
        {
            holy_influenced = true;
            simple_monster_message(monster, " convulses!");
            behaviour_event( monster, ME_ANNOY, MHITYOU );
            hurt_monster( monster, roll_dice( 2, 15 ) + (random2(pow) / 3) );
            if (monster->hit_points < 1)
            {
                monster_die(monster, KILL_YOU, 0);
                continue;
            }
            if (monster->speed_increment >= 25)
                monster->speed_increment -= 20;
            monster->add_ench(ENCH_FEAR);
        }                       // end "if mons_holiness"
    }                           // end "for tu"
    return holy_influenced;
}                               // end holy_word()

Replacement in crawl-ref/source/effects.cc at line 192 [8.3382105]

B:BD[11.937407] → [11.937407:937576]

            ouch(hploss, caster, 
                    caster != TORMENT_GENERIC? KILLED_BY_MONSTER 
                                             : KILLED_BY_SOMETHING,

[11.937407]

[11.937576]

            ouch(hploss, caster,
                    caster != TORMENT_GENERIC ? KILLED_BY_MONSTER
                                              : KILLED_BY_SOMETHING,

Insertion in crawl-ref/source/dat/descript/items.txt at line 1144 [21.62757]

[20.41674]

[4.25472]

scroll of holy word
This scroll calls on the powers of Heaven to cause great damage to any
nearby unholy creature - including you!
%%%%

Replacement in crawl-ref/source/acr.cc at line 2724 [8.4397395]

B:BD[5.6150] → [5.6150:6228]

    // Leak piety from the piety pool (currently Zin only) into actual piety.

[5.6150]

[5.6228]

    // Leak piety from the piety pool into actual piety.

Replacement in crawl-ref/source/abl-show.cc at line 1354 [8.4494389]

B:BD[8.4520185] → [8.4520185:4520238]

        holy_word( you.skills[SK_INVOCATIONS] * 8 );

[8.4520185]

[8.4520238]

        holy_word( you.skills[SK_INVOCATIONS] * 8, HOLY_WORD_GENERIC );