fiddlerwoaroof/crawl - Change UWYK2M6I6P6EFAVHLWQGDK77STFO3SPO5SVOF5WZTOKUH2O6BBHQC

Remove four scroll-duplicate spells: Detect Curse, Remove Curse,

Magic Mapping, and Identify. [*]

This leaves six spells in the Divinations school, of which Forescry and See Invisible could easily be moved to other schools; Detect Secret Doors could be removed; and Detect Traps/Items/Creatures should be moved to some kind of misc. item with charges (whether rechargeable or not). I didn't want to remove those until the replacement code is in.

I added a hack to make sure the probabilities of Xom "casting" magic mapping remain the same. That will have to be repaired later, preferrably by handling it together with Detect Items/Creatures as a separate Xom effect.

Shifts spells in saves and bones files.

*) This is different from the recent addition of the scroll of silence in that these four spells pose no risk whatsoever and can be spammed safely, making even the food and magic costs negligible.

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

Created by j-p-e-g on August 13, 2009

UWYK2M6I6P6EFAVHLWQGDK77STFO3SPO5SVOF5WZTOKUH2O6BBHQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 62 [5.3]

[3.42]

[4.58]


// Define fake magic mapping spell to keep the old behaviour.
#define FAKE_SPELL_MAGIC_MAPPING    SPELL_NO_SPELL

Replacement in crawl-ref/source/xom.cc at line 70 [5.3]

B:BD[6.57] → [4.153:224]

    SPELL_MAGIC_MAPPING, SPELL_DETECT_ITEMS, SPELL_SUMMON_BUTTERFLIES,

[6.57]

[4.224]

    FAKE_SPELL_MAGIC_MAPPING, SPELL_DETECT_ITEMS, SPELL_SUMMON_BUTTERFLIES,

Replacement in crawl-ref/source/xom.cc at line 497 [5.3]

B:BD[7.2887] → [4.2811:2884]

        if (spell == SPELL_MAGIC_MAPPING || spell == SPELL_DETECT_ITEMS)

[7.2887]

[7.2929]

        if (spell == FAKE_SPELL_MAGIC_MAPPING || spell == SPELL_DETECT_ITEMS)

Insertion in crawl-ref/source/xom.cc at line 506 [5.3]

[6.1012]

[7.3220]


    // Handle magic mapping specially, now it's no longer a spell.
    if (spell == FAKE_SPELL_MAGIC_MAPPING)
    {
        if (you.level_type == LEVEL_PANDEMONIUM)
            return (false);
        god_speaks(GOD_XOM, _get_xom_speech("spell effect").c_str());
#if defined(DEBUG_DIAGNOSTICS) || defined(DEBUG_RELIGION) || defined(DEBUG_XOM)
        mprf(MSGCH_DIAGNOSTICS,
             "_xom_makes_you_cast_random_spell(); spell: %d, spellenum: %d",
             spell, spellenum);
#endif
        take_note(Note(NOTE_XOM_EFFECT, you.piety, tension, "magic mapping"),
                  true);
        const int power = stepdown_value( sever, 10, 10, 40, 45 );
        magic_mapping( 5 + power, 50 + random2avg( power * 2, 2 ), false );
        return (true);
    }

Deletion in crawl-ref/source/spl-data.h at line 129 [8.268152]
B:BD[8.274496] → [8.274496:274497]
Deletion in crawl-ref/source/spl-data.h at line 130 [8.268152]
B:BD[8.274498] → [8.274498:274532]
B:BD[8.274532] → [9.960:1017]
B:BD[9.1017] → [10.1061:1074]
B:BD[10.1074] → [11.1478:1486]
∅:D[10.1074] → [9.1017:1050]
∅:D[11.1486] → [9.1017:1050]
B:BD[9.1017] → [9.1017:1050]
∅:D[12.520] → [8.274562:274565]
∅:D[9.1050] → [8.274562:274565]
∅:D[13.2737] → [8.274562:274565]
B:BD[8.274562] → [8.274562:274565]
```
{
    SPELL_IDENTIFY, "Identify",
     SPTYP_DIVINATION,
     SPFLAG_NONE,
     6,
     0,
     -1, -1,
     0,
     NULL,
     false,
     true
},
```
Deletion in crawl-ref/source/spl-data.h at line 155 [8.268152]
∅:D[12.558] → [8.274716:274722]
∅:D[13.2807] → [8.274716:274722]
B:BD[8.274716] → [8.274716:274722]
B:BD[8.274799] → [8.274799:274863]
B:BD[8.274863] → [14.119892:119910]
B:BD[14.119910] → [12.578:586]
B:BD[12.586] → [15.754:762]
B:BD[15.762] → [10.1149:1162]
B:BD[10.1162] → [11.1514:1522]
∅:D[15.762] → [13.2842:2875]
∅:D[10.1162] → [13.2842:2875]
∅:D[11.1522] → [13.2842:2875]
B:BD[12.586] → [13.2842:2875]
```
},
{
    SPELL_REMOVE_CURSE, "Remove Curse",
     SPTYP_ENCHANTMENT,
     SPFLAG_NONE,
     5,
     0,
     -1, -1,
     0,
     NULL,
     false,
     true
```
Deletion in crawl-ref/source/spl-data.h at line 586 [8.268152]
∅:D[16.182] → [8.278129:278135]
∅:D[12.1412] → [8.278129:278135]
∅:D[9.2121] → [8.278129:278135]
∅:D[13.4003] → [8.278129:278135]
B:BD[8.278129] → [8.278129:278135]
B:BD[8.278269] → [8.278269:278332]
B:BD[8.278332] → [14.120939:120957]
B:BD[14.120957] → [12.1451:1459]
B:BD[12.1459] → [15.1320:1328]
B:BD[15.1328] → [10.1988:2001]
B:BD[10.2001] → [11.1959:1967]
∅:D[15.1328] → [13.4072:4095]
∅:D[11.1967] → [13.4072:4095]
∅:D[10.2001] → [13.4072:4095]
B:BD[12.1459] → [13.4072:4095]
B:BD[13.4095] → [17.1990:2000]
```
},
{
    SPELL_DETECT_CURSE, "Detect Curse",
     SPTYP_DIVINATION,
     SPFLAG_NONE,
     3,
     0,
     -1, -1,
     0,
     NULL,
     false,
     true
```
Deletion in crawl-ref/source/spl-data.h at line 786 [8.268152]
B:BD[8.279813] → [8.279813:279892]
B:BD[8.279892] → [18.174:195]
∅:D[18.195] → [12.1786:1794]
B:BD[14.121326] → [12.1786:1794]
B:BD[12.1794] → [15.1491:1500]
B:BD[15.1500] → [10.2237:2250]
B:BD[10.2250] → [11.2103:2111]
∅:D[15.1500] → [13.4562:4585]
∅:D[11.2111] → [13.4562:4585]
∅:D[10.2250] → [13.4562:4585]
B:BD[12.1794] → [13.4562:4585]
B:BD[13.4585] → [17.2307:2317]
∅:D[12.1804] → [8.279899:279905]
∅:D[17.2317] → [8.279899:279905]
∅:D[13.4596] → [8.279899:279905]
B:BD[8.279899] → [8.279899:279905]
```
    SPELL_MAGIC_MAPPING, "Magic Mapping",
     SPTYP_DIVINATION | SPTYP_EARTH,
     SPFLAG_MAPPING,
     4,
     45,
     -1, -1,
     0,
     NULL,
     false,
     true
},
{
```
Deletion in crawl-ref/source/spl-cast.cc at line 2070 [8.293070]
B:BD[19.14142] → [19.14142:14200]
∅:D[19.14200] → [8.339024:339040]
B:BD[8.339024] → [8.339024:339040]
B:BD[8.339040] → [19.14201:14259]
∅:D[19.14259] → [8.339116:339132]
B:BD[8.339116] → [8.339116:339132]
B:BD[8.339132] → [19.14260:14309]
∅:D[19.14309] → [8.339196:339212]
B:BD[8.339196] → [8.339196:339212]
```
    case SPELL_DETECT_CURSE:
        detect_curse(false);
        break;
    case SPELL_REMOVE_CURSE:
        remove_curse(false);
        break;
    case SPELL_IDENTIFY:
        identify(powc);
        break;
```

Deletion in crawl-ref/source/spl-cast.cc at line 2111 [8.293070]

B:BD[8.339645] → [19.15096:15175]

B:BD[19.15185] → [19.15185:15246]

B:BD[19.15256] → [19.15256:15426]

∅:D[20.8573] → [8.339773:339789]

∅:D[19.15587] → [8.339773:339789]

B:BD[8.339773] → [8.339773:339789]

    case SPELL_MAGIC_MAPPING:
        if (you.level_type == LEVEL_PANDEMONIUM)
            mpr("Your Earth magic cannot map Pandemonium.");
        else
        {
            powc = stepdown_value( powc, 10, 10, 40, 45 );
            magic_mapping( 5 + powc, 50 + random2avg( powc * 2, 2 ), false );
        }
        break;

Deletion in crawl-ref/source/spl-book.cc at line 175 [8.397614]
B:BD[8.401067] → [8.401067:401093]
```
     SPELL_MAGIC_MAPPING,
```
Insertion in crawl-ref/source/spl-book.cc at line 178 [8.397614]
[8.401156]
[8.401156]
```
     SPELL_NO_SPELL,
```
Deletion in crawl-ref/source/spl-book.cc at line 196 [8.397614]
B:BD[8.401535] → [8.401535:401560]
```
     SPELL_REMOVE_CURSE,
```
Insertion in crawl-ref/source/spl-book.cc at line 201 [8.397614]
[8.401673]
[8.401673]
```
     SPELL_NO_SPELL,
```
Deletion in crawl-ref/source/spl-book.cc at line 272 [8.397614]
B:BD[8.403159] → [8.403159:403184]
```
     SPELL_DETECT_CURSE,
```
Replacement in crawl-ref/source/spl-book.cc at line 274 [8.397614]
B:BD[8.403200] → [8.403200:403225]
```
     SPELL_REMOVE_CURSE,
```
[8.403200]
[8.403225]
```
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
```
Deletion in crawl-ref/source/spl-book.cc at line 362 [8.397614]
B:BD[8.406790] → [8.406790:406815]
```
     SPELL_DETECT_CURSE,
```
Replacement in crawl-ref/source/spl-book.cc at line 364 [8.397614]
B:BD[8.406862] → [8.406862:406883]
```
     SPELL_IDENTIFY,
```
[8.406862]
[8.406883]
```
     SPELL_NO_SPELL,
```
Insertion in crawl-ref/source/spl-book.cc at line 366 [8.397614]
[8.406904]
[8.406904]
```
     SPELL_NO_SPELL,
```
Deletion in crawl-ref/source/spl-book.cc at line 449 [8.397614]
∅:D[21.1261] → [8.409325:409351]
B:BD[8.409325] → [8.409325:409351]
```
     SPELL_MAGIC_MAPPING,
```
Insertion in crawl-ref/source/spl-book.cc at line 454 [8.397614]
[22.167]
[14.137435]
```
     SPELL_NO_SPELL,
```
Deletion in crawl-ref/source/spl-book.cc at line 461 [8.397614]
B:BD[8.409807] → [8.409807:409833]
```
     SPELL_MAGIC_MAPPING,
```
Deletion in crawl-ref/source/spl-book.cc at line 463 [8.397614]
B:BD[8.409880] → [8.409880:409901]
```
     SPELL_IDENTIFY,
```
Insertion in crawl-ref/source/spl-book.cc at line 465 [8.397614]
[8.409940]
[8.409940]
```
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
```
Deletion in crawl-ref/source/spl-book.cc at line 695 [8.397614]
B:BD[8.413491] → [8.413491:413517]
```
     SPELL_MAGIC_MAPPING,
```
Insertion in crawl-ref/source/spl-book.cc at line 699 [8.397614]
[8.413601]
[8.413601]
```
     SPELL_NO_SPELL,
```
Replacement in crawl-ref/source/enum.h at line 2052 [8.3287960]
B:BD[23.4778] → [2.3651:3671]
```
    MONS_MENKAURE, 
```
[23.4778]
[24.3693]
```
    MONS_MENKAURE,
```
Deletion in crawl-ref/source/enum.h at line 2664 [8.3287960]
B:BD[25.2894] → [25.2894:2914]
```
    SPELL_IDENTIFY,
```
Deletion in crawl-ref/source/enum.h at line 2666 [8.3287960]
B:BD[8.3362331] → [26.4332:4356]
```
    SPELL_REMOVE_CURSE,
```
Deletion in crawl-ref/source/enum.h at line 2698 [8.3287960]
∅:D[26.4825] → [8.3363610:3363634]
B:BD[8.3363610] → [8.3363610:3363634]
```
    SPELL_DETECT_CURSE,
```
Deletion in crawl-ref/source/enum.h at line 2713 [8.3287960]
B:BD[8.3364082] → [8.3364082:3364107]
```
    SPELL_MAGIC_MAPPING,
```
Deletion in crawl-ref/source/dat/descript/spells.txt at line 176 [28.2853]
∅:D[27.6606] → [28.10268:10287]
B:BD[28.10268] → [28.10268:10287]
B:BD[28.10287] → [27.6607:6689]
```
%%%%
Detect Curse
This spell alerts the caster to the presence of curses on his or her possessions.
```
Deletion in crawl-ref/source/dat/descript/spells.txt at line 300 [28.2853]
∅:D[27.9354] → [28.15374:15389]
B:BD[28.15374] → [28.15374:15389]
B:BD[28.15389] → [27.9355:9452]
```
%%%%
Identify
This spell allows the caster to determine the properties of an otherwise inscrutable magic item.
```
Deletion in crawl-ref/source/dat/descript/spells.txt at line 344 [28.2853]
∅:D[27.10412] → [28.16913:16933]
B:BD[28.16913] → [28.16913:16933]
B:BD[28.16933] → [27.10413:10473]
```
%%%%
Magic Mapping
This spell reveals details about the caster's surroundings.
```
Deletion in crawl-ref/source/dat/descript/spells.txt at line 432 [28.2853]
∅:D[27.12888] → [28.20734:20753]
B:BD[28.20734] → [28.20734:20753]
B:BD[28.20753] → [27.12889:12966]
```
%%%%
Remove Curse
This spell removes curses from any items which are being used by the caster.
```

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

∅:D[29.5867] → [26.7151:7261]

B:BD[30.5789] → [26.7151:7261]

    COMPILE_CHECK(SPELL_DEBUGGING_RAY == 107    , c4);
    COMPILE_CHECK(SPELL_PETRIFY == 160          , c5);

[29.5867]

[31.9994]

    COMPILE_CHECK(SPELL_DEBUGGING_RAY == 103    , c4);
    COMPILE_CHECK(SPELL_PETRIFY == 156          , c5);

Insertion in crawl-ref/docs/obsolete/cut_spells.txt at line 415 [26.7359]

[26.12909]

     0,
     -1, -1,
     0,
     NULL,
     false,
     true
},
{
    SPELL_IDENTIFY, "Identify",
     SPTYP_DIVINATION,
     SPFLAG_NONE,
     6,
     0,
     -1, -1,
     0,
     NULL,
     false,
     true
},
{
    SPELL_REMOVE_CURSE, "Remove Curse",
     SPTYP_ENCHANTMENT,
     SPFLAG_NONE,
     5,
     0,
     -1, -1,
     0,
     NULL,
     false,
     true
},
{
    SPELL_DETECT_CURSE, "Detect Curse",
     SPTYP_DIVINATION,
     SPFLAG_NONE,
     3,

Insertion in crawl-ref/docs/obsolete/cut_spells.txt at line 455 [26.7359]

[26.12917]

     -1, -1,
     0,
     NULL,
     false,
     true
},
{
    SPELL_MAGIC_MAPPING, "Magic Mapping",
     SPTYP_DIVINATION | SPTYP_EARTH,
     SPFLAG_MAPPING,
     4,
     45,

Insertion in crawl-ref/docs/obsolete/cut_spells.txt at line 566 [26.7359]

[32.5951]

Detect Curse
This spell alerts the caster to the presence of curses on his or her possessions.
%%%%
Identify
This spell allows the caster to determine the properties of an otherwise inscrutable magic item.
%%%%
Magic Mapping
This spell reveals details about the caster's surroundings.
%%%%
Remove Curse
This spell removes curses from any items which are being used by the caster.
%%%%

Remove four scroll-duplicate spells: Detect Curse, Remove Curse,

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/xom.cc at line 62 [5.3]

Replacement in crawl-ref/source/xom.cc at line 70 [5.3]

Replacement in crawl-ref/source/xom.cc at line 497 [5.3]

Insertion in crawl-ref/source/xom.cc at line 506 [5.3]

Deletion in crawl-ref/source/spl-data.h at line 129 [8.268152]

Deletion in crawl-ref/source/spl-data.h at line 130 [8.268152]

Deletion in crawl-ref/source/spl-data.h at line 155 [8.268152]

Deletion in crawl-ref/source/spl-data.h at line 586 [8.268152]

Deletion in crawl-ref/source/spl-data.h at line 786 [8.268152]

Deletion in crawl-ref/source/spl-cast.cc at line 2070 [8.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 2111 [8.293070]

Deletion in crawl-ref/source/spl-book.cc at line 175 [8.397614]

Insertion in crawl-ref/source/spl-book.cc at line 178 [8.397614]

Deletion in crawl-ref/source/spl-book.cc at line 196 [8.397614]

Insertion in crawl-ref/source/spl-book.cc at line 201 [8.397614]

Deletion in crawl-ref/source/spl-book.cc at line 272 [8.397614]

Replacement in crawl-ref/source/spl-book.cc at line 274 [8.397614]

Deletion in crawl-ref/source/spl-book.cc at line 362 [8.397614]

Replacement in crawl-ref/source/spl-book.cc at line 364 [8.397614]

Insertion in crawl-ref/source/spl-book.cc at line 366 [8.397614]

Deletion in crawl-ref/source/spl-book.cc at line 449 [8.397614]

Insertion in crawl-ref/source/spl-book.cc at line 454 [8.397614]

Deletion in crawl-ref/source/spl-book.cc at line 461 [8.397614]

Deletion in crawl-ref/source/spl-book.cc at line 463 [8.397614]

Insertion in crawl-ref/source/spl-book.cc at line 465 [8.397614]

Deletion in crawl-ref/source/spl-book.cc at line 695 [8.397614]

Insertion in crawl-ref/source/spl-book.cc at line 699 [8.397614]

Replacement in crawl-ref/source/enum.h at line 2052 [8.3287960]

Deletion in crawl-ref/source/enum.h at line 2664 [8.3287960]

Deletion in crawl-ref/source/enum.h at line 2666 [8.3287960]

Deletion in crawl-ref/source/enum.h at line 2698 [8.3287960]

Deletion in crawl-ref/source/enum.h at line 2713 [8.3287960]

Deletion in crawl-ref/source/dat/descript/spells.txt at line 176 [28.2853]

Deletion in crawl-ref/source/dat/descript/spells.txt at line 300 [28.2853]

Deletion in crawl-ref/source/dat/descript/spells.txt at line 344 [28.2853]

Deletion in crawl-ref/source/dat/descript/spells.txt at line 432 [28.2853]

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

Insertion in crawl-ref/docs/obsolete/cut_spells.txt at line 415 [26.7359]

Insertion in crawl-ref/docs/obsolete/cut_spells.txt at line 455 [26.7359]

Insertion in crawl-ref/docs/obsolete/cut_spells.txt at line 566 [26.7359]