X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=6baf82770e762318ffc27b34a126f0fd056b77a4;hb=2d10e898ccd404a69be02f5e93cf97398de99984;hp=7b47f858494ee04365987522d7d4409b1f56dc87;hpb=cec6ebf5e666a15ffe27b0f09f9b268e2cfcdf9b;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 7b47f85..6baf827 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char **argv) {
 		maxim.SetHealth(33);
 		maxim.SetMaxMana(20);
 		maxim.SetMana(20);
-		maxim.SetIP(100);
+		maxim.SetIP(0);
 
 		SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
 		Sprite selanSprite(selanImg, 64, 64);
@@ -107,7 +107,7 @@ int main(int argc, char **argv) {
 		selan.SetHealth(28);
 		selan.SetMaxMana(23);
 		selan.SetMana(23);
-		selan.SetIP(80);
+		selan.SetIP(1);
 
 		SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
 		Sprite guySprite(guyImg, 64, 64);
@@ -119,7 +119,7 @@ int main(int argc, char **argv) {
 		guy.SetHealth(38);
 		guy.SetMaxMana(0);
 		guy.SetMana(0);
-		guy.SetIP(85);
+		guy.SetIP(254);
 
 		SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
 		Sprite dekarSprite(dekarImg, 64, 64);
@@ -131,7 +131,7 @@ int main(int argc, char **argv) {
 		dekar.SetHealth(38);
 		dekar.SetMaxMana(0);
 		dekar.SetMana(0);
-		dekar.SetIP(50);
+		dekar.SetIP(255);
 
 		battle::Resources battleRes;
 
@@ -329,7 +329,7 @@ int main(int argc, char **argv) {
 		zircoSword.SetMenuIcon(&swordIcon);
 		Ikari firestorm;
 		firestorm.SetName("Firestorm");
-		firestorm.SetCost(88);
+		firestorm.SetCost(224);
 		firestorm.GetTargetingMode().TargetAllEnemies();
 		zircoSword.SetIkari(&firestorm);
 		maxim.SetWeapon(&zircoSword);
@@ -338,7 +338,7 @@ int main(int argc, char **argv) {
 		zirconArmor.SetMenuIcon(&armorIcon);
 		Ikari magicCure;
 		magicCure.SetName("Magic cure");
-		magicCure.SetCost(51);
+		magicCure.SetCost(128);
 		magicCure.GetTargetingMode().TargetSingleAlly();
 		zirconArmor.SetIkari(&magicCure);
 		maxim.SetArmor(&zirconArmor);
@@ -347,7 +347,7 @@ int main(int argc, char **argv) {
 		holyShield.SetMenuIcon(&shieldIcon);
 		Ikari lightGuard;
 		lightGuard.SetName("Light guard");
-		lightGuard.SetCost(51);
+		lightGuard.SetCost(128);
 		lightGuard.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
 		holyShield.SetIkari(&lightGuard);
 		maxim.SetShield(&holyShield);
@@ -356,7 +356,7 @@ int main(int argc, char **argv) {
 		legendHelm.SetMenuIcon(&helmetIcon);
 		Ikari boomerang;
 		boomerang.SetName("Boomerang");
-		boomerang.SetCost(65);
+		boomerang.SetCost(164);
 		boomerang.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
 		legendHelm.SetIkari(&boomerang);
 		maxim.SetHelmet(&legendHelm);
@@ -365,7 +365,7 @@ int main(int argc, char **argv) {
 		sProRing.SetMenuIcon(&ringIcon);
 		Ikari courage;
 		courage.SetName("Courage");
-		courage.SetCost(26);
+		courage.SetCost(64);
 		courage.GetTargetingMode().TargetMultipleAllies();
 		sProRing.SetIkari(&courage);
 		maxim.SetRing(&sProRing);
@@ -374,7 +374,7 @@ int main(int argc, char **argv) {
 		evilJewel.SetMenuIcon(&jewelIcon);
 		Ikari gloomy;
 		gloomy.SetName("Gloomy");
-		gloomy.SetCost(65);
+		gloomy.SetCost(164);
 		gloomy.GetTargetingMode().TargetAllEnemies();
 		evilJewel.SetIkari(&gloomy);
 		maxim.SetJewel(&evilJewel);
@@ -382,44 +382,94 @@ int main(int argc, char **argv) {
 		Item zircoWhip;
 		zircoWhip.SetName("Zirco whip");
 		zircoWhip.SetMenuIcon(&rodIcon);
+		Ikari thundershriek;
+		thundershriek.SetName("Thundershriek");
+		thundershriek.SetCost(224);
+		thundershriek.GetTargetingMode().TargetAllEnemies();
+		zircoWhip.SetIkari(&thundershriek);
 		selan.SetWeapon(&zircoWhip);
 		Item zirconPlate;
 		zirconPlate.SetName("Zircon plate");
 		zirconPlate.SetMenuIcon(&armorIcon);
+		Ikari suddenCure;
+		suddenCure.SetName("Sudden cure");
+		suddenCure.SetCost(96);
+		suddenCure.GetTargetingMode().TargetAllAllies();
+		zirconPlate.SetIkari(&suddenCure);
 		selan.SetArmor(&zirconPlate);
 		Item zircoGloves;
 		zircoGloves.SetName("Zirco gloves");
 		zircoGloves.SetMenuIcon(&shieldIcon);
+		Ikari forcefield;
+		forcefield.SetName("Forcefield");
+		forcefield.SetCost(64);
+		forcefield.GetTargetingMode().TargetAllAllies();
+		zircoGloves.SetIkari(&forcefield);
 		selan.SetShield(&zircoGloves);
 		Item holyCap;
 		holyCap.SetName("Holy cap");
 		holyCap.SetMenuIcon(&helmetIcon);
+		Ikari vulnerable;
+		vulnerable.SetName("Vulnerable");
+		vulnerable.SetCost(196);
+		vulnerable.GetTargetingMode().TargetAllEnemies();
+		holyCap.SetIkari(&vulnerable);
 		selan.SetHelmet(&holyCap);
 		Item ghostRing;
 		ghostRing.SetName("Ghost ring");
 		ghostRing.SetMenuIcon(&ringIcon);
+		Ikari destroy;
+		destroy.SetName("Destroy");
+		destroy.SetCost(128);
+		destroy.GetTargetingMode().TargetMultipleEnemies();
+		ghostRing.SetIkari(&destroy);
 		selan.SetRing(&ghostRing);
 		Item eagleRock;
 		eagleRock.SetName("Eagle rock");
 		eagleRock.SetMenuIcon(&jewelIcon);
+		Ikari dive;
+		dive.SetName("Dive");
+		dive.SetCost(128);
+		dive.GetTargetingMode().TargetSingleEnemy();
+		eagleRock.SetIkari(&dive);
 		selan.SetJewel(&eagleRock);
 
 		Item zircoAx;
 		zircoAx.SetName("Zirco ax");
 		zircoAx.SetMenuIcon(&axIcon);
+		Ikari torrent;
+		torrent.SetName("Torrent");
+		torrent.SetCost(224);
+		torrent.GetTargetingMode().TargetAllEnemies();
+		zircoAx.SetIkari(&torrent);
 		guy.SetWeapon(&zircoAx);
 		guy.SetArmor(&zirconArmor);
 		Item megaShield;
 		megaShield.SetName("Mega shield");
 		megaShield.SetMenuIcon(&shieldIcon);
+		Ikari ironBarrier;
+		ironBarrier.SetName("Iron barrier");
+		ironBarrier.SetCost(255);
+		ironBarrier.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
+		megaShield.SetIkari(&ironBarrier);
 		guy.SetShield(&megaShield);
 		Item zircoHelmet;
 		zircoHelmet.SetName("Zirco helmet");
 		zircoHelmet.SetMenuIcon(&helmetIcon);
+		Ikari slow;
+		slow.SetName("Slow");
+		slow.SetCost(196);
+		slow.GetTargetingMode().TargetAllEnemies();
+		zircoHelmet.SetIkari(&slow);
 		guy.SetHelmet(&zircoHelmet);
 		Item powerRing;
 		powerRing.SetName("Power ring");
 		powerRing.SetMenuIcon(&ringIcon);
+		Ikari trick;
+		trick.SetName("Trick");
+		trick.SetCost(32);
+		trick.GetTargetingMode().TargetAllEnemies();
+		zircoHelmet.SetIkari(&trick);
 		guy.SetRing(&powerRing);
 		guy.SetJewel(&evilJewel);
 
@@ -427,30 +477,45 @@ int main(int argc, char **argv) {
 		Item lizardBlow;
 		lizardBlow.SetName("Lizard blow");
 		lizardBlow.SetMenuIcon(&swordIcon);
+		Ikari dragonRush;
+		dragonRush.SetName("Dragon rush");
+		dragonRush.SetCost(164);
+		dragonRush.GetTargetingMode().TargetSingleEnemy();
+		lizardBlow.SetIkari(&dragonRush);
 		dekar.SetWeapon(&lizardBlow);
 		Item holyRobe;
 		holyRobe.SetName("Holy robe");
 		holyRobe.SetMenuIcon(&armorIcon);
+		Ikari crisisCure;
+		crisisCure.SetName("Crisis cure");
+		crisisCure.SetCost(164);
+		crisisCure.GetTargetingMode().TargetAllAllies();
+		holyRobe.SetIkari(&crisisCure);
 		dekar.SetArmor(&holyRobe);
 		dekar.SetShield(&zircoGloves);
 		dekar.SetHelmet(&holyCap);
 		Item rocketRing;
 		rocketRing.SetName("Rocket ring");
 		rocketRing.SetMenuIcon(&ringIcon);
+		Ikari fake;
+		fake.SetName("Fake");
+		fake.SetCost(32);
+		fake.GetTargetingMode().TargetSingleAlly();
+		rocketRing.SetIkari(&fake);
 		dekar.SetRing(&rocketRing);
 		Item krakenRock;
 		krakenRock.SetName("Kraken rock");
 		krakenRock.SetMenuIcon(&jewelIcon);
+		Ikari tenLegger;
+		tenLegger.SetName("Ten-legger");
+		tenLegger.SetCost(164);
+		tenLegger.GetTargetingMode().TargetAllEnemies();
+		rocketRing.SetIkari(&tenLegger);
 		dekar.SetJewel(&krakenRock);
 
 		battleRes.ikariMenuHeadline = "Please choose equipment.";
-		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, &jewelIcon);
+		battleRes.noEquipmentText = "No equip";
+		battleRes.ikariMenuPrototype = Menu<const Item *>(&normalFont, &disabledFont, &handCursorSprite, 12, 6, normalFont.CharHeight() / 2, normalFont.CharWidth(), 1, normalFont.CharWidth() * 2, 0, ':', 12, normalFont.CharWidth());
 
 		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
 		battleState->AddMonster(monster);