From e9a710842364c18cbd11c39b634a5d52b10e0313 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 1 Jan 2006 19:03:35 +0000 Subject: [PATCH] LUASPL_* ids entfernt, weil jetzt ein System existiert, die spell-id in XML zu setzen um zu alten Daten kompatibel zu bleiben. --- src/common/kernel/spell.c | 30 ------------------------ src/common/kernel/spell.h | 2 -- src/common/kernel/spellid.h | 45 +++++++++--------------------------- src/common/settings-wdw.h | 1 - src/res/spells.xml | 46 ++++++++++++++++++------------------- 5 files changed, 34 insertions(+), 90 deletions(-) diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c index c48f7423c..70aaa5bab 100644 --- a/src/common/kernel/spell.c +++ b/src/common/kernel/spell.c @@ -167,33 +167,6 @@ get_spellfromtoken(unit *u, const char *name, const struct locale * lang) spell * find_spellbyid(spellid_t id) { - struct { - spellid_t id; - const char * name; - magic_t mtype; - } * oldspell, oldspells[] = { - { LUASPL_CREATE_TACTICCRYSTAL, "create_dreameye", M_TRAUM }, - { LUASPL_CREATE_ANTIMAGICCRYSTAL, "create_antimagic", M_ASTRAL }, - { LUASPL_ARTEFAKT_NIMBLEFINGERRING, "create_roqf", M_BARDE }, - { LUASPL_ARTEFAKT_SACK_OF_CONSERVATION, "create_magicherbbag", M_DRUIDE }, - { LUASPL_FIRESWORD, "create_firesword", M_CHAOS }, - { LUASPL_INVISIBILITY_CERDDOR, "create_roi", M_BARDE }, - { LUASPL_INVISIBILITY_DRAIG, "create_roi", M_CHAOS }, - { LUASPL_INVISIBILITY_GWYRRD, "create_roi", M_DRUIDE }, - { LUASPL_INVISIBILITY_ILLAUN, "create_roi", M_TRAUM }, - { LUASPL_INVISIBILITY_TYBIED, "create_roi", M_ASTRAL }, - { LUASPL_STRENGTH, "create_trollbelt", M_CHAOS }, - { LUASPL_TRUESEEING_CERDDOR, "create_aots", M_BARDE }, - { LUASPL_TRUESEEING_DRAIG, "create_aots", M_CHAOS }, - { LUASPL_TRUESEEING_GWYRRD, "create_aots", M_DRUIDE }, - { LUASPL_TRUESEEING_ILLAUN, "create_aots", M_TRAUM }, - { LUASPL_TRUESEEING_TYBIED, "create_aots", M_ASTRAL }, - { LUASPL_ARTEFAKT_OF_POWER, "create_rop", M_ASTRAL }, - { LUASPL_BAG_OF_HOLDING, "create_bagofholding", M_ASTRAL }, - { LUASPL_INVISIBILITY2_ILLAUN, "create_invisibility_sphere", M_TRAUM }, - { LUASPL_ARTEFAKT_CHASTITYBELT, "create_chastitybelt", M_GRAU }, - { 0, NULL, 0 } - }; spell_list * slist; assert(id>=0); @@ -207,9 +180,6 @@ find_spellbyid(spellid_t id) if (sp->id == id) return sp; } - for (oldspell=oldspells;oldspell->name;++oldspell) { - if (oldspell->id==id) return find_spell(oldspell->mtype, oldspell->name); - } log_warning(("cannot find spell by id: %u\n", id)); return NULL; } diff --git a/src/common/kernel/spell.h b/src/common/kernel/spell.h index 20a68fffd..249cd668e 100644 --- a/src/common/kernel/spell.h +++ b/src/common/kernel/spell.h @@ -38,9 +38,7 @@ extern "C" { /* ------------------------------------------------------------- */ extern struct attrib_type at_unitdissolve; -#ifdef WDW_PYRAMIDSPELL extern struct attrib_type at_wdwpyramid; -#endif extern struct spell_list * spells; extern void init_spells(void); diff --git a/src/common/kernel/spellid.h b/src/common/kernel/spellid.h index deade4d3a..0e9f51d2c 100644 --- a/src/common/kernel/spellid.h +++ b/src/common/kernel/spellid.h @@ -14,9 +14,6 @@ /* Sprüche. Neue NUR hinten anfügen, oder das Datenfile geht kaputt */ enum { SPL_NOSPELL = 0, - LUASPL_ARTEFAKT_OF_POWER, - LUASPL_ARTEFAKT_OF_AURAPOWER, - LUASPL_ARTEFAKT_OF_REGENERATION, SPL_FIREBALL = 4, SPL_HAGEL, SPL_RUSTWEAPON, @@ -50,8 +47,7 @@ enum { SPL_SUMMONSHADOW, SPL_SUMMONSHADOWLORDS, SPL_REELING_ARROWS, - SPL_ANTIMAGICZONE, - LUASPL_CREATE_ANTIMAGICCRYSTAL, + SPL_ANTIMAGICZONE = 37, SPL_KAELTESCHUTZ = 39, SPL_STEALAURA, SPL_SUMMONUNDEAD, @@ -60,8 +56,7 @@ enum { SPL_STRONG_WALL, SPL_HOMESTONE, SPL_DROUGHT, - SPL_FOREST_FIRE, - LUASPL_STRENGTH, + SPL_FOREST_FIRE = 47, SPL_SUMMONENT = 49, SPL_DISTURBINGDREAMS, SPL_DENYATTACK, @@ -75,8 +70,7 @@ enum { SPL_WINDSHIELD, SPL_RAISEPEASANTS, SPL_DEPRESSION, - SPL_HEADACHE, - LUASPL_ARTEFAKT_NIMBLEFINGERRING, + SPL_HEADACHE = 62, SPL_ENTERASTRAL = 64, SPL_LEAVEASTRAL, SPL_SHOWASTRAL, @@ -136,19 +130,7 @@ enum { SPL_DRAIG_FAMILIAR, SPL_CERDDOR_FAMILIAR, SPL_TYBIED_FAMILIAR, - SPL_SONG_OF_ENSLAVE, - LUASPL_TRUESEEING_GWYRRD, - LUASPL_TRUESEEING_DRAIG, - LUASPL_TRUESEEING_ILLAUN, - LUASPL_TRUESEEING_CERDDOR, - LUASPL_TRUESEEING_TYBIED, - LUASPL_INVISIBILITY_GWYRRD, - LUASPL_INVISIBILITY_DRAIG, - LUASPL_INVISIBILITY_ILLAUN, - LUASPL_INVISIBILITY_CERDDOR, - LUASPL_INVISIBILITY_TYBIED, - LUASPL_ARTEFAKT_CHASTITYBELT, - LUASPL_ARTEFAKT_RUNESWORD, + SPL_SONG_OF_ENSLAVE = 123, SPL_FUMBLECURSE = 136, SPL_ICASTLE, SPL_GWYRRD_DESTROY_MAGIC, @@ -160,15 +142,12 @@ enum { SPL_GWYRRD_FUMBLESHIELD, SPL_CERRDOR_FUMBLESHIELD, SPL_TYBIED_FUMBLESHIELD, - SPL_SHADOWKNIGHTS, - LUASPL_FIRESWORD, - LUASPL_CREATE_TACTICCRYSTAL, + SPL_SHADOWKNIGHTS = 147, SPL_ITEMCLOAK = 150, SPL_FIREWALL, SPL_WISPS, SPL_SPARKLE_CHAOS, - SPL_SPARKLE_DREAM, - LUASPL_BAG_OF_HOLDING, + SPL_SPARKLE_DREAM = 154, SPL_PULLASTRAL = 156, SPL_FETCHASTRAL, SPL_ILLAUN_EARN_SILVER, @@ -177,8 +156,7 @@ enum { SPL_TYBIED_EARN_SILVER, SPL_CERDDOR_EARN_SILVER, SPL_SHOCKWAVE, - SPL_UNDEADHERO, - LUASPL_ARTEFAKT_SACK_OF_CONSERVATION, + SPL_UNDEADHERO = 164, SPL_BECOMEWYRM = 166, SPL_ETERNIZEWALL, SPL_PUTTOREST, @@ -187,11 +165,10 @@ enum { SPL_BLOODSACRIFICE, SPL_MALLORN, SPL_CLONECOPY, - SPL_DRAINODEM, /* 174? */ - SPL_AURA_OF_FEAR, /* 175? */ - SPL_SHADOWCALL, /* 176? */ - SPL_MALLORNTREEGROW, - LUASPL_INVISIBILITY2_ILLAUN, + SPL_DRAINODEM, + SPL_AURA_OF_FEAR, + SPL_SHADOWCALL, + SPL_MALLORNTREEGROW = 177, SPL_BIGRECRUIT = 179, SPL_IMMOLATION, SPL_FIREODEM, /* 181 */ diff --git a/src/common/settings-wdw.h b/src/common/settings-wdw.h index e565631b2..723273714 100644 --- a/src/common/settings-wdw.h +++ b/src/common/settings-wdw.h @@ -54,5 +54,4 @@ #undef ARENA_MODULE #undef WORMHOLE_MODULE #undef XECMD_MODULE -#define WDW_PYRAMIDSPELL #define WDW_PYRAMID diff --git a/src/res/spells.xml b/src/res/spells.xml index 8b43ab3ee..e4d2bf565 100644 --- a/src/res/spells.xml +++ b/src/res/spells.xml @@ -1,21 +1,21 @@ - + - + - + @@ -23,28 +23,28 @@ - + - + - + - + @@ -52,27 +52,27 @@ - + - + - + - + @@ -80,21 +80,21 @@ - + - + - + @@ -102,34 +102,34 @@ - + - + - + - + - + @@ -137,7 +137,7 @@ - + @@ -145,20 +145,20 @@ - + - + - +