fiddlerwoaroof/crawl - Change KHVK7HH7OIYOBZY52WQGGLC2O4SXTWQS2XAHNJZZ7JZ3QTOUTLNAC

In enum.h, move "Summon Ugly Thing" to the end of the user spell

section, where it probably should have gone in the first place. Also, reorder the spells in spl-data.h to match the order in enum.h.

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

Created by dolorous on April 19, 2008

KHVK7HH7OIYOBZY52WQGGLC2O4SXTWQS2XAHNJZZ7JZ3QTOUTLNAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-data.h at line 240 [4.268152]

[4.275187]

    SPTYP_TRANSLOCATION,
    SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF,
    1,
    25,
    NULL,
    true
},
{
  SPELL_FAR_STRIKE, "Far Strike",

Insertion in crawl-ref/source/spl-data.h at line 251 [4.268152]

[4.275212]

[5.120009]

    SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF,
    3,
    100,
    NULL,
    true
},
{
  SPELL_DELAYED_FIREBALL, "Delayed Fireball",
    SPTYP_FIRE | SPTYP_CONJURATION,
    SPFLAG_NONE,
    7,
    0,
     NULL,
     false,
    false
},
{
  SPELL_STRIKING, "Striking",
    0,

Replacement in crawl-ref/source/spl-data.h at line 887 [4.268152]
B:BD[4.280359] → [6.183:186]
```
  
```
[4.280359]
[4.280360]

Insertion in crawl-ref/source/spl-data.h at line 1121 [4.268152]

[7.1798]

[8.5506]

     NULL,
     false,
    false
},
{
  SPELL_FULSOME_DISTILLATION, "Fulsome Distillation",
    SPTYP_TRANSMIGRATION | SPTYP_NECROMANCY,
    SPFLAG_NONE,
    1,
    50,

Insertion in crawl-ref/source/spl-data.h at line 1138 [4.268152]

[4.282197]

  SPELL_POISON_ARROW, "Poison Arrow",
    SPTYP_CONJURATION | SPTYP_POISON,
    SPFLAG_DIR_OR_TARGET,
    6,
    200,
    NULL,
    true
},
{

Deletion in crawl-ref/source/spl-data.h at line 1775 [4.268152]
B:BD[4.287403] → [4.287403:287404]
Deletion in crawl-ref/source/spl-data.h at line 1776 [4.268152]
B:BD[4.287405] → [4.287405:287406]
Deletion in crawl-ref/source/spl-data.h at line 1778 [4.268152]
B:BD[4.287427] → [4.287427:287428]
Deletion in crawl-ref/source/spl-data.h at line 1932 [4.268152]
B:BD[4.288671] → [9.25:140]
B:BD[9.140] → [10.3784:3854]
B:BD[10.3854] → [7.2608:2618]
∅:D[7.2618] → [8.7904:7937]
B:BD[10.3854] → [8.7904:7937]
∅:D[10.3864] → [9.209:215]
∅:D[8.7937] → [9.209:215]
B:BD[9.209] → [9.209:215]
```
    SPELL_EXCRUCIATING_WOUNDS, "Excruciating Wounds",
     SPTYP_ENCHANTMENT | SPTYP_NECROMANCY,
     SPFLAG_NONE,
     5,     // fairly high level - potentially one of the best brands
     200,
     NULL,
     false,
    false
},
{
```

Replacement in crawl-ref/source/spl-data.h at line 2160 [4.268152]

B:BD[4.290867] → [4.290867:290949]

B:BD[4.290949] → [5.124382:124399]

B:BD[5.124399] → [10.4399:4406]

B:BD[10.4406] → [7.2850:2857]

  SPELL_DELAYED_FIREBALL, "Delayed Fireball",
    SPTYP_FIRE | SPTYP_CONJURATION,
    SPFLAG_NONE,
    7,
    0,

[4.290867]

[8.8616]

    SPELL_EXCRUCIATING_WOUNDS, "Excruciating Wounds",
     SPTYP_ENCHANTMENT | SPTYP_NECROMANCY,
     SPFLAG_NONE,
     5,     // fairly high level - potentially one of the best brands
     200,

Deletion in crawl-ref/source/spl-data.h at line 2168 [4.268152]
∅:D[10.4416] → [4.290956:291061]
∅:D[8.8649] → [4.290956:291061]
B:BD[4.290956] → [4.290956:291061]
B:BD[4.291061] → [5.124400:124417]
B:BD[5.124417] → [10.4417:4424]
B:BD[10.4424] → [7.2858:2866]
∅:D[7.2866] → [8.8650:8683]
B:BD[10.4424] → [8.8650:8683]
∅:D[10.4434] → [4.291068:291150]
∅:D[8.8683] → [4.291068:291150]
B:BD[4.291068] → [4.291068:291150]
B:BD[4.291150] → [5.124418:124444]
B:BD[5.124444] → [10.4435:4442]
B:BD[10.4442] → [7.2867:2876]
∅:D[7.2876] → [8.8684:8703]
B:BD[10.4442] → [8.8684:8703]
```
},
{
  SPELL_FULSOME_DISTILLATION, "Fulsome Distillation",
    SPTYP_TRANSMIGRATION | SPTYP_NECROMANCY,
    SPFLAG_NONE,
    1,
    50,
     NULL,
     false,
    false
},
{
  SPELL_POISON_ARROW, "Poison Arrow",
    SPTYP_CONJURATION | SPTYP_POISON,
    SPFLAG_DIR_OR_TARGET,
    6,
    200,
    NULL,
    true
```
Replacement in crawl-ref/source/spl-data.h at line 2182 [4.268152]
∅:D[11.320] → [4.291163:291200]
B:BD[4.291163] → [4.291163:291200]
B:BD[4.291200] → [5.124445:124471]
B:BD[5.124471] → [10.4453:4460]
B:BD[10.4460] → [7.2877:2885]
```
  SPELL_STRIKING, "Striking",
    0,
    SPFLAG_DIR_OR_TARGET,
    1,
    25,
```
[11.320]
[8.8704]
```
    SPELL_SUMMON_UGLY_THING, "Summon Ugly Thing",
    SPTYP_SUMMONING,
    SPFLAG_NONE,
    5,
    200,
```
Replacement in crawl-ref/source/spl-data.h at line 2188 [4.268152]
B:BD[8.8714] → [8.8714:8723]
```
    true
```
[8.8714]
[8.8723]
```
    false,
    false
```
Replacement in crawl-ref/source/spl-data.h at line 2200 [4.268152]
B:BD[8.8884] → [8.8884:8895]
```
    false 
```
[8.8884]
[8.8895]
```
    false
```

Deletion in crawl-ref/source/spl-data.h at line 2371 [4.268152]

B:BD[8.10897] → [3.159:209]

∅:D[3.209] → [12.211:302]

B:BD[12.211] → [12.211:302]

    SPELL_SUMMON_UGLY_THING, "Summon Ugly Thing",
    SPTYP_SUMMONING,
    SPFLAG_NONE,
    5,
    200,
    NULL,
    false,
    false
},
{

Insertion in crawl-ref/source/enum.h at line 2556 [4.3287960]
[2.791]
[8.51935]
```
    SPELL_SUMMON_UGLY_THING,           //  205
```
Replacement in crawl-ref/source/enum.h at line 2559 [4.3287960]
B:BD[8.51988] → [8.51988:52033]
```
    SPELL_HELLFIRE_BURST,             // 205
```
[8.51988]
[8.52033]
```
    SPELL_HELLFIRE_BURST,
```

Replacement in crawl-ref/source/enum.h at line 2563 [4.3287960]

B:BD[8.52113] → [8.52113:52180]

    SPELL_STEAM_BALL,
    SPELL_SUMMON_UFETUBUS,            // 210

[8.52113]

[8.52180]

    SPELL_STEAM_BALL,                  //  210
    SPELL_SUMMON_UFETUBUS,

Replacement in crawl-ref/source/enum.h at line 2568 [4.3287960]

B:BD[8.52252] → [8.52252:52322]

    SPELL_SUMMON_UNDEAD,
    SPELL_CANTRIP,                    // 215

[8.52252]

[8.52322]

    SPELL_SUMMON_UNDEAD,               //  215
    SPELL_CANTRIP,

Replacement in crawl-ref/source/enum.h at line 2573 [4.3287960]

B:BD[8.52395] → [8.52395:52465]

    SPELL_SUMMON_DRAKES,
    SPELL_BLINK_OTHER,                // 220

[8.52395]

[8.52465]

    SPELL_SUMMON_DRAKES,               //  220
    SPELL_BLINK_OTHER,

Deletion in crawl-ref/source/enum.h at line 2576 [4.3287960]
B:BD[8.52493] → [3.2823:2852]
```
    SPELL_SUMMON_UGLY_THING,
```

Replacement in crawl-ref/source/acr.cc at line 4578 [4.4397395]

B:BD[13.5514] → [13.5514:5569]

    COMPILE_CHECK(SPELL_SUMMON_MUSHROOMS == 221 , c6);

[13.5514]

[13.5569]

    COMPILE_CHECK(SPELL_SUMMON_MUSHROOMS == 222 , c6);

In enum.h, move "Summon Ugly Thing" to the end of the user spell

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-data.h at line 240 [4.268152]

Insertion in crawl-ref/source/spl-data.h at line 251 [4.268152]

Replacement in crawl-ref/source/spl-data.h at line 887 [4.268152]

Insertion in crawl-ref/source/spl-data.h at line 1121 [4.268152]

Insertion in crawl-ref/source/spl-data.h at line 1138 [4.268152]

Deletion in crawl-ref/source/spl-data.h at line 1775 [4.268152]

Deletion in crawl-ref/source/spl-data.h at line 1776 [4.268152]

Deletion in crawl-ref/source/spl-data.h at line 1778 [4.268152]

Deletion in crawl-ref/source/spl-data.h at line 1932 [4.268152]

Replacement in crawl-ref/source/spl-data.h at line 2160 [4.268152]

Deletion in crawl-ref/source/spl-data.h at line 2168 [4.268152]

Replacement in crawl-ref/source/spl-data.h at line 2182 [4.268152]

Replacement in crawl-ref/source/spl-data.h at line 2188 [4.268152]

Replacement in crawl-ref/source/spl-data.h at line 2200 [4.268152]

Deletion in crawl-ref/source/spl-data.h at line 2371 [4.268152]

Insertion in crawl-ref/source/enum.h at line 2556 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 2559 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 2563 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 2568 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 2573 [4.3287960]

Deletion in crawl-ref/source/enum.h at line 2576 [4.3287960]

Replacement in crawl-ref/source/acr.cc at line 4578 [4.4397395]