X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=7bde641ebba369596f215c779e7ed80e543d2ed3;hb=c5e56f45e08fcc6c4dceb586ce3d671a3f3907ab;hp=ecd24a122b4246c0972e3f14911a3802093e2291;hpb=9a68d1231474bbc163b97398d3e4c87cbc4fd4ba;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index ecd24a1..7bde641 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,23 +1,24 @@
-/*
- * main.cpp
- *
- *  Created on: Aug 1, 2012
- *      Author: holy
- */
-
 #include "app/Application.h"
+#include "app/Arguments.h"
 #include "app/Input.h"
 #include "battle/BattleState.h"
+#include "battle/Capsule.h"
 #include "battle/Hero.h"
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "battle/Resources.h"
-#include "battle/Stats.h"
+#include "common/Capsule.h"
+#include "common/GameConfig.h"
+#include "common/GameState.h"
+#include "common/Hero.h"
 #include "common/Ikari.h"
 #include "common/Inventory.h"
 #include "common/Item.h"
+#include "common/Script.h"
 #include "common/Spell.h"
+#include "common/Stats.h"
 #include "geometry/Vector.h"
+#include "graphics/CharSelect.h"
 #include "graphics/ComplexAnimation.h"
 #include "graphics/Font.h"
 #include "graphics/Frame.h"
@@ -25,42 +26,52 @@
 #include "graphics/Menu.h"
 #include "graphics/SimpleAnimation.h"
 #include "graphics/Sprite.h"
+#include "graphics/Texture.h"
+#include "loader/Caster.h"
 #include "loader/Interpreter.h"
 #include "loader/ParsedSource.h"
 #include "loader/Parser.h"
+#include "loader/TypeDescription.h"
+#include "map/Area.h"
+#include "map/Entity.h"
+#include "map/Map.h"
+#include "map/MapState.h"
+#include "map/Tile.h"
+#include "map/Trigger.h"
+#include "menu/Resources.h"
 #include "sdl/InitImage.h"
 #include "sdl/InitScreen.h"
 #include "sdl/InitSDL.h"
 
 #include <cstdlib>
+#include <cstring>
 #include <ctime>
 #include <exception>
 #include <iostream>
+#include <string>
 #include <SDL.h>
 #include <SDL_image.h>
 
 using app::Application;
+using app::Arguments;
 using app::Input;
 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::Capsule;
+using common::GameConfig;
+using common::GameState;
+using common::Hero;
 using common::Spell;
 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 graphics::Texture;
+using loader::Caster;
 using loader::Interpreter;
 using loader::ParsedSource;
 using loader::Parser;
+using loader::TypeDescription;
+using map::Entity;
+using map::MapState;
 using sdl::InitImage;
 using sdl::InitScreen;
 using sdl::InitSDL;
@@ -69,12 +80,16 @@ using std::cerr;
 using std::cout;
 using std::endl;
 using std::exception;
+using std::string;
+using std::vector;
 
 int main(int argc, char **argv) {
-	const int width = 800;
-	const int height = 480;
+	const int width = 512;
+	const int height = 448;
+
+	const float walkSpeed = 128.0f;
 
-	const int framerate = 33;
+	bool battle(false);
 
 //	std::srand(std::time(0));
 
@@ -82,379 +97,227 @@ int main(int argc, char **argv) {
 		InitSDL sdl;
 		InitImage image(IMG_INIT_PNG);
 
+		Interpreter::CreateTypeDescriptions();
+
+		battle::Resources::CreateTypeDescription();
+		battle::Monster::CreateTypeDescription();
+		battle::PartyLayout::CreateTypeDescription();
+
+		common::Capsule::CreateTypeDescription();
+		common::Hero::CreateTypeDescription();
+		common::Ikari::CreateTypeDescription();
+		common::Item::CreateTypeDescription();
+		common::Stats::CreateTypeDescription();
+		common::Spell::CreateTypeDescription();
+		common::TargetingMode::CreateTypeDescription();
+
+		graphics::Animation::CreateTypeDescription();
+		graphics::CharSelect::CreateTypeDescription();
+		graphics::ComplexAnimation::CreateTypeDescription();
+		graphics::Font::CreateTypeDescription();
+		graphics::Frame::CreateTypeDescription();
+		graphics::Gauge::CreateTypeDescription();
+		graphics::MenuProperties::CreateTypeDescription();
+		graphics::SimpleAnimation::CreateTypeDescription();
+		graphics::Sprite::CreateTypeDescription();
+		graphics::Texture::CreateTypeDescription();
+
+		map::Area::CreateTypeDescription();
+		map::Entity::CreateTypeDescription();
+		map::Map::CreateTypeDescription();
+		map::Tile::CreateTypeDescription();
+		map::Trigger::CreateTypeDescription();
+
+		menu::Resources::CreateTypeDescription();
+
+		Arguments args;
+		args.Read(argc, argv);
+
 		ParsedSource source;
-		Parser parser("test-data/test.l2s", source);
-		parser.Parse();
+
+		for (vector<char *>::const_iterator i(args.Infiles().begin()), end(args.Infiles().end()); i != end; ++i) {
+			Parser(*i, source).Parse();
+		}
+
+		switch (args.GetRunLevel()) {
+			case Arguments::WRITE:
+			{
+				int length(std::strlen(args.OutfilePath()));
+				switch (args.OutfilePath()[length - 1]) {
+					case 'h': {
+						std::ofstream outstream(args.OutfilePath());
+						source.WriteHeader(outstream);
+						break;
+					}
+					default: {
+						throw std::runtime_error(string("don't know how to write file ") + args.OutfilePath());
+					}
+				}
+				return 0;
+			}
+			case Arguments::DUMP: {
+				std::cout << source << std::endl;
+				return 0;
+			}
+			case Arguments::SOURCE_WIKI: {
+				TypeDescription::WriteSourceWiki(std::cout);
+				return 0;
+			}
+			case Arguments::BATTLE:
+				battle = true;
+				break;
+			case Arguments::PLAY:
+			case Arguments::MAP:
+				break;
+		}
+
 		Interpreter intp(source);
 		intp.ReadSource();
 
-		InitScreen screen(width, height);
+		if (intp.PostponedDefinitions().size() > 0) {
+			for (vector<Interpreter::PostponedDefinition>::const_iterator i(intp.PostponedDefinitions().begin()), end(intp.PostponedDefinitions().end()); i != end; ++i) {
+				std::cerr << "missing definition of " << TypeDescription::Get(i->linkedType).TypeName() << " " << i->identifier << std::endl;
+			}
+			return 3;
+		}
+
+		Caster caster(intp);
+
+		GameState gameState;
+
+		gameState.heroes[0] = *caster.GetHero("maxim");
+		gameState.heroes[1] = *caster.GetHero("selan");
+		gameState.heroes[2] = *caster.GetHero("guy");
+		gameState.heroes[3] = *caster.GetHero("dekar");
+
+		gameState.party[0] = &gameState.heroes[0];
+		gameState.party[1] = &gameState.heroes[1];
+		gameState.party[2] = &gameState.heroes[2];
+		gameState.party[3] = &gameState.heroes[3];
+		gameState.partySize = 4;
+
+		gameState.capsules[1] = *caster.GetCapsule("flash");
+		gameState.capsules[1].UpgradeClass();
+		gameState.capsules[1].UpgradeClass();
+		gameState.capsules[1].UpgradeClass();
+		gameState.capsules[1].UpgradeClass();
+		gameState.capsule = 1;
+
+		GameConfig gameConfig;
+		gameConfig.state = &gameState;
+		gameConfig.heroesLayout = caster.GetPartyLayout("heroesLayout");
+		gameConfig.battleResources = caster.GetBattleResources("battleResources");
+		gameConfig.menuResources = caster.GetMenuResources("menuResources");
 
 		// temporary test data
 		SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
-		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;
-
-		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(intp.GetSprite("potionIcon"));
-		antidote.SetUsableInBattle();
-		antidote.GetTargetingMode().TargetSingleAlly();
-		inventory.Add(&antidote, 9);
-		Item magicJar;
-		magicJar.SetName("Magic jar");
-		magicJar.SetMenuIcon(intp.GetSprite("potionIcon"));
-		magicJar.SetUsableInBattle();
-		magicJar.GetTargetingMode().TargetSingleAlly();
-		inventory.Add(&magicJar, 4);
-		Item hiPotion;
-		hiPotion.SetName("Hi-Potion");
-		hiPotion.SetMenuIcon(intp.GetSprite("potionIcon"));
-		hiPotion.SetUsableInBattle();
-		hiPotion.GetTargetingMode().TargetSingleAlly();
-		inventory.Add(&hiPotion, 4);
-		Item powerPotion;
-		powerPotion.SetName("Power potion");
-		powerPotion.SetMenuIcon(intp.GetSprite("potionIcon"));
-		inventory.Add(&powerPotion, 4);
-		Item escape;
-		escape.SetName("Escape");
-		inventory.Add(&escape, 2);
-		Item sleepBall;
-		sleepBall.SetName("Sleep ball");
-		sleepBall.SetMenuIcon(intp.GetSprite("ballIcon"));
-		sleepBall.SetUsableInBattle();
-		sleepBall.GetTargetingMode().TargetSingleEnemy();
-		inventory.Add(&sleepBall, 1);
-		Item multiBall;
-		multiBall.SetName("Multi-ball!");
-		multiBall.SetMenuIcon(intp.GetSprite("ballIcon"));
-		multiBall.SetUsableInBattle();
-		multiBall.GetTargetingMode().TargetMultipleEnemies();
-		inventory.Add(&multiBall, 1);
-		Item figgoru;
-		figgoru.SetName("Figgoru");
-		figgoru.SetMenuIcon(intp.GetSprite("crankIcon"));
-		figgoru.GetTargetingMode().TargetAllEnemies();
-		inventory.Add(&figgoru, 1);
-		battleRes.inventory = &inventory;
-
-		battleRes.itemMenuHeadline = "Please choose an item.";
-		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);
-
-		Item zircoSword;
-		zircoSword.SetName("Zirco sword");
-		zircoSword.SetMenuIcon(intp.GetSprite("swordIcon"));
-		zircoSword.GetTargetingMode().TargetSingleEnemy();
-		Ikari firestorm;
-		firestorm.SetName("Firestorm");
-		firestorm.SetCost(224);
-		firestorm.GetTargetingMode().TargetAllEnemies();
-		firestorm.SetPhysical();
-		zircoSword.SetIkari(&firestorm);
-		zircoSword.SetAttackAnimation(&swordAttackAnimation);
-		maxim.SetWeapon(&zircoSword);
-		Item zirconArmor;
-		zirconArmor.SetName("Zircon armor");
-		zirconArmor.SetMenuIcon(intp.GetSprite("armorIcon"));
-		Ikari magicCure;
-		magicCure.SetName("Magic cure");
-		magicCure.SetCost(128);
-		magicCure.GetTargetingMode().TargetSingleAlly();
-		magicCure.SetMagical();
-		zirconArmor.SetIkari(&magicCure);
-		maxim.SetArmor(&zirconArmor);
-		Item holyShield;
-		holyShield.SetName("Holy shield");
-		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(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(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(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(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(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(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(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(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(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(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(&zirconArmor);
-		Item megaShield;
-		megaShield.SetName("Mega shield");
-		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(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(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);
+		PartyLayout monstersLayout(*caster.GetPartyLayout("monstersLayout"));
+
+		Monster monster(*caster.GetMonster("lizard"));
+
+		gameState.heroes[0].AddSpell(caster.GetSpell("resetSpell"));
+		Spell *strongSpell(caster.GetSpell("strongSpell"));
+		gameState.heroes[0].AddSpell(strongSpell);
+		gameState.heroes[1].AddSpell(strongSpell);
+		Spell *strongerSpell(caster.GetSpell("strongerSpell"));
+		gameState.heroes[0].AddSpell(strongerSpell);
+		gameState.heroes[1].AddSpell(strongerSpell);
+		Spell *championSpell(caster.GetSpell("championSpell"));
+		gameState.heroes[0].AddSpell(championSpell);
+		gameState.heroes[1].AddSpell(championSpell);
+		Spell *rallySpell(caster.GetSpell("rallySpell"));
+		gameState.heroes[0].AddSpell(rallySpell);
+		gameState.heroes[1].AddSpell(rallySpell);
+		gameState.heroes[1].AddSpell(caster.GetSpell("escapeSpell"));
+		Spell *valorSpell(caster.GetSpell("valorSpell"));
+		gameState.heroes[0].AddSpell(valorSpell);
+		gameState.heroes[1].AddSpell(valorSpell);
+
+		gameState.inventory.Add(caster.GetItem("zirconPlateItem"), 32);
+		gameState.inventory.Add(caster.GetItem("holyFruitItem"));
+		gameState.inventory.Add(caster.GetItem("darkFruitItem"));
+		gameState.inventory.Add(caster.GetItem("antidoteItem"), 9);
+		gameState.inventory.Add(caster.GetItem("powerRingItem"));
+		gameState.inventory.Add(caster.GetItem("magicJarItem"), 4);
+		gameState.inventory.Add(caster.GetItem("sProRingItem"));
+		gameState.inventory.Add(caster.GetItem("hiPotionItem"), 4);
+		gameState.inventory.Add(caster.GetItem("powerRingItem"));
+		gameState.inventory.Add(caster.GetItem("powerPotionItem"), 4);
+		gameState.inventory.Add(caster.GetItem("zircoSwordItem"));
+		gameState.inventory.Add(caster.GetItem("escapeItem"), 2);
+		gameState.inventory.Add(caster.GetItem("zircoHelmetItem"));
+		gameState.inventory.Add(caster.GetItem("sleepBallItem"), 1);
+		gameState.inventory.Add(caster.GetItem("zirconPlateItem"));
+
+		gameState.heroes[0].SetEquipment(Hero::EQUIP_WEAPON, caster.GetItem("zircoSwordItem"));
+		gameState.heroes[0].SetEquipment(Hero::EQUIP_ARMOR, caster.GetItem("zirconArmorItem"));
+		gameState.heroes[0].SetEquipment(Hero::EQUIP_SHIELD, caster.GetItem("holyShieldItem"));
+		gameState.heroes[0].SetEquipment(Hero::EQUIP_HELMET, caster.GetItem("legendHelmItem"));
+		gameState.heroes[0].SetEquipment(Hero::EQUIP_RING, caster.GetItem("sProRingItem"));
+		gameState.heroes[0].SetEquipment(Hero::EQUIP_JEWEL, caster.GetItem("evilJewelItem"));
+
+//		gameState.heroes[1].SetEquipment(Hero::EQUIP_WEAPON, caster.GetItem("zircoWhipItem"));
+		gameState.heroes[1].SetEquipment(Hero::EQUIP_ARMOR, caster.GetItem("zirconPlateItem"));
+		gameState.heroes[1].SetEquipment(Hero::EQUIP_SHIELD, caster.GetItem("zircoGlovesItem"));
+		gameState.heroes[1].SetEquipment(Hero::EQUIP_HELMET, caster.GetItem("holyCapItem"));
+		gameState.heroes[1].SetEquipment(Hero::EQUIP_RING, caster.GetItem("ghostRingItem"));
+		gameState.heroes[1].SetEquipment(Hero::EQUIP_JEWEL, caster.GetItem("eagleRockItem"));
+
+//		gameState.heroes[2].SetEquipment(Hero::EQUIP_WEAPON, caster.GetItem("zircoAxItem"));
+		gameState.heroes[2].SetEquipment(Hero::EQUIP_ARMOR, caster.GetItem("zirconArmorItem"));
+		gameState.heroes[2].SetEquipment(Hero::EQUIP_SHIELD, caster.GetItem("megaShieldItem"));
+		gameState.heroes[2].SetEquipment(Hero::EQUIP_HELMET, caster.GetItem("zircoHelmetItem"));
+		gameState.heroes[2].SetEquipment(Hero::EQUIP_RING, caster.GetItem("powerRingItem"));
+		gameState.heroes[2].SetEquipment(Hero::EQUIP_JEWEL, caster.GetItem("evilJewelItem"));
 
 		// NOTE: this is actually Artea equipment
-		Item lizardBlow;
-		lizardBlow.SetName("Lizard blow");
-		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(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(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(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.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);
-		battleState->AddMonster(monster);
-		battleState->AddMonster(monster);
-		battleState->AddMonster(monster);
-		battleState->AddHero(maxim);
-		battleState->AddHero(selan);
-		battleState->AddHero(guy);
-		battleState->AddHero(dekar);
-		Application app(&screen, battleState);
+//		gameState.heroes[3].SetEquipment(Hero::EQUIP_WEAPON, caster.GetItem("lizardBlowItem"));
+		gameState.heroes[3].SetEquipment(Hero::EQUIP_ARMOR, caster.GetItem("holyRobeItem"));
+		gameState.heroes[3].SetEquipment(Hero::EQUIP_SHIELD, caster.GetItem("zircoGlovesItem"));
+		gameState.heroes[3].SetEquipment(Hero::EQUIP_HELMET, caster.GetItem("holyCapItem"));
+		gameState.heroes[3].SetEquipment(Hero::EQUIP_RING, caster.GetItem("rocketRingItem"));
+		gameState.heroes[3].SetEquipment(Hero::EQUIP_JEWEL, caster.GetItem("krakenRockItem"));
+
+		gameState.heroes[0].MapEntity().Position() = Vector<float>(64, 128);
+
+		gameState.heroes[1].MapEntity().Position() = Vector<float>(64, 128);
+		gameState.heroes[1].MapEntity().SetFlags(Entity::FLAG_NONBLOCKING);
+		gameState.heroes[0].MapEntity().AddFollower(&gameState.heroes[1].MapEntity());
+
+		gameState.heroes[2].MapEntity().Position() = Vector<float>(64, 128);
+		gameState.heroes[2].MapEntity().SetFlags(Entity::FLAG_NONBLOCKING);
+		gameState.heroes[1].MapEntity().AddFollower(&gameState.heroes[2].MapEntity());
+
+		gameState.heroes[3].MapEntity().Position() = Vector<float>(64, 128);
+		gameState.heroes[3].MapEntity().SetFlags(Entity::FLAG_NONBLOCKING);
+		gameState.heroes[2].MapEntity().AddFollower(&gameState.heroes[3].MapEntity());
+
+		InitScreen screen(width, height);
+
+		app::State *state(0);
+
+		if (battle) {
+			BattleState *battleState(new BattleState(&gameConfig, bg, &monstersLayout));
+			battleState->AddMonster(monster);
+			battleState->AddMonster(monster);
+			battleState->AddMonster(monster);
+			battleState->AddMonster(monster);
+			battleState->SetCapsule(caster.GetCapsule("flash"));
+			battleState->AddHero(gameState.heroes[0]);
+			battleState->AddHero(gameState.heroes[1]);
+			battleState->AddHero(gameState.heroes[2]);
+			battleState->AddHero(gameState.heroes[3]);
+			state = battleState;
+		} else {
+			MapState *mapState(new MapState(&gameConfig, caster.GetMap("map1")));
+
+			mapState->ControlEntity(&gameState.heroes[0].MapEntity());
+			mapState->SetWalkingSpeed(walkSpeed);
+
+			state = mapState;
+		}
+
+		Application app(screen, state);
 		app.Buttons().MapKey(SDLK_w, Input::PAD_UP);
 		app.Buttons().MapKey(SDLK_d, Input::PAD_RIGHT);
 		app.Buttons().MapKey(SDLK_s, Input::PAD_DOWN);
@@ -467,12 +330,16 @@ int main(int argc, char **argv) {
 		app.Buttons().MapKey(SDLK_SPACE, Input::SELECT);
 		app.Buttons().MapKey(SDLK_RSHIFT, Input::SHOULDER_RIGHT);
 		app.Buttons().MapKey(SDLK_LSHIFT, Input::SHOULDER_LEFT);
+		app.Buttons().MapKey(SDLK_1, Input::DEBUG_1);
+		app.Buttons().MapKey(SDLK_2, Input::DEBUG_2);
+		app.Buttons().MapKey(SDLK_3, Input::DEBUG_3);
+		app.Buttons().MapKey(SDLK_4, Input::DEBUG_4);
 		app.Run();
 
 		return 0;
 	} catch (Parser::Error &e) {
 		cerr << "parsing exception in file " << e.File() << " on line " << e.Line() << ": " << e.what() << endl;
-		return 1;
+		return 2;
 	} catch (exception &e) {
 		cerr << "exception in main(): " << e.what() << endl;
 		return 1;