From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sat, 1 Sep 2012 18:34:07 +0000 (+0200)
Subject: moved Guy's equipment to items.l2s
X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;h=03dabc4ea94ac00e73c4a61260eaeb7f4a0973fe;p=l2e.git

moved Guy's equipment to items.l2s
---

diff --git a/src/main.cpp b/src/main.cpp
index 84fb710..00b04d7 100644
--- 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 ada9165..cc5cf99 100644
--- 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 4db8515..7e08b56 100644
--- 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,