fiddlerwoaroof/crawl - Change NN6O3D72SXCVAKLQ4R6TPFUWCMWB2CQX4YAAI3DKYIUG6KK3MEEQC

Bug 2414178: applied Brendan MacDonell's patch (2414671) to make the book order

in spl-book.cc match enum.h

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

Created by zelgadis on December 11, 2008

NN6O3D72SXCVAKLQ4R6TPFUWCMWB2CQX4YAAI3DKYIUG6KK3MEEQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 52 [7.397614]

B:BD[5.103] → [6.269:298]

#define NUMBER_SPELLBOOKS 61

[7.398461]

[5.132]

#define NUMBER_SPELLBOOKS sizeof(spellbook_template_array)/(sizeof(spell_type) * SPELLBOOK_SIZE)

Replacement in crawl-ref/source/spl-book.cc at line 54 [7.397614]

B:BD[5.133] → [5.133:213]

static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] =

[5.133]

[7.398535]

static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =

Deletion in crawl-ref/source/spl-book.cc at line 295 [7.397614]

B:BD[7.404194] → [7.404194:404294]

B:BD[7.404294] → [5.811:841]

∅:D[5.841] → [7.404332:404462]

B:BD[7.404332] → [7.404332:404462]

     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     },
    // 24 - Necronomicon -- Kikubaaqudgha special
    {SPELL_SYMBOL_OF_TORMENT,
     SPELL_CONTROL_UNDEAD,
     SPELL_SUMMON_WRAITHS,
     SPELL_DEATHS_DOOR,
     SPELL_NECROMUTATION,
     SPELL_DEATH_CHANNEL,

Replacement in crawl-ref/source/spl-book.cc at line 298 [7.397614]
B:BD[7.404512] → [7.404512:404541]
```
    // 25 - Book of Callings
```
[7.404512]
[8.532]
```
    // 24 - Book of Callings
```
Replacement in crawl-ref/source/spl-book.cc at line 308 [7.397614]
B:BD[7.404768] → [7.404768:404795]
```
    // 26 - Book of Charms
```
[7.404768]
[5.875]
```
    // 25 - Book of Charms
```

Replacement in crawl-ref/source/spl-book.cc at line 318 [7.397614]

B:BD[7.405072] → [7.405072:405123]

B:BD[7.405123] → [5.898:923]

∅:D[5.923] → [7.405156:405354]

B:BD[7.405156] → [7.405156:405354]

    // 27 - Book of Demonology  -- Vehumet special
    {SPELL_ABJURATION_I,
     SPELL_RECALL,
     SPELL_CALL_IMP,
     SPELL_SUMMON_DEMON,
     SPELL_DEMONIC_HORDE,
     SPELL_SUMMON_GREATER_DEMON,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     },
    // 28 - Book of Air

[7.405072]

[5.924]

    // 26 - Book of Air

Replacement in crawl-ref/source/spl-book.cc at line 344 [7.397614]
B:BD[7.406333] → [7.406333:406361]
```
    // 29 - Book of the Sky
```
[7.406333]
[5.943]
```
    // 27 - Book of the Sky
```
Replacement in crawl-ref/source/spl-book.cc at line 355 [7.397614]
B:BD[7.406664] → [7.406664:406696]
```
    // 30 - Book of Divinations
```
[7.406664]
[5.973]
```
    // 28 - Book of Divinations
```
Replacement in crawl-ref/source/spl-book.cc at line 365 [7.397614]
B:BD[7.406912] → [7.406912:406941]
```
    // 31 - Book of the Warp
```
[7.406912]
[5.1006]
```
    // 29 - Book of the Warp
```
Replacement in crawl-ref/source/spl-book.cc at line 375 [7.397614]
B:BD[7.407134] → [7.407134:407168]
```
    // 32 - Book of Envenomations
```
[7.407134]
[3.276]
```
    // 30 - Book of Envenomations
```

Replacement in crawl-ref/source/spl-book.cc at line 385 [7.397614]

B:BD[7.407398] → [7.407398:407451]

B:BD[7.407451] → [5.1055:1092]

∅:D[5.1092] → [7.407496:407521]

B:BD[7.407496] → [7.407496:407521]

B:BD[7.407521] → [9.137406:137434]

∅:D[9.137434] → [7.407586:407743]

B:BD[7.407586] → [7.407586:407743]

    // 33 - Book of Annihilations -- Vehumet special
    {SPELL_ISKENDERUNS_MYSTIC_BLAST,
     SPELL_POISON_ARROW,
     SPELL_CHAIN_LIGHTNING,
     SPELL_LEHUDIBS_CRYSTAL_SPEAR,
     SPELL_ICE_STORM,
     SPELL_FIRE_STORM,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     },
    // 34 - Book of Unlife

[7.407398]

[5.1093]

    // 31 - Book of Unlife

Replacement in crawl-ref/source/spl-book.cc at line 396 [7.397614]

B:BD[7.407974] → [7.407974:408006]

B:BD[7.408006] → [10.12541:12562]

B:BD[7.408035] → [7.408035:408218]

    // 35 - Tome of Destruction
    {SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     },
    // 36 - Book of Control

[7.407974]

[2.156]

    // 32 - Book of Control

Replacement in crawl-ref/source/spl-book.cc at line 406 [7.397614]
B:BD[7.408430] → [11.496:527]
```
    // 37 - Book of Morphology
```
[7.408430]
[5.1152]
```
    // 33 - Book of Morphology
```
Replacement in crawl-ref/source/spl-book.cc at line 418 [7.397614]
B:BD[7.408794] → [7.408794:408821]
```
    // 38 - Book of Tukima
```
[7.408794]
[5.1179]
```
    // 34 - Book of Tukima
```
Replacement in crawl-ref/source/spl-book.cc at line 428 [7.397614]
B:BD[7.409024] → [7.409024:409053]
```
    // 39 - Book of Geomancy
```
[7.409024]
[5.1203]
```
    // 35 - Book of Geomancy
```
Replacement in crawl-ref/source/spl-book.cc at line 439 [7.397614]
B:BD[7.409256] → [7.409256:409282]
```
    // 40 - Book of Earth
```
[7.409256]
[5.1226]
```
    // 36 - Book of Earth
```

Deletion in crawl-ref/source/spl-book.cc at line 448 [7.397614]

∅:D[9.137455] → [7.409487:409528]

B:BD[7.409487] → [7.409487:409528]

B:BD[7.409528] → [10.12673:12694]

∅:D[10.12694] → [7.409536:409683]

B:BD[7.409536] → [7.409536:409683]

     },
    // 41 - manuals of all kinds
    {SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,

Replacement in crawl-ref/source/spl-book.cc at line 449 [7.397614]
B:BD[7.409712] → [7.409712:409741]
```
    // 42 - Book of Wizardry
```
[7.409712]
[5.1262]
```
    // 37 - Book of Wizardry
```
Replacement in crawl-ref/source/spl-book.cc at line 459 [7.397614]
B:BD[7.409948] → [7.409948:409974]
```
    // 43 - Book of Power
```
[7.409948]
[5.1292]
```
    // 38 - Book of Power
```

Replacement in crawl-ref/source/spl-book.cc at line 469 [7.397614]

B:BD[7.410191] → [7.410191:410248]

    // 44 - Book of Cantrips      //jmf: added 04jan2000

[7.410191]

[5.1318]

    // 39 - Book of Cantrips      //jmf: added 04jan2000

Replacement in crawl-ref/source/spl-book.cc at line 480 [7.397614]

B:BD[7.410473] → [7.410473:410530]

    // 45 - Book of Party Tricks  //jmf: added 04jan2000

[7.410473]

[5.1347]

    // 40 - Book of Party Tricks  //jmf: added 04jan2000

Replacement in crawl-ref/source/spl-book.cc at line 491 [7.397614]
B:BD[7.410793] → [7.410793:410843]
```
    // 46 - Book of Beasts //jmf: added 19mar2000
```
[7.410793]
[8.600]
```
    // 41 - Book of Beasts //jmf: added 19mar2000
```
Replacement in crawl-ref/source/spl-book.cc at line 502 [7.397614]
B:BD[7.411072] → [7.411072:411118]
```
    // 47 - Book of Stalking //jmf: 24jun2000
```
[7.411072]
[5.1412]
```
    // 42 - Book of Stalking //jmf: 24jun2000
```

Insertion in crawl-ref/source/spl-book.cc at line 510 [7.397614]

[7.411294]

     SPELL_NO_SPELL,
     },
     
    // 43 - Book of Annihilations -- Vehumet special
    {SPELL_ISKENDERUNS_MYSTIC_BLAST,
     SPELL_POISON_ARROW,
     SPELL_CHAIN_LIGHTNING,
     SPELL_LEHUDIBS_CRYSTAL_SPEAR,
     SPELL_ICE_STORM,
     SPELL_FIRE_STORM,
     SPELL_NO_SPELL,

Replacement in crawl-ref/source/spl-book.cc at line 524 [7.397614]

B:BD[7.411324] → [7.411324:411344]

    // 48 -- unused

[7.411324]

[10.12849]

    // 44 - Book of Demonology  -- Vehumet special
    {SPELL_ABJURATION_I,
     SPELL_RECALL,
     SPELL_CALL_IMP,
     SPELL_SUMMON_DEMON,
     SPELL_DEMONIC_HORDE,
     SPELL_SUMMON_GREATER_DEMON,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     },
     
    // 45 - Necronomicon -- Kikubaaqudgha special
    {SPELL_SYMBOL_OF_TORMENT,
     SPELL_CONTROL_UNDEAD,
     SPELL_SUMMON_WRAITHS,
     SPELL_DEATHS_DOOR,
     SPELL_NECROMUTATION,
     SPELL_DEATH_CHANNEL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     },
    // 46 - Randart Spellbook (by level)
    {SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     },
    // 47 - Randart Spellbook (by theme)

Replacement in crawl-ref/source/spl-book.cc at line 568 [7.397614]
B:BD[7.411529] → [7.411529:411548]
```
    // 49 - unused
```
[7.411529]
[10.12871]
```
    // 48 - Book of Card Effects
```

Replacement in crawl-ref/source/spl-book.cc at line 579 [7.397614]

B:BD[7.411733] → [6.299:326]

    // Rods - start at 50.

[7.411733]

[6.326]

    // 49 - manuals of all kinds
    {SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     },
     
    // 50 - Tome of Destruction
    {SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     SPELL_NO_SPELL,
     },
     
    // Rods - start at NUM_BOOKS.

Replacement in crawl-ref/source/spl-book.cc at line 603 [7.397614]
B:BD[6.327] → [6.327:354]
```
    // 50 - Rod of smiting
```
[6.327]
[5.1431]
```
    // 51 - Rod of smiting
```
Replacement in crawl-ref/source/spl-book.cc at line 614 [7.397614]
B:BD[6.356] → [6.356:385]
```
    // 51 - Rod of summoning
```
[6.356]
[5.1452]
```
    // 52 - Rod of summoning
```
Replacement in crawl-ref/source/spl-book.cc at line 624 [7.397614]
B:BD[7.412217] → [6.386:424]
```
    // 52 - Rod of destruction (fire)
```
[7.412217]
[5.1478]
```
    // 53 - Rod of destruction (fire)
```
Replacement in crawl-ref/source/spl-book.cc at line 634 [7.397614]
B:BD[7.412441] → [6.425:462]
```
    // 53 - Rod of destruction (ice)
```
[7.412441]
[5.1503]
```
    // 54 - Rod of destruction (ice)
```

Replacement in crawl-ref/source/spl-book.cc at line 644 [7.397614]

B:BD[7.412667] → [4.348:407]

    // 54 - Rod of destruction (lightning, iron, fireball)

[7.412667]

[4.407]

    // 55 - Rod of destruction (lightning, iron, fireball)

Replacement in crawl-ref/source/spl-book.cc at line 654 [7.397614]

B:BD[7.412894] → [4.460:517]

    // 55 - Rod of destruction (inaccuracy, magma, cold)

[7.412894]

[5.1554]

    // 56 - Rod of destruction (inaccuracy, magma, cold)

Replacement in crawl-ref/source/spl-book.cc at line 664 [7.397614]
B:BD[7.413130] → [6.563:590]
```
    // 56 - Rod of warding
```
[7.413130]
[5.1586]
```
    // 57 - Rod of warding
```
Replacement in crawl-ref/source/spl-book.cc at line 674 [7.397614]
B:BD[7.413368] → [6.591:620]
```
    // 57 - Rod of discovery
```
[7.413368]
[5.1612]
```
    // 58 - Rod of discovery
```
Replacement in crawl-ref/source/spl-book.cc at line 684 [7.397614]
B:BD[7.413609] → [6.621:651]
```
    // 58 - Rod of demonology
```
[7.413609]
[5.1645]
```
    // 59 - Rod of demonology
```
Replacement in crawl-ref/source/spl-book.cc at line 694 [7.397614]
B:BD[7.413831] → [6.652:680]
```
    // 59 - Rod of striking
```
[7.413831]
[5.1671]
```
    // 60 - Rod of striking
```
Replacement in crawl-ref/source/spl-book.cc at line 704 [7.397614]
B:BD[7.414068] → [6.681:706]
```
    // 60 - Rod of venom
```
[7.414068]
[6.706]
```
    // 61 - Rod of venom
```

Replacement in crawl-ref/source/items.cc at line 2619 [7.2584728]

B:BD[12.840] → [6.1472:1612]

    return (base_type == OBJ_BOOKS?   sub_type                      :
            base_type == OBJ_STAVES?  sub_type + 50 - STAFF_SMITING :

[12.840]

[12.948]

    return (base_type == OBJ_BOOKS?   sub_type                             :
            base_type == OBJ_STAVES?  sub_type + NUM_BOOKS - STAFF_SMITING :

Bug 2414178: applied Brendan MacDonell's patch (2414671) to make the book order

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 52 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 54 [7.397614]

Deletion in crawl-ref/source/spl-book.cc at line 295 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 298 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 308 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 318 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 344 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 355 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 365 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 375 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 385 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 396 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 406 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 418 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 428 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 439 [7.397614]

Deletion in crawl-ref/source/spl-book.cc at line 448 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 449 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 459 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 469 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 480 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 491 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 502 [7.397614]

Insertion in crawl-ref/source/spl-book.cc at line 510 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 524 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 568 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 579 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 603 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 614 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 624 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 634 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 644 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 654 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 664 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 674 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 684 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 694 [7.397614]

Replacement in crawl-ref/source/spl-book.cc at line 704 [7.397614]

Replacement in crawl-ref/source/items.cc at line 2619 [7.2584728]