X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=7b47f858494ee04365987522d7d4409b1f56dc87;hb=cec6ebf5e666a15ffe27b0f09f9b268e2cfcdf9b;hp=30074366d9c8dbb2fbda12479cd4390859b870b3;hpb=fa3de7178227b9cc7f11c92208b5904cee3ae4c4;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 3007436..7b47f85 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,6 +12,7 @@
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "battle/Resources.h"
+#include "common/Ikari.h"
 #include "common/Inventory.h"
 #include "common/Item.h"
 #include "common/Spell.h"
@@ -36,6 +37,7 @@ using battle::BattleState;
 using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
+using common::Ikari;
 using common::Inventory;
 using common::Item;
 using common::Spell;
@@ -93,7 +95,7 @@ int main(int argc, char **argv) {
 		maxim.SetHealth(33);
 		maxim.SetMaxMana(20);
 		maxim.SetMana(20);
-		maxim.SetIP(0);
+		maxim.SetIP(100);
 
 		SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
 		Sprite selanSprite(selanImg, 64, 64);
@@ -105,7 +107,7 @@ int main(int argc, char **argv) {
 		selan.SetHealth(28);
 		selan.SetMaxMana(23);
 		selan.SetMana(23);
-		selan.SetIP(0);
+		selan.SetIP(80);
 
 		SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
 		Sprite guySprite(guyImg, 64, 64);
@@ -117,7 +119,7 @@ int main(int argc, char **argv) {
 		guy.SetHealth(38);
 		guy.SetMaxMana(0);
 		guy.SetMana(0);
-		guy.SetIP(0);
+		guy.SetIP(85);
 
 		SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
 		Sprite dekarSprite(dekarImg, 64, 64);
@@ -129,7 +131,7 @@ int main(int argc, char **argv) {
 		dekar.SetHealth(38);
 		dekar.SetMaxMana(0);
 		dekar.SetMana(0);
-		dekar.SetIP(0);
+		dekar.SetIP(50);
 
 		battle::Resources battleRes;
 
@@ -267,6 +269,13 @@ int main(int argc, char **argv) {
 		Sprite ringIcon(itemIcons, 16, 16, 0, 160);
 		Sprite jewelIcon(itemIcons, 16, 16, 0, 176);
 
+		battleRes.weaponMenuIcon = &swordIcon;
+		battleRes.armorMenuIcon = &armorIcon;
+		battleRes.shieldMenuIcon = &shieldIcon;
+		battleRes.helmetMenuIcon = &helmetIcon;
+		battleRes.ringMenuIcon = &ringIcon;
+		battleRes.jewelMenuIcon = &jewelIcon;
+
 		Inventory inventory;
 		Item antidote;
 		antidote.SetName("Antidote");
@@ -278,13 +287,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,18 +306,18 @@ 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;
 
@@ -318,26 +327,56 @@ int main(int argc, char **argv) {
 		Item zircoSword;
 		zircoSword.SetName("Zirco sword");
 		zircoSword.SetMenuIcon(&swordIcon);
+		Ikari firestorm;
+		firestorm.SetName("Firestorm");
+		firestorm.SetCost(88);
+		firestorm.GetTargetingMode().TargetAllEnemies();
+		zircoSword.SetIkari(&firestorm);
 		maxim.SetWeapon(&zircoSword);
 		Item zirconArmor;
 		zirconArmor.SetName("Zircon armor");
 		zirconArmor.SetMenuIcon(&armorIcon);
+		Ikari magicCure;
+		magicCure.SetName("Magic cure");
+		magicCure.SetCost(51);
+		magicCure.GetTargetingMode().TargetSingleAlly();
+		zirconArmor.SetIkari(&magicCure);
 		maxim.SetArmor(&zirconArmor);
 		Item holyShield;
 		holyShield.SetName("Holy shield");
 		holyShield.SetMenuIcon(&shieldIcon);
+		Ikari lightGuard;
+		lightGuard.SetName("Light guard");
+		lightGuard.SetCost(51);
+		lightGuard.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
+		holyShield.SetIkari(&lightGuard);
 		maxim.SetShield(&holyShield);
 		Item legendHelm;
 		legendHelm.SetName("Legend helm");
 		legendHelm.SetMenuIcon(&helmetIcon);
+		Ikari boomerang;
+		boomerang.SetName("Boomerang");
+		boomerang.SetCost(65);
+		boomerang.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
+		legendHelm.SetIkari(&boomerang);
 		maxim.SetHelmet(&legendHelm);
 		Item sProRing;
 		sProRing.SetName("S-pro ring");
 		sProRing.SetMenuIcon(&ringIcon);
+		Ikari courage;
+		courage.SetName("Courage");
+		courage.SetCost(26);
+		courage.GetTargetingMode().TargetMultipleAllies();
+		sProRing.SetIkari(&courage);
 		maxim.SetRing(&sProRing);
 		Item evilJewel;
 		evilJewel.SetName("Evil jewel");
 		evilJewel.SetMenuIcon(&jewelIcon);
+		Ikari gloomy;
+		gloomy.SetName("Gloomy");
+		gloomy.SetCost(65);
+		gloomy.GetTargetingMode().TargetAllEnemies();
+		evilJewel.SetIkari(&gloomy);
 		maxim.SetJewel(&evilJewel);
 
 		Item zircoWhip;
@@ -405,7 +444,7 @@ int main(int argc, char **argv) {
 		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);