X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=00c07c592d6d311b5baae18719bffab1d4d50ff5;hb=771a3daeecf527a9b5873e412e263ad251c59ab5;hp=30074366d9c8dbb2fbda12479cd4390859b870b3;hpb=fa3de7178227b9cc7f11c92208b5904cee3ae4c4;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 3007436..00c07c5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,19 +12,28 @@
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "battle/Resources.h"
+#include "battle/Stats.h"
+#include "common/Ikari.h"
 #include "common/Inventory.h"
 #include "common/Item.h"
 #include "common/Spell.h"
-#include "geometry/Point.h"
+#include "geometry/Vector.h"
+#include "graphics/ComplexAnimation.h"
 #include "graphics/Font.h"
 #include "graphics/Frame.h"
 #include "graphics/Gauge.h"
 #include "graphics/Menu.h"
+#include "graphics/SimpleAnimation.h"
 #include "graphics/Sprite.h"
+#include "loader/Interpreter.h"
+#include "loader/ParsedSource.h"
+#include "loader/Parser.h"
 #include "sdl/InitImage.h"
 #include "sdl/InitScreen.h"
 #include "sdl/InitSDL.h"
 
+#include <cstdlib>
+#include <ctime>
 #include <exception>
 #include <iostream>
 #include <SDL.h>
@@ -36,15 +45,22 @@ using battle::BattleState;
 using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
+using battle::Stats;
+using common::Ikari;
 using common::Inventory;
 using common::Item;
 using common::Spell;
-using geometry::Point;
+using geometry::Vector;
+using graphics::ComplexAnimation;
 using graphics::Font;
 using graphics::Frame;
 using graphics::Gauge;
 using graphics::Menu;
+using graphics::SimpleAnimation;
 using graphics::Sprite;
+using loader::Interpreter;
+using loader::ParsedSource;
+using loader::Parser;
 using sdl::InitImage;
 using sdl::InitScreen;
 using sdl::InitSDL;
@@ -58,360 +74,320 @@ int main(int argc, char **argv) {
 	const int width = 800;
 	const int height = 480;
 
+	const int framerate = 33;
+
+//	std::srand(std::time(0));
+
 	try {
 		InitSDL sdl;
 		InitImage image(IMG_INIT_PNG);
+
+		ParsedSource source;
+		Parser parser("test-data/test.l2s", source);
+		parser.Parse();
+		Interpreter intp(source);
+		intp.ReadSource();
+
 		InitScreen screen(width, height);
 
 		// temporary test data
 		SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
-		PartyLayout monstersLayout;
-		monstersLayout.AddPosition(Point<Uint8>(88, 104));
-		monstersLayout.AddPosition(Point<Uint8>(128, 104));
-		monstersLayout.AddPosition(Point<Uint8>(168, 104));
-		monstersLayout.AddPosition(Point<Uint8>(208, 104));
-		PartyLayout heroesLayout;
-		heroesLayout.AddPosition(Point<Uint8>(27, 219));
-		heroesLayout.AddPosition(Point<Uint8>(104, 227));
-		heroesLayout.AddPosition(Point<Uint8>(66, 238));
-		heroesLayout.AddPosition(Point<Uint8>(143, 246));
-
-		SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
-		Sprite dummySprite(monsterImg, 64, 64);
-		Monster monster;
-		monster.SetSprite(&dummySprite);
-		monster.SetMaxHealth(10);
-		monster.SetHealth(10);
-
-		SDL_Surface *maximImg(IMG_Load("test-data/maxim.png"));
-		Sprite maximSprite(maximImg, 64, 64);
-		Hero maxim;
-		maxim.SetName("Maxim");
-		maxim.SetLevel(1);
-		maxim.SetSprite(&maximSprite);
-		maxim.SetMaxHealth(33);
-		maxim.SetHealth(33);
-		maxim.SetMaxMana(20);
-		maxim.SetMana(20);
-		maxim.SetIP(0);
-
-		SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
-		Sprite selanSprite(selanImg, 64, 64);
-		Hero selan;
-		selan.SetName("Selan");
-		selan.SetLevel(1);
-		selan.SetSprite(&selanSprite);
-		selan.SetMaxHealth(28);
-		selan.SetHealth(28);
-		selan.SetMaxMana(23);
-		selan.SetMana(23);
-		selan.SetIP(0);
-
-		SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
-		Sprite guySprite(guyImg, 64, 64);
-		Hero guy;
-		guy.SetName("Guy");
-		guy.SetLevel(1);
-		guy.SetSprite(&guySprite);
-		guy.SetMaxHealth(38);
-		guy.SetHealth(38);
-		guy.SetMaxMana(0);
-		guy.SetMana(0);
-		guy.SetIP(0);
-
-		SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
-		Sprite dekarSprite(dekarImg, 64, 64);
-		Hero dekar;
-		dekar.SetName("Dekar");
-		dekar.SetLevel(1);
-		dekar.SetSprite(&dekarSprite);
-		dekar.SetMaxHealth(38);
-		dekar.SetHealth(38);
-		dekar.SetMaxMana(0);
-		dekar.SetMana(0);
-		dekar.SetIP(0);
+		PartyLayout monstersLayout(*intp.GetPartyLayout("monstersLayout"));
+		PartyLayout heroesLayout(*intp.GetPartyLayout("heroesLayout"));
+
+		Monster monster(*intp.GetMonster("lizard"));
+		Hero maxim(*intp.GetHero("maxim"));
+		Hero selan(*intp.GetHero("selan"));
+		Hero guy(*intp.GetHero("guy"));
+		Hero dekar(*intp.GetHero("dekar"));
 
 		battle::Resources battleRes;
 
-		SDL_Surface *attackIconsImg(IMG_Load("test-data/attack-type-icons.png"));
-		Sprite attackIconsSprite(attackIconsImg, 32, 32);
-		battleRes.attackIcons = &attackIconsSprite;
-		SDL_Surface *attackChoiceIconsImg(IMG_Load("test-data/attack-choice-icons.png"));
-		Sprite attackChoiceIconsSprite(attackChoiceIconsImg, 16, 16);
-		battleRes.attackChoiceIcons = &attackChoiceIconsSprite;
-		SDL_Surface *moveIconsImg(IMG_Load("test-data/move-icons.png"));
-		Sprite moveIconsSprite(moveIconsImg, 32, 32);
-		battleRes.moveIcons = &moveIconsSprite;
-		SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png"));
-		Sprite heroTagSprite(heroTagImg, 32, 16);
-		battleRes.heroTagLabels = &heroTagSprite;
-		SDL_Surface *numbersImg(IMG_Load("test-data/numbers.png"));
-		Sprite numbersSprite(numbersImg, 16, 16);
-		Font heroTagFont(&numbersSprite);
-		battleRes.heroTagFont = &heroTagFont;
-		SDL_Surface *tagFramesImg(IMG_Load("test-data/tag-frames.png"));
-		Frame heroTagFrame(tagFramesImg, 16, 16, 1, 1, 0, 33);
-		battleRes.heroTagFrame = &heroTagFrame;
-		Frame activeHeroTagFrame(tagFramesImg, 16, 16);
-		battleRes.activeHeroTagFrame = &activeHeroTagFrame;
-
-		SDL_Surface *gauges(IMG_Load("test-data/gauges.png"));
-		Gauge healthGauge(gauges, 0, 16, 0, 0, 16, 6, 1, 6);
-		battleRes.healthGauge = &healthGauge;
-		Gauge manaGauge(gauges, 0, 32, 0, 0, 16, 6, 1, 6);
-		battleRes.manaGauge = &manaGauge;
-		Gauge ikariGauge(gauges, 0, 48, 0, 0, 16, 6, 1, 6);
-		battleRes.ikariGauge = &ikariGauge;
-
-		SDL_Surface *selectFrameImg(IMG_Load("test-data/select-frame.png"));
-		Frame selectFrame(selectFrameImg, 16, 16);
-		battleRes.selectFrame = &selectFrame;
-
-		SDL_Surface *normalFontImg(IMG_Load("test-data/normal-font.png"));
-		Sprite normalFontSprite(normalFontImg, 16, 16);
-		Font normalFont(&normalFontSprite);
-		normalFont.MapRange('A', 'M', 0, 1);
-		normalFont.MapRange('N', 'Z', 0, 2);
-		normalFont.MapRange('a', 'm', 0, 3);
-		normalFont.MapRange('n', 'z', 0, 4);
-		normalFont.MapChar(':', 10, 0);
-		normalFont.MapChar('!', 11, 0);
-		normalFont.MapChar('?', 12, 0);
-		// TODO: add '.' and '-' characters
-		battleRes.normalFont = &normalFont;
-
-		SDL_Surface *disabledFontImg(IMG_Load("test-data/disabled-font.png"));
-		Sprite disabledFontSprite(disabledFontImg, 16, 16);
-		Font disabledFont(&disabledFontSprite);
-		disabledFont.MapRange('A', 'M', 0, 1);
-		disabledFont.MapRange('N', 'Z', 0, 2);
-		disabledFont.MapRange('a', 'm', 0, 3);
-		disabledFont.MapRange('n', 'z', 0, 4);
-		disabledFont.MapChar(':', 10, 0);
-		disabledFont.MapChar('!', 11, 0);
-		disabledFont.MapChar('?', 12, 0);
-		// TODO: add '.' and '-' characters
-		battleRes.disabledFont = &disabledFont;
-
-		SDL_Surface *handCursorImg(IMG_Load("test-data/cursor-hand.png"));
-		Sprite handCursorSprite(handCursorImg, 32, 32);
-		battleRes.menuCursor = &handCursorSprite;
-
-		SDL_Surface *targetingIconsImg(IMG_Load("test-data/targeting-icons.png"));
-		Sprite weaponTargetCursor(targetingIconsImg, 32, 32);
-		Sprite magicTargetCursor(targetingIconsImg, 32, 32, 0, 32);
-		Sprite itemTargetCursor(targetingIconsImg, 32, 32, 0, 64);
-		battleRes.weaponTargetCursor = &weaponTargetCursor;
-		// TODO: add image for magic targeting cursor
-		battleRes.magicTargetCursor = &magicTargetCursor;
-		// TODO: add image for item targeting cursor
-		battleRes.itemTargetCursor = &itemTargetCursor;
-
-		Spell resetSpell;
-		resetSpell.SetName("Reset");
-		maxim.AddSpell(&resetSpell);
-		Spell strongSpell;
-		strongSpell.SetName("Strong");
-		strongSpell.SetCost(3);
-		strongSpell.SetUsableInBattle();
-		strongSpell.GetTargetingMode().TargetMultipleAllies();
-		maxim.AddSpell(&strongSpell);
-		selan.AddSpell(&strongSpell);
-		Spell strongerSpell;
-		strongerSpell.SetName("Stronger");
-		strongerSpell.SetCost(8);
-		strongerSpell.SetUsableInBattle();
-		strongerSpell.GetTargetingMode().TargetMultipleAllies();
-		maxim.AddSpell(&strongerSpell);
-		selan.AddSpell(&strongerSpell);
-		Spell championSpell;
-		championSpell.SetName("Champion");
-		championSpell.SetCost(16);
-		championSpell.SetUsableInBattle();
-		championSpell.GetTargetingMode().TargetMultipleAllies();
-		maxim.AddSpell(&championSpell);
-		selan.AddSpell(&championSpell);
-		Spell rallySpell;
-		rallySpell.SetName("Rally");
-		rallySpell.SetCost(10);
-		rallySpell.SetUsableInBattle();
-		rallySpell.GetTargetingMode().TargetMultipleAllies();
-		maxim.AddSpell(&rallySpell);
-		selan.AddSpell(&rallySpell);
-		Spell escapeSpell;
-		escapeSpell.SetName("Escape");
-		escapeSpell.SetCost(8);
-		selan.AddSpell(&escapeSpell);
-		Spell valorSpell;
-		valorSpell.SetName("Valor");
-		valorSpell.SetCost(30);
-		valorSpell.SetUsableInBattle();
-		valorSpell.GetTargetingMode().TargetMultipleAllies();
-		maxim.AddSpell(&valorSpell);
-		selan.AddSpell(&valorSpell);
-
-		battleRes.spellMenuHeadline = "Please choose a spell.";
-		battleRes.spellMenuPrototype = Menu<const Spell *>(&normalFont, &disabledFont, &handCursorSprite, 9, 6, 8, 0, 2, 32, 2, ':');
-
-		SDL_Surface *itemIcons(IMG_Load("test-data/item-icons.png"));
-		Sprite potionIcon(itemIcons, 16, 16);
-		Sprite ballIcon(itemIcons, 16, 16, 0, 16);
-		Sprite crankIcon(itemIcons, 16, 16, 0, 32);
-		Sprite spearIcon(itemIcons, 16, 16, 0, 48);
-		Sprite swordIcon(itemIcons, 16, 16, 0, 64);
-		Sprite axIcon(itemIcons, 16, 16, 0, 80);
-		Sprite rodIcon(itemIcons, 16, 16, 0, 96);
-		Sprite armorIcon(itemIcons, 16, 16, 0, 112);
-		Sprite shieldIcon(itemIcons, 16, 16, 0, 128);
-		Sprite helmetIcon(itemIcons, 16, 16, 0, 144);
-		Sprite ringIcon(itemIcons, 16, 16, 0, 160);
-		Sprite jewelIcon(itemIcons, 16, 16, 0, 176);
+		battleRes.swapCursor = intp.GetSprite("swapCursor");
+		battleRes.attackIcons = intp.GetSprite("attackIcons");
+		battleRes.attackChoiceIcons = intp.GetSprite("attackChoiceIcons");
+		battleRes.moveIcons = intp.GetSprite("moveIcons");
+		battleRes.titleFrame = intp.GetFrame("titleFrame");
+		battleRes.titleFont = intp.GetFont("largeFont");
+		battleRes.numberAnimationPrototype = intp.GetAnimation("numberAnimationPrototype");
+		battleRes.bigNumberSprite = intp.GetSprite("bigNumbers");
+		battleRes.greenNumberSprite = intp.GetSprite("bigGreenNumbers");
+
+		battleRes.heroTagLabels = intp.GetSprite("heroTagLabels");
+		battleRes.levelLabelCol = 0;
+		battleRes.levelLabelRow = 0;
+		battleRes.healthLabelCol = 0;
+		battleRes.healthLabelRow = 1;
+		battleRes.manaLabelCol = 0;
+		battleRes.manaLabelRow = 2;
+		battleRes.moveLabelCol = 0;
+		battleRes.moveLabelRow = 3;
+		battleRes.ikariLabelCol = 0;
+		battleRes.ikariLabelRow = 4;
+
+		battleRes.heroTagFont = intp.GetFont("heroTagFont");
+		battleRes.heroTagFrame = intp.GetFrame("heroTagFrame");
+		battleRes.activeHeroTagFrame = intp.GetFrame("activeHeroTagFrame");
+		battleRes.smallHeroTagFrame = intp.GetFrame("smallHeroTagFrame");
+		battleRes.lastSmallHeroTagFrame = intp.GetFrame("lastSmallHeroTagFrame");
+		battleRes.heroesBgColor = SDL_MapRGB(screen.Screen()->format, 0x18, 0x28, 0x31);
+
+		battleRes.healthGauge = intp.GetGauge("healthGauge");
+		battleRes.manaGauge = intp.GetGauge("manaGauge");
+		battleRes.ikariGauge = intp.GetGauge("ikariGauge");
+
+		battleRes.selectFrame = intp.GetFrame("selectFrame");
+		battleRes.normalFont = intp.GetFont("normalFont");
+		battleRes.disabledFont = intp.GetFont("disabledFont");
+		battleRes.menuCursor = intp.GetSprite("handCursor");
+
+		battleRes.weaponTargetCursor = intp.GetSprite("weaponTargetCursor");
+		battleRes.magicTargetCursor = intp.GetSprite("magicTargetCursor");
+		battleRes.itemTargetCursor = intp.GetSprite("itemTargetCursor");
+
+		maxim.AddSpell(intp.GetSpell("resetSpell"));
+		Spell *strongSpell(intp.GetSpell("strongSpell"));
+		maxim.AddSpell(strongSpell);
+		selan.AddSpell(strongSpell);
+		Spell *strongerSpell(intp.GetSpell("strongerSpell"));
+		maxim.AddSpell(strongerSpell);
+		selan.AddSpell(strongerSpell);
+		Spell *championSpell(intp.GetSpell("championSpell"));
+		maxim.AddSpell(championSpell);
+		selan.AddSpell(championSpell);
+		Spell *rallySpell(intp.GetSpell("rallySpell"));
+		maxim.AddSpell(rallySpell);
+		selan.AddSpell(rallySpell);
+		selan.AddSpell(intp.GetSpell("escapeSpell"));
+		Spell *valorSpell(intp.GetSpell("valorSpell"));
+		maxim.AddSpell(valorSpell);
+		selan.AddSpell(valorSpell);
+
+		battleRes.spellMenuHeadline = intp.GetString("spellMenuHeadline");
+		battleRes.spellMenuPrototype = Menu<const Spell *>(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 9, 6, 8, 0, 2, 32, 2, ':');
+
+		battleRes.weaponMenuIcon = intp.GetSprite("swordIcon");
+		battleRes.armorMenuIcon = intp.GetSprite("armorIcon");
+		battleRes.shieldMenuIcon = intp.GetSprite("shieldIcon");
+		battleRes.helmetMenuIcon = intp.GetSprite("helmetIcon");
+		battleRes.ringMenuIcon = intp.GetSprite("ringIcon");
+		battleRes.jewelMenuIcon = intp.GetSprite("jewelIcon");
 
 		Inventory inventory;
-		Item antidote;
-		antidote.SetName("Antidote");
-		antidote.SetMenuIcon(&potionIcon);
-		antidote.SetUsableInBattle();
-		antidote.GetTargetingMode().TargetSingleAlly();
-		inventory.Add(&antidote, 9);
-		Item magicJar;
-		magicJar.SetName("Magic jar");
-		magicJar.SetMenuIcon(&potionIcon);
-		magicJar.SetUsableInBattle();
-		antidote.GetTargetingMode().TargetSingleAlly();
-		inventory.Add(&magicJar, 4);
-		Item hiPotion;
-		hiPotion.SetName("Hi-Potion");
-		hiPotion.SetMenuIcon(&potionIcon);
-		hiPotion.SetUsableInBattle();
-		antidote.GetTargetingMode().TargetSingleAlly();
-		inventory.Add(&hiPotion, 4);
-		Item powerPotion;
-		powerPotion.SetName("Power potion");
-		powerPotion.SetMenuIcon(&potionIcon);
-		inventory.Add(&powerPotion, 4);
-		Item escape;
-		escape.SetName("Escape");
-		inventory.Add(&escape, 2);
-		Item sleepBall;
-		sleepBall.SetName("Sleep ball");
-		sleepBall.SetMenuIcon(&ballIcon);
-		sleepBall.SetUsableInBattle();
-		antidote.GetTargetingMode().TargetSingleEnemy();
-		inventory.Add(&sleepBall, 1);
-		Item multiBall;
-		multiBall.SetName("Multi-ball!");
-		multiBall.SetMenuIcon(&ballIcon);
-		multiBall.SetUsableInBattle();
-		antidote.GetTargetingMode().TargetMultipleEnemies();
-		inventory.Add(&multiBall, 1);
-		Item figgoru;
-		figgoru.SetName("Figgoru");
-		figgoru.SetMenuIcon(&crankIcon);
-		antidote.GetTargetingMode().TargetAllEnemies();
-		inventory.Add(&figgoru, 1);
+		inventory.Add(intp.GetItem("antidoteItem"), 9);
+		inventory.Add(intp.GetItem("magicJarItem"), 4);
+		inventory.Add(intp.GetItem("hiPotionItem"), 4);
+		inventory.Add(intp.GetItem("powerPotionItem"), 4);
+		inventory.Add(intp.GetItem("escapeItem"), 2);
+		inventory.Add(intp.GetItem("sleepBallItem"), 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);
+		battleRes.itemMenuHeadline = intp.GetString("itemMenuHeadline");
+		battleRes.itemMenuPrototype = Menu<const common::Item *>(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 15, 6, 8, 16, 1, 32, 2, ':');
+
+		SDL_Surface *swordAttackImg(IMG_Load("test-data/attack-sword.png"));
+		Sprite swordAttackSprite(swordAttackImg, 96, 96);
+		SimpleAnimation swordAttackAnimation(&swordAttackSprite, 2 * framerate, 4);
+
+		maxim.SetWeapon(intp.GetItem("zircoSwordItem"));
+		maxim.SetArmor(intp.GetItem("zirconArmorItem"));
 		Item holyShield;
 		holyShield.SetName("Holy shield");
-		holyShield.SetMenuIcon(&shieldIcon);
+		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(&helmetIcon);
+		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(&ringIcon);
+		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(&jewelIcon);
+		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(&rodIcon);
-		selan.SetWeapon(&zircoWhip);
+		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(&armorIcon);
+		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(&shieldIcon);
+		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(&helmetIcon);
+		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(&ringIcon);
+		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(&jewelIcon);
+		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(&axIcon);
-		guy.SetWeapon(&zircoAx);
-		guy.SetArmor(&zirconArmor);
+		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.SetArmor(intp.GetItem("zirconArmorItem"));
 		Item megaShield;
 		megaShield.SetName("Mega shield");
-		megaShield.SetMenuIcon(&shieldIcon);
+		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(&helmetIcon);
+		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(&ringIcon);
+		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);
 
 		// NOTE: this is actually Artea equipment
 		Item lizardBlow;
 		lizardBlow.SetName("Lizard blow");
-		lizardBlow.SetMenuIcon(&swordIcon);
-		dekar.SetWeapon(&lizardBlow);
+		lizardBlow.SetMenuIcon(intp.GetSprite("swordIcon"));
+		lizardBlow.GetTargetingMode().TargetSingleEnemy();
+		Ikari dragonRush;
+		dragonRush.SetName("Dragon rush");
+		dragonRush.SetCost(164);
+		dragonRush.GetTargetingMode().TargetSingleEnemy();
+		dragonRush.SetPhysical();
+		lizardBlow.SetIkari(&dragonRush);
+//		dekar.SetWeapon(&lizardBlow);
 		Item holyRobe;
 		holyRobe.SetName("Holy robe");
-		holyRobe.SetMenuIcon(&armorIcon);
+		holyRobe.SetMenuIcon(intp.GetSprite("armorIcon"));
+		Ikari crisisCure;
+		crisisCure.SetName("Crisis cure");
+		crisisCure.SetCost(164);
+		crisisCure.GetTargetingMode().TargetAllAllies();
+		crisisCure.SetMagical();
+		holyRobe.SetIkari(&crisisCure);
 		dekar.SetArmor(&holyRobe);
 		dekar.SetShield(&zircoGloves);
 		dekar.SetHelmet(&holyCap);
 		Item rocketRing;
 		rocketRing.SetName("Rocket ring");
-		rocketRing.SetMenuIcon(&ringIcon);
+		rocketRing.SetMenuIcon(intp.GetSprite("ringIcon"));
+		Ikari fake;
+		fake.SetName("Fake");
+		fake.SetCost(32);
+		fake.GetTargetingMode().TargetSingleAlly();
+		fake.SetMagical();
+		rocketRing.SetIkari(&fake);
 		dekar.SetRing(&rocketRing);
 		Item krakenRock;
 		krakenRock.SetName("Kraken rock");
-		krakenRock.SetMenuIcon(&jewelIcon);
+		krakenRock.SetMenuIcon(intp.GetSprite("jewelIcon"));
+		Ikari tenLegger;
+		tenLegger.SetName("Ten-legger");
+		tenLegger.SetCost(164);
+		tenLegger.GetTargetingMode().TargetAllEnemies();
+		tenLegger.SetPhysical();
+		rocketRing.SetIkari(&tenLegger);
 		dekar.SetJewel(&krakenRock);
 
 		battleRes.ikariMenuHeadline = "Please choose equipment.";
-		battleRes.ikariMenuPrototype = Menu</* Item */ void *>(&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 *>(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 12, 6, intp.GetFont("normalFont")->CharHeight() / 2, intp.GetFont("normalFont")->CharWidth(), 1, intp.GetFont("normalFont")->CharWidth() * 2, 0, ':', 12, intp.GetFont("normalFont")->CharWidth());
+
+		battleRes.escapeText = "Escapes.";
 
 		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
 		battleState->AddMonster(monster);
@@ -438,6 +414,9 @@ int main(int argc, char **argv) {
 		app.Run();
 
 		return 0;
+	} catch (Parser::Error &e) {
+		cerr << "parsing exception in file " << e.File() << " on line " << e.Line() << ": " << e.what() << endl;
+		return 1;
 	} catch (exception &e) {
 		cerr << "exception in main(): " << e.what() << endl;
 		return 1;