moved Guy's equipment to items.l2s

diff --git a/src/main.cpp b/src/main.cpp
index 84fb710ee07e2e350e2f7ea3f71b6e3cbfe73d0c..00b04d7dfe60750d247036709a7226d4ef0f0ef4 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -203,48 +203,11 @@ int main(int argc, char **argv) {
                selan.SetRing(intp.GetItem("ghostRingItem"));
                selan.SetJewel(intp.GetItem("eagleRockItem"));
 
-               Item zircoAx;
-               zircoAx.SetName("Zirco ax");
-               zircoAx.SetMenuIcon(intp.GetSprite("axIcon"));
-               zircoAx.GetTargetingMode().TargetSingleEnemy();
-               Ikari torrent;
-               torrent.SetName("Torrent");
-               torrent.SetCost(224);
-               torrent.GetTargetingMode().TargetAllEnemies();
-               torrent.SetPhysical();
-               zircoAx.SetIkari(&torrent);
-//             guy.SetWeapon(&zircoAx);
+//             guy.SetWeapon(intp.GetItem("zircoAxItem"));
                guy.SetArmor(intp.GetItem("zirconArmorItem"));
-               Item megaShield;
-               megaShield.SetName("Mega shield");
-               megaShield.SetMenuIcon(intp.GetSprite("shieldIcon"));
-               Ikari ironBarrier;
-               ironBarrier.SetName("Iron barrier");
-               ironBarrier.SetCost(255);
-               ironBarrier.GetTargetingMode().TargetAllAllies(); // actually only targets self
-               ironBarrier.SetMagical();
-               megaShield.SetIkari(&ironBarrier);
-               guy.SetShield(&megaShield);
-               Item zircoHelmet;
-               zircoHelmet.SetName("Zirco helmet");
-               zircoHelmet.SetMenuIcon(intp.GetSprite("helmetIcon"));
-               Ikari slow;
-               slow.SetName("Slow");
-               slow.SetCost(196);
-               slow.GetTargetingMode().TargetAllEnemies();
-               slow.SetPhysical();
-               zircoHelmet.SetIkari(&slow);
-               guy.SetHelmet(&zircoHelmet);
-               Item powerRing;
-               powerRing.SetName("Power ring");
-               powerRing.SetMenuIcon(intp.GetSprite("ringIcon"));
-               Ikari trick;
-               trick.SetName("Trick");
-               trick.SetCost(32);
-               trick.GetTargetingMode().TargetAllEnemies();
-               trick.SetMagical();
-               zircoHelmet.SetIkari(&trick);
-               guy.SetRing(&powerRing);
+               guy.SetShield(intp.GetItem("megaShieldItem"));
+               guy.SetHelmet(intp.GetItem("zircoHelmetItem"));
+               guy.SetRing(intp.GetItem("powerRingItem"));
                guy.SetJewel(intp.GetItem("evilJewelItem"));
 
                // NOTE: this is actually Artea equipment

diff --git a/test-data/ikaris.l2s b/test-data/ikaris.l2s
index ada91651486e24923f4701b706a9d33407c5a569..cc5cf99da38171f7aad992f97a8ea5702f4e4d4d 100644 (file)
--- a/test-data/ikaris.l2s
+++ b/test-data/ikaris.l2s
@@ -61,6 +61,15 @@ export Ikari gloomyIkari {
        },
        magical: true
 }
+export Ikari ironBarrierIkari {
+       name: "Iron barrier",
+       cost: 255,
+       targets: TargetingMode {
+               ally: true,
+               all: true
+       },
+       magical: true
+}
 export Ikari lightGuardIkari {
        name: "Light guard",
        cost: 128,
@@ -79,6 +88,15 @@ export Ikari magicCureIkari {
        },
        magical: true
 }
+export Ikari slowIkari {
+       name: "Slow",
+       cost: 196,
+       targets: TargetingMode {
+               enemy: true,
+               all: true
+       },
+       physical: true
+}
 export Ikari suddenCureIkari {
        name: "Sudden cure",
        cost: 96,
@@ -97,6 +115,24 @@ export Ikari thundershriekIkari {
        },
        physical: true
 }
+export Ikari torrentIkari {
+       name: "Torrent",
+       cost: 224,
+       targets: TargetingMode {
+               enemy: true,
+               all: true
+       },
+       physical: true
+}
+export Ikari trickIkari {
+       name: "Trick",
+       cost: 32,
+       targets: TargetingMode {
+               enemy: true,
+               all: true
+       },
+       magical: true
+}
 export Ikari vulnerableIkari {
        name: "Vulnerable",
        cost: 196,

diff --git a/test-data/items.l2s b/test-data/items.l2s
index 4db851573621694a3932ef73ae900a072ea43923..7e08b563643efc5b1b463af9803e3b266fefa66d 100644 (file)
--- a/test-data/items.l2s
+++ b/test-data/items.l2s
@@ -129,11 +129,21 @@ export Item legendHelmItem {
        menuicon: helmetIcon,
        ikari: boomerangIkari
 }
+export Item megaShieldItem {
+       name: "Mega shield",
+       menuicon: shieldIcon,
+       ikari: ironBarrierIkari
+}
 export Item powerPotionItem {
        name: "Power potion",
        menuicon: potionIcon,
        battle: false
 }
+export Item powerRingItem {
+       name: "Power ring",
+       menuicon: ringIcon,
+       ikari: trickIkari
+}
 export Item sleepBallItem {
        name: "Sleep ball",
        menuicon: ballIcon,
@@ -148,11 +158,21 @@ export Item sProRingItem {
        menuicon: ringIcon,
        ikari: courageIkari
 }
+export Item zircoAxItem {
+       name: "Zirco ax",
+       menuicon: axIcon,
+       ikari: torrentIkari
+}
 export Item zircoGlovesItem {
        name: "Zirco gloves",
        menuicon: shieldIcon,
        ikari: forcefieldIkari
 }
+export Item zircoHerlmetItem {
+       name: "Zirco helmet",
+       menuicon: helmetIcon,
+       ikari: slowIkari
+}
 export Item zirconArmorItem {
        name: "Zircon armor",
        menuicon: armorIcon,