X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=00b04d7dfe60750d247036709a7226d4ef0f0ef4;hb=03dabc4ea94ac00e73c4a61260eaeb7f4a0973fe;hp=00c07c592d6d311b5baae18719bffab1d4d50ff5;hpb=771a3daeecf527a9b5873e412e263ad251c59ab5;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 00c07c5..00b04d7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -191,152 +191,24 @@ int main(int argc, char **argv) {
 
 		maxim.SetWeapon(intp.GetItem("zircoSwordItem"));
 		maxim.SetArmor(intp.GetItem("zirconArmorItem"));
-		Item holyShield;
-		holyShield.SetName("Holy shield");
-		holyShield.SetMenuIcon(intp.GetSprite("shieldIcon"));
-		Ikari lightGuard;
-		lightGuard.SetName("Light guard");
-		lightGuard.SetCost(128);
-		lightGuard.GetTargetingMode().TargetAllAllies(); // actually only targets self
-		lightGuard.SetMagical();
-		holyShield.SetIkari(&lightGuard);
-		maxim.SetShield(&holyShield);
-		Item legendHelm;
-		legendHelm.SetName("Legend helm");
-		legendHelm.SetMenuIcon(intp.GetSprite("helmetIcon"));
-		Ikari boomerang;
-		boomerang.SetName("Boomerang");
-		boomerang.SetCost(164);
-		boomerang.GetTargetingMode().TargetAllAllies(); // actually only targets self
-		boomerang.SetMagical();
-		legendHelm.SetIkari(&boomerang);
-		maxim.SetHelmet(&legendHelm);
-		Item sProRing;
-		sProRing.SetName("S-pro ring");
-		sProRing.SetMenuIcon(intp.GetSprite("ringIcon"));
-		Ikari courage;
-		courage.SetName("Courage");
-		courage.SetCost(64);
-		courage.GetTargetingMode().TargetMultipleAllies();
-		courage.SetMagical();
-		sProRing.SetIkari(&courage);
-		maxim.SetRing(&sProRing);
-		Item evilJewel;
-		evilJewel.SetName("Evil jewel");
-		evilJewel.SetMenuIcon(intp.GetSprite("jewelIcon"));
-		Ikari gloomy;
-		gloomy.SetName("Gloomy");
-		gloomy.SetCost(164);
-		gloomy.GetTargetingMode().TargetAllEnemies();
-		gloomy.SetMagical();
-		evilJewel.SetIkari(&gloomy);
-		maxim.SetJewel(&evilJewel);
-
-		Item zircoWhip;
-		zircoWhip.SetName("Zirco whip");
-		zircoWhip.SetMenuIcon(intp.GetSprite("rodIcon"));
-		zircoWhip.GetTargetingMode().TargetSingleEnemy();
-		Ikari thundershriek;
-		thundershriek.SetName("Thundershriek");
-		thundershriek.SetCost(224);
-		thundershriek.GetTargetingMode().TargetAllEnemies();
-		thundershriek.SetPhysical();
-		zircoWhip.SetIkari(&thundershriek);
-//		selan.SetWeapon(&zircoWhip);
-		Item zirconPlate;
-		zirconPlate.SetName("Zircon plate");
-		zirconPlate.SetMenuIcon(intp.GetSprite("armorIcon"));
-		Ikari suddenCure;
-		suddenCure.SetName("Sudden cure");
-		suddenCure.SetCost(96);
-		suddenCure.GetTargetingMode().TargetAllAllies();
-		suddenCure.SetMagical();
-		zirconPlate.SetIkari(&suddenCure);
-		selan.SetArmor(&zirconPlate);
-		Item zircoGloves;
-		zircoGloves.SetName("Zirco gloves");
-		zircoGloves.SetMenuIcon(intp.GetSprite("shieldIcon"));
-		Ikari forcefield;
-		forcefield.SetName("Forcefield");
-		forcefield.SetCost(64);
-		forcefield.GetTargetingMode().TargetAllAllies();
-		forcefield.SetMagical();
-		zircoGloves.SetIkari(&forcefield);
-		selan.SetShield(&zircoGloves);
-		Item holyCap;
-		holyCap.SetName("Holy cap");
-		holyCap.SetMenuIcon(intp.GetSprite("helmetIcon"));
-		Ikari vulnerable;
-		vulnerable.SetName("Vulnerable");
-		vulnerable.SetCost(196);
-		vulnerable.GetTargetingMode().TargetAllEnemies();
-		vulnerable.SetPhysical();
-		holyCap.SetIkari(&vulnerable);
-		selan.SetHelmet(&holyCap);
-		Item ghostRing;
-		ghostRing.SetName("Ghost ring");
-		ghostRing.SetMenuIcon(intp.GetSprite("ringIcon"));
-		Ikari destroy;
-		destroy.SetName("Destroy");
-		destroy.SetCost(128);
-		destroy.GetTargetingMode().TargetMultipleEnemies();
-		destroy.SetMagical();
-		ghostRing.SetIkari(&destroy);
-		selan.SetRing(&ghostRing);
-		Item eagleRock;
-		eagleRock.SetName("Eagle rock");
-		eagleRock.SetMenuIcon(intp.GetSprite("jewelIcon"));
-		Ikari dive;
-		dive.SetName("Dive");
-		dive.SetCost(128);
-		dive.GetTargetingMode().TargetSingleEnemy();
-		dive.SetPhysical();
-		eagleRock.SetIkari(&dive);
-		selan.SetJewel(&eagleRock);
-
-		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);
+		maxim.SetShield(intp.GetItem("holyShieldItem"));
+		maxim.SetHelmet(intp.GetItem("legendHelmItem"));
+		maxim.SetRing(intp.GetItem("sProRingItem"));
+		maxim.SetJewel(intp.GetItem("evilJewelItem"));
+
+//		selan.SetWeapon(intp.GetItem("zircoWhipItem"));
+		selan.SetArmor(intp.GetItem("zirconPlateItem"));
+		selan.SetShield(intp.GetItem("zircoGlovesItem"));
+		selan.SetHelmet(intp.GetItem("holyCapItem"));
+		selan.SetRing(intp.GetItem("ghostRingItem"));
+		selan.SetJewel(intp.GetItem("eagleRockItem"));
+
+//		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.SetJewel(&evilJewel);
+		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
 		Item lizardBlow;
@@ -360,8 +232,8 @@ int main(int argc, char **argv) {
 		crisisCure.SetMagical();
 		holyRobe.SetIkari(&crisisCure);
 		dekar.SetArmor(&holyRobe);
-		dekar.SetShield(&zircoGloves);
-		dekar.SetHelmet(&holyCap);
+		dekar.SetShield(intp.GetItem("zircoGlovesItem"));
+		dekar.SetHelmet(intp.GetItem("holyCapItem"));
 		Item rocketRing;
 		rocketRing.SetName("Rocket ring");
 		rocketRing.SetMenuIcon(intp.GetSprite("ringIcon"));