X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=71a29e58292b0f889661cd691db808d250226d19;hb=e1edc92c4fb834c8061118e89c0d7e239742b030;hp=ab02016cff4d67511af6f986f595067c58dfd875;hpb=cf20874f973521e84fc2aaa6cd47c56a278d9de7;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index ab02016..5934833 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,39 +1,75 @@
-/*
- * 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 "geometry/Point.h"
+#include "battle/Resources.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/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 "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::Capsule;
 using battle::Monster;
 using battle::PartyLayout;
-using geometry::Point;
-using graphics::Frame;
-using graphics::Gauge;
-using graphics::Sprite;
+using common::GameConfig;
+using common::GameState;
+using common::Hero;
+using common::Spell;
+using geometry::Vector;
+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;
@@ -42,69 +78,239 @@ 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;
+
+	bool battle(false);
+
+//	std::srand(std::time(0));
 
 	try {
 		InitSDL sdl;
 		InitImage image(IMG_INIT_PNG);
-		InitScreen screen(width, height);
+
+		Interpreter::CreateTypeDescriptions();
+
+		battle::Resources::CreateTypeDescription();
+		battle::Monster::CreateTypeDescription();
+		battle::PartyLayout::CreateTypeDescription();
+
+		common::Hero::CreateTypeDescription();
+		common::Ikari::CreateTypeDescription();
+		common::Item::CreateTypeDescription();
+		common::Stats::CreateTypeDescription();
+		common::Spell::CreateTypeDescription();
+		common::TargetingMode::CreateTypeDescription();
+
+		graphics::Animation::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;
+
+		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();
+
+		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;
+
+		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;
-		monstersLayout.AddPosition(Point<Uint8>(104, 109));
-		monstersLayout.AddPosition(Point<Uint8>(140, 118));
-		monstersLayout.AddPosition(Point<Uint8>(176, 109));
-		monstersLayout.AddPosition(Point<Uint8>(212, 118));
-		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);
-
-		SDL_Surface *heroImg(IMG_Load("test-data/hero.png"));
-		Sprite heroSprite(heroImg, 64, 64);
-		Hero hero;
-		hero.SetName("Name");
-		hero.SetLevel(34);
-		hero.SetSprite(&heroSprite);
-		hero.SetMaxHealth(100);
-		hero.SetHealth(50);
-		hero.SetMaxMana(100);
-		hero.SetMana(100);
-		hero.SetIP(255);
-
-		SDL_Surface *attackIcons(IMG_Load("test-data/attack-type-icons.png"));
-		Sprite attackIconsSprite(attackIcons, 32, 32);
-		SDL_Surface *moveIcons(IMG_Load("test-data/move-icons.png"));
-		Sprite moveIconsSprite(moveIcons, 32, 32);
-		SDL_Surface *tagFrames(IMG_Load("test-data/tag-frames.png"));
-		Frame heroTagFrame(tagFrames, 16, 16, 1, 1, 0, 33);
-		Frame activeHeroTagFrame(tagFrames, 16, 16);
-
-		SDL_Surface *gauges(IMG_Load("test-data/gauges.png"));
-		Gauge healthGauge(gauges, 0, 16, 0, 0, 16, 6, 1, 6);
-		Gauge manaGauge(gauges, 0, 32, 0, 0, 16, 6, 1, 6);
-		Gauge ikariGauge(gauges, 0, 48, 0, 0, 16, 6, 1, 6);
-
-		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame, &healthGauge, &manaGauge, &ikariGauge));
-		battleState->AddMonster(monster);
-		battleState->AddMonster(monster);
-		battleState->AddMonster(monster);
-		battleState->AddMonster(monster);
-		battleState->AddHero(hero);
-		battleState->AddHero(hero);
-		battleState->AddHero(hero);
-		battleState->AddHero(hero);
-		Application app(&screen, battleState);
+		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"));
+		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
+//		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) {
+			graphics::Sprite flashSprite(IMG_Load("test-data/flash.png"), 96, 96);
+			Capsule capsule;
+			capsule.SetName("Flash");
+			capsule.SetHealth(13, 13);
+			capsule.SetBattleSprite(&flashSprite);
+
+			BattleState *battleState(new BattleState(&gameConfig, bg, &monstersLayout));
+			battleState->AddMonster(monster);
+			battleState->AddMonster(monster);
+			battleState->AddMonster(monster);
+			battleState->AddMonster(monster);
+			battleState->SetCapsule(capsule);
+			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);
@@ -117,9 +323,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 2;
 	} catch (exception &e) {
 		cerr << "exception in main(): " << e.what() << endl;
 		return 1;