X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=718aabe08498daa1caafb77773d42ac878ac1053;hb=0c01d2b65aaf159bfd9bcf9d3f909a1d2ae5247f;hp=1289bde1fbc7ad38218c8c90b34f32486fd51f81;hpb=b6469d8a22e60335fd8d9304569e648310ddc399;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 1289bde..718aabe 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -265,7 +265,7 @@ int main(int argc, char **argv) {
 		Sprite shieldIcon(itemIcons, 16, 16, 0, 128);
 		Sprite helmetIcon(itemIcons, 16, 16, 0, 144);
 		Sprite ringIcon(itemIcons, 16, 16, 0, 160);
-		Sprite stoneIcon(itemIcons, 16, 16, 0, 176);
+		Sprite jewelIcon(itemIcons, 16, 16, 0, 176);
 
 		Inventory inventory;
 		Item antidote;
@@ -278,13 +278,13 @@ int main(int argc, char **argv) {
 		magicJar.SetName("Magic jar");
 		magicJar.SetMenuIcon(&potionIcon);
 		magicJar.SetUsableInBattle();
-		antidote.GetTargetingMode().TargetSingleAlly();
+		magicJar.GetTargetingMode().TargetSingleAlly();
 		inventory.Add(&magicJar, 4);
 		Item hiPotion;
 		hiPotion.SetName("Hi-Potion");
 		hiPotion.SetMenuIcon(&potionIcon);
 		hiPotion.SetUsableInBattle();
-		antidote.GetTargetingMode().TargetSingleAlly();
+		hiPotion.GetTargetingMode().TargetSingleAlly();
 		inventory.Add(&hiPotion, 4);
 		Item powerPotion;
 		powerPotion.SetName("Power potion");
@@ -297,32 +297,121 @@ int main(int argc, char **argv) {
 		sleepBall.SetName("Sleep ball");
 		sleepBall.SetMenuIcon(&ballIcon);
 		sleepBall.SetUsableInBattle();
-		antidote.GetTargetingMode().TargetSingleEnemy();
+		sleepBall.GetTargetingMode().TargetSingleEnemy();
 		inventory.Add(&sleepBall, 1);
 		Item multiBall;
 		multiBall.SetName("Multi-ball!");
 		multiBall.SetMenuIcon(&ballIcon);
 		multiBall.SetUsableInBattle();
-		antidote.GetTargetingMode().TargetMultipleEnemies();
+		multiBall.GetTargetingMode().TargetMultipleEnemies();
 		inventory.Add(&multiBall, 1);
 		Item figgoru;
 		figgoru.SetName("Figgoru");
 		figgoru.SetMenuIcon(&crankIcon);
-		antidote.GetTargetingMode().TargetAllEnemies();
+		figgoru.GetTargetingMode().TargetAllEnemies();
 		inventory.Add(&figgoru, 1);
 		battleRes.inventory = &inventory;
 
 		battleRes.itemMenuHeadline = "Please choose an item.";
 		battleRes.itemMenuPrototype = Menu<const common::Item *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':');
 
+		Item zircoSword;
+		zircoSword.SetName("Zirco sword");
+		zircoSword.SetMenuIcon(&swordIcon);
+		maxim.SetWeapon(&zircoSword);
+		Item zirconArmor;
+		zirconArmor.SetName("Zircon armor");
+		zirconArmor.SetMenuIcon(&armorIcon);
+		maxim.SetArmor(&zirconArmor);
+		Item holyShield;
+		holyShield.SetName("Holy shield");
+		holyShield.SetMenuIcon(&shieldIcon);
+		maxim.SetShield(&holyShield);
+		Item legendHelm;
+		legendHelm.SetName("Legend helm");
+		legendHelm.SetMenuIcon(&helmetIcon);
+		maxim.SetHelmet(&legendHelm);
+		Item sProRing;
+		sProRing.SetName("S-pro ring");
+		sProRing.SetMenuIcon(&ringIcon);
+		maxim.SetRing(&sProRing);
+		Item evilJewel;
+		evilJewel.SetName("Evil jewel");
+		evilJewel.SetMenuIcon(&jewelIcon);
+		maxim.SetJewel(&evilJewel);
+
+		Item zircoWhip;
+		zircoWhip.SetName("Zirco whip");
+		zircoWhip.SetMenuIcon(&rodIcon);
+		selan.SetWeapon(&zircoWhip);
+		Item zirconPlate;
+		zirconPlate.SetName("Zircon plate");
+		zirconPlate.SetMenuIcon(&armorIcon);
+		selan.SetArmor(&zirconPlate);
+		Item zircoGloves;
+		zircoGloves.SetName("Zirco gloves");
+		zircoGloves.SetMenuIcon(&shieldIcon);
+		selan.SetShield(&zircoGloves);
+		Item holyCap;
+		holyCap.SetName("Holy cap");
+		holyCap.SetMenuIcon(&helmetIcon);
+		selan.SetHelmet(&holyCap);
+		Item ghostRing;
+		ghostRing.SetName("Ghost ring");
+		ghostRing.SetMenuIcon(&ringIcon);
+		selan.SetRing(&ghostRing);
+		Item eagleRock;
+		eagleRock.SetName("Eagle rock");
+		eagleRock.SetMenuIcon(&jewelIcon);
+		selan.SetJewel(&eagleRock);
+
+		Item zircoAx;
+		zircoAx.SetName("Zirco ax");
+		zircoAx.SetMenuIcon(&axIcon);
+		guy.SetWeapon(&zircoAx);
+		guy.SetArmor(&zirconArmor);
+		Item megaShield;
+		megaShield.SetName("Mega shield");
+		megaShield.SetMenuIcon(&shieldIcon);
+		guy.SetShield(&megaShield);
+		Item zircoHelmet;
+		zircoHelmet.SetName("Zirco helmet");
+		zircoHelmet.SetMenuIcon(&helmetIcon);
+		guy.SetHelmet(&zircoHelmet);
+		Item powerRing;
+		powerRing.SetName("Power ring");
+		powerRing.SetMenuIcon(&ringIcon);
+		guy.SetRing(&powerRing);
+		guy.SetJewel(&evilJewel);
+
+		// NOTE: this is actually Artea equipment
+		Item lizardBlow;
+		lizardBlow.SetName("Lizard blow");
+		lizardBlow.SetMenuIcon(&swordIcon);
+		dekar.SetWeapon(&lizardBlow);
+		Item holyRobe;
+		holyRobe.SetName("Holy robe");
+		holyRobe.SetMenuIcon(&armorIcon);
+		dekar.SetArmor(&holyRobe);
+		dekar.SetShield(&zircoGloves);
+		dekar.SetHelmet(&holyCap);
+		Item rocketRing;
+		rocketRing.SetName("Rocket ring");
+		rocketRing.SetMenuIcon(&ringIcon);
+		dekar.SetRing(&rocketRing);
+		Item krakenRock;
+		krakenRock.SetName("Kraken rock");
+		krakenRock.SetMenuIcon(&jewelIcon);
+		dekar.SetJewel(&krakenRock);
+
 		battleRes.ikariMenuHeadline = "Please choose equipment.";
-		battleRes.ikariMenuPrototype = Menu</* Item */ void *>(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32);
+		battleRes.ikariMenuPrototype = Menu<const Item *>(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32);
 		battleRes.ikariMenuPrototype.Add("Zirco whip   Thundershriek", 0, false, &swordIcon);
 		battleRes.ikariMenuPrototype.Add("Zircon plate Sudden cure", 0, true, &armorIcon);
 		battleRes.ikariMenuPrototype.Add("Zirco gloves Forcefield", 0, true, &shieldIcon);
 		battleRes.ikariMenuPrototype.Add("Holy cap     Vulnerable", 0, false, &helmetIcon);
 		battleRes.ikariMenuPrototype.Add("Ghost ring   Destroy", 0, true, &ringIcon);
-		battleRes.ikariMenuPrototype.Add("Eagle rock   Dive", 0, true, &stoneIcon);
+		battleRes.ikariMenuPrototype.Add("Eagle rock   Dive", 0, true, &jewelIcon);
 
 		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
 		battleState->AddMonster(monster);