moved Guy's and Dekar's (well, Artea's) equipment to items.l2s

diff --git a/src/main.cpp b/src/main.cpp
index 00b04d7dfe60750d247036709a7226d4ef0f0ef4..662e5b901974b2995720f27cfca4b4e2acb7d61f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -211,49 +211,12 @@ int main(int argc, char **argv) {
                guy.SetJewel(intp.GetItem("evilJewelItem"));
 
                // NOTE: this is actually Artea equipment
-               Item lizardBlow;
-               lizardBlow.SetName("Lizard blow");
-               lizardBlow.SetMenuIcon(intp.GetSprite("swordIcon"));
-               lizardBlow.GetTargetingMode().TargetSingleEnemy();
-               Ikari dragonRush;
-               dragonRush.SetName("Dragon rush");
-               dragonRush.SetCost(164);
-               dragonRush.GetTargetingMode().TargetSingleEnemy();
-               dragonRush.SetPhysical();
-               lizardBlow.SetIkari(&dragonRush);
-//             dekar.SetWeapon(&lizardBlow);
-               Item holyRobe;
-               holyRobe.SetName("Holy robe");
-               holyRobe.SetMenuIcon(intp.GetSprite("armorIcon"));
-               Ikari crisisCure;
-               crisisCure.SetName("Crisis cure");
-               crisisCure.SetCost(164);
-               crisisCure.GetTargetingMode().TargetAllAllies();
-               crisisCure.SetMagical();
-               holyRobe.SetIkari(&crisisCure);
-               dekar.SetArmor(&holyRobe);
+//             dekar.SetWeapon(intp.GetItem("lizardBlowItem"));
+               dekar.SetArmor(intp.GetItem("holyRobeItem"));
                dekar.SetShield(intp.GetItem("zircoGlovesItem"));
                dekar.SetHelmet(intp.GetItem("holyCapItem"));
-               Item rocketRing;
-               rocketRing.SetName("Rocket ring");
-               rocketRing.SetMenuIcon(intp.GetSprite("ringIcon"));
-               Ikari fake;
-               fake.SetName("Fake");
-               fake.SetCost(32);
-               fake.GetTargetingMode().TargetSingleAlly();
-               fake.SetMagical();
-               rocketRing.SetIkari(&fake);
-               dekar.SetRing(&rocketRing);
-               Item krakenRock;
-               krakenRock.SetName("Kraken rock");
-               krakenRock.SetMenuIcon(intp.GetSprite("jewelIcon"));
-               Ikari tenLegger;
-               tenLegger.SetName("Ten-legger");
-               tenLegger.SetCost(164);
-               tenLegger.GetTargetingMode().TargetAllEnemies();
-               tenLegger.SetPhysical();
-               rocketRing.SetIkari(&tenLegger);
-               dekar.SetJewel(&krakenRock);
+               dekar.SetRing(intp.GetItem("rocketRingItem"));
+               dekar.SetJewel(intp.GetItem("krakenRockItem"));
 
                battleRes.ikariMenuHeadline = "Please choose equipment.";
                battleRes.noEquipmentText = "No equip";

diff --git a/test-data/ikaris.l2s b/test-data/ikaris.l2s
index cc5cf99da38171f7aad992f97a8ea5702f4e4d4d..e76414da35a1eb97086c7e69fdb66ad10ad5863c 100644 (file)
--- a/test-data/ikaris.l2s
+++ b/test-data/ikaris.l2s
@@ -16,6 +16,15 @@ export Ikari courageIkari {
        },
        magical: true
 }
+export Ikari crisisCureIkari {
+       name: "Crisis cure",
+       cost: 164,
+       targets: TargetingMode {
+               ally: true,
+               all: true
+       },
+       magical: true
+}
 export Ikari destroyIkari {
        name: "Destroy",
        cost: 128,
@@ -34,6 +43,24 @@ export Ikari diveIkari {
        },
        physical: true
 }
+export Ikari dragonRushIkari {
+       name: "Dragon rush",
+       cost: 164,
+       targets: TargetingMode {
+               enemy: true,
+               single: true
+       },
+       physical: true
+}
+export Ikari fakeIkari {
+       name: "Fake",
+       cost: 32,
+       targets: TargetingMode {
+               ally: true,
+               single: true
+       },
+       magical: true
+}
 export Ikari firestormIkari {
        name: "Firestorm",
        cost: 224,
@@ -106,6 +133,15 @@ export Ikari suddenCureIkari {
        },
        magical: true
 }
+export Ikari tenLeggerIkari {
+       name: "Ten-legger",
+       cost: 164,
+       targets: TargetingMode {
+               enemy: true,
+               all: true
+       },
+       physical: true
+}
 export Ikari thundershriekIkari {
        name: "Thundershriek",
        cost: 224,

diff --git a/test-data/items.l2s b/test-data/items.l2s
index 7e08b563643efc5b1b463af9803e3b266fefa66d..e3eadbfaacff1da4fc15ed3b64656ae605761736 100644 (file)
--- a/test-data/items.l2s
+++ b/test-data/items.l2s
@@ -110,11 +110,35 @@ export Item holyCapItem {
        menuicon: helmetIcon,
        ikari: vulnerableIkari
 }
+export Item holyRobeItem {
+       name: "Holy robe",
+       menuicon: armorIcon,
+       ikari: crisisCureIkari
+}
 export Item holyShieldItem {
        name: "Holy shield",
        menuicon: shieldIcon,
        ikari: lightGuardIkari
 }
+export Item krakenRockItem {
+       name: "Kraken rock",
+       menuicon: jewelIcon,
+       ikari: tenLeggerIkari
+}
+export Item legendHelmItem {
+       name: "Legend helm",
+       menuicon: helmetIcon,
+       ikari: boomerangIkari
+}
+export Item lizardBlowItem {
+       name: "Lizard blow",
+       menuicon: swordIcon,
+       ikari: dragonRushIkari,
+       targets: TargetingMode {
+               enemy: true,
+               single: true
+       }
+}
 export Item magicJarItem {
        name: "Magic jar",
        menuicon: potionIcon,
@@ -124,11 +148,6 @@ export Item magicJarItem {
                single: true
        }
 }
-export Item legendHelmItem {
-       name: "Legend helm",
-       menuicon: helmetIcon,
-       ikari: boomerangIkari
-}
 export Item megaShieldItem {
        name: "Mega shield",
        menuicon: shieldIcon,
@@ -144,6 +163,11 @@ export Item powerRingItem {
        menuicon: ringIcon,
        ikari: trickIkari
 }
+export Item rocketRingItem {
+       name: "Rocket ring",
+       menuicon: ringIcon,
+       ikari: fakeIkari
+}
 export Item sleepBallItem {
        name: "Sleep ball",
        menuicon: ballIcon,
@@ -161,14 +185,18 @@ export Item sProRingItem {
 export Item zircoAxItem {
        name: "Zirco ax",
        menuicon: axIcon,
-       ikari: torrentIkari
+       ikari: torrentIkari,
+       targets: TargetingMode {
+               enemy: true,
+               single: true
+       }
 }
 export Item zircoGlovesItem {
        name: "Zirco gloves",
        menuicon: shieldIcon,
        ikari: forcefieldIkari
 }
-export Item zircoHerlmetItem {
+export Item zircoHelmetItem {
        name: "Zirco helmet",
        menuicon: helmetIcon,
        ikari: slowIkari