]> git.localhorst.tv Git - l2e.git/blobdiff - src/main.cpp
split headers off of ikaris, items, and spells
[l2e.git] / src / main.cpp
index d9769de270a3a9f37447e9ed611e33aa7ee9fc83..4280985185a5e8e144aa6f46d855c463dcf635d1 100644 (file)
 #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>
@@ -37,16 +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;
@@ -60,424 +74,92 @@ int main(int argc, char **argv) {
        const int width = 800;
        const int height = 480;
 
+//     std::srand(std::time(0));
+
        try {
                InitSDL sdl;
                InitImage image(IMG_INIT_PNG);
+
+               ParsedSource source;
+               Parser("test-data/test.l2s", source).Parse();
+               Parser("test-data/ikaris.l2s", source).Parse();
+               Parser("test-data/items.l2s", source).Parse();
+               Parser("test-data/spells.l2s", source).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(55);
-
-               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(80);
-
-               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(85);
-
-               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(50);
-
-               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.weaponMenuIcon = &swordIcon;
-               battleRes.armorMenuIcon = &armorIcon;
-               battleRes.shieldMenuIcon = &shieldIcon;
-               battleRes.helmetMenuIcon = &helmetIcon;
-               battleRes.ringMenuIcon = &ringIcon;
-               battleRes.jewelMenuIcon = &jewelIcon;
+               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(intp.GetBattleResources("battleResources"));
+
+               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);
 
                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();
-               magicJar.GetTargetingMode().TargetSingleAlly();
-               inventory.Add(&magicJar, 4);
-               Item hiPotion;
-               hiPotion.SetName("Hi-Potion");
-               hiPotion.SetMenuIcon(&potionIcon);
-               hiPotion.SetUsableInBattle();
-               hiPotion.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();
-               sleepBall.GetTargetingMode().TargetSingleEnemy();
-               inventory.Add(&sleepBall, 1);
-               Item multiBall;
-               multiBall.SetName("Multi-ball!");
-               multiBall.SetMenuIcon(&ballIcon);
-               multiBall.SetUsableInBattle();
-               multiBall.GetTargetingMode().TargetMultipleEnemies();
-               inventory.Add(&multiBall, 1);
-               Item figgoru;
-               figgoru.SetName("Figgoru");
-               figgoru.SetMenuIcon(&crankIcon);
-               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);
-               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;
-               zircoWhip.SetName("Zirco whip");
-               zircoWhip.SetMenuIcon(&rodIcon);
-               Ikari thundershriek;
-               thundershriek.SetName("Thundershriek");
-               thundershriek.SetCost(88);
-               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(38);
-               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(26);
-               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(77);
-               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(77);
-               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(50);
-               dive.GetTargetingMode().TargetSingleEnemy();
-               eagleRock.SetIkari(&dive);
-               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);
+               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;
+
+               maxim.SetWeapon(intp.GetItem("zircoSwordItem"));
+               maxim.SetArmor(intp.GetItem("zirconArmorItem"));
+               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"));
+               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;
-               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.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));
+//             dekar.SetWeapon(intp.GetItem("lizardBlowItem"));
+               dekar.SetArmor(intp.GetItem("holyRobeItem"));
+               dekar.SetShield(intp.GetItem("zircoGlovesItem"));
+               dekar.SetHelmet(intp.GetItem("holyCapItem"));
+               dekar.SetRing(intp.GetItem("rocketRingItem"));
+               dekar.SetJewel(intp.GetItem("krakenRockItem"));
+
+               BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, battleRes));
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);
@@ -502,6 +184,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;