X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=8fa276ce73f07566b182b465b2457aea7af4580c;hb=HEAD;hp=964fce03e24671219a259fa460178808522ab516;hpb=b841b91bb2381c7553863d165ebfc5b6a323b9d2;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 964fce0..8fa276c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,24 +1,25 @@ -/* - * main.cpp - * - * Created on: Aug 1, 2012 - * Author: holy - */ - +#include "keys.h" #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/LevelUp.h" +#include "common/Script.h" #include "common/Spell.h" -#include "geometry/Vector.h" +#include "common/Stats.h" +#include "graphics/CharSelect.h" #include "graphics/ComplexAnimation.h" #include "graphics/Font.h" #include "graphics/Frame.h" @@ -26,10 +27,23 @@ #include "graphics/Menu.h" #include "graphics/SimpleAnimation.h" #include "graphics/Sprite.h" +#include "graphics/Texture.h" +#include "loader/Caster.h" +#include "loader/Compiler.h" #include "loader/Interpreter.h" +#include "loader/Loader.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 "math/Fixed.h" +#include "math/Vector.h" +#include "menu/Resources.h" #include "sdl/InitImage.h" #include "sdl/InitScreen.h" #include "sdl/InitSDL.h" @@ -47,26 +61,25 @@ 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::Compiler; using loader::Interpreter; +using loader::Loader; using loader::ParsedSource; using loader::Parser; using loader::TypeDescription; +using map::Entity; +using map::MapState; +using math::Fixed; +using math::Vector; using sdl::InitImage; using sdl::InitScreen; using sdl::InitSDL; @@ -79,8 +92,12 @@ 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 int walkSpeed = 8; + + bool battle(false); // std::srand(std::time(0)); @@ -88,34 +105,65 @@ int main(int argc, char **argv) { InitSDL sdl; InitImage image(IMG_INIT_PNG); - battle::Resources::CreateTypeDescription(); - ComplexAnimation::CreateTypeDescription(); - Font::CreateTypeDescription(); - Frame::CreateTypeDescription(); - Gauge::CreateTypeDescription(); - Hero::CreateTypeDescription(); - Ikari::CreateTypeDescription(); Interpreter::CreateTypeDescriptions(); - Item::CreateTypeDescription(); - graphics::MenuProperties::CreateTypeDescription(); - Monster::CreateTypeDescription(); - PartyLayout::CreateTypeDescription(); - SimpleAnimation::CreateTypeDescription(); - Spell::CreateTypeDescription(); - Sprite::CreateTypeDescription(); - Stats::CreateTypeDescription(); + + battle::Resources::CreateTypeDescription(); + battle::Monster::CreateTypeDescription(); + battle::PartyLayout::CreateTypeDescription(); + + common::Capsule::CreateTypeDescription(); + common::Hero::CreateTypeDescription(); + common::Ikari::CreateTypeDescription(); + common::Item::CreateTypeDescription(); + common::LevelUp::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; + Loader ld; + for (vector::const_iterator i(args.Infiles().begin()), end(args.Infiles().end()); i != end; ++i) { - Parser(*i, source).Parse(); + string filePath(*i); + switch (filePath[filePath.size() - 1]) { + case 'o': + ld.Load(filePath); + break; + case 's': + Parser(filePath, source).Parse(); + break; + default: + throw std::runtime_error("don't know what to do with " + filePath); + } } - switch (args.DetectRunLevel()) { + Interpreter intp(source); + intp.ReadSource(); + + switch (args.GetRunLevel()) { case Arguments::WRITE: { int length(std::strlen(args.OutfilePath())); @@ -125,6 +173,15 @@ int main(int argc, char **argv) { source.WriteHeader(outstream); break; } + case 'o': { + std::fstream outstream(args.OutfilePath(), std::ios_base::out|std::ios_base::trunc); + outstream.flush(); + outstream.close(); + outstream.open(args.OutfilePath()); + outstream.exceptions(std::ios_base::badbit|std::ios_base::failbit); + Compiler(intp).Write(outstream); + break; + } default: { throw std::runtime_error(string("don't know how to write file ") + args.OutfilePath()); } @@ -132,123 +189,166 @@ int main(int argc, char **argv) { return 0; } case Arguments::DUMP: { - std::cout << source << std::endl; + std::cout << source << ld << 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::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; + std::cerr << "missing definition of " << TypeDescription::Get(i->type).TypeName() << " " << i->identifier << std::endl; } return 3; } - int battleResId(TypeDescription::GetTypeId("BattleResources")); - int heroId(TypeDescription::GetTypeId("Hero")); - int itemId(TypeDescription::GetTypeId("Item")); - int monsterId(TypeDescription::GetTypeId("Monster")); - int partyLayoutId(TypeDescription::GetTypeId("PartyLayout")); - int spellId(TypeDescription::GetTypeId("Spell")); + Caster caster(ld, 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(*reinterpret_cast(intp.GetObject(partyLayoutId, "monstersLayout"))); - PartyLayout heroesLayout(*reinterpret_cast(intp.GetObject(partyLayoutId, "heroesLayout"))); - - Monster monster(*reinterpret_cast(intp.GetObject(monsterId, "lizard"))); - Hero maxim(*reinterpret_cast(intp.GetObject(heroId, "maxim"))); - Hero selan(*reinterpret_cast(intp.GetObject(heroId, "selan"))); - Hero guy(*reinterpret_cast(intp.GetObject(heroId, "guy"))); - Hero dekar(*reinterpret_cast(intp.GetObject(heroId, "dekar"))); - - battle::Resources *battleRes(reinterpret_cast(intp.GetObject(battleResId, "battleResources"))); - - maxim.AddSpell(reinterpret_cast(intp.GetObject(spellId, "resetSpell"))); - Spell *strongSpell(reinterpret_cast(intp.GetObject(spellId, "strongSpell"))); - maxim.AddSpell(strongSpell); - selan.AddSpell(strongSpell); - Spell *strongerSpell(reinterpret_cast(intp.GetObject(spellId, "strongerSpell"))); - maxim.AddSpell(strongerSpell); - selan.AddSpell(strongerSpell); - Spell *championSpell(reinterpret_cast(intp.GetObject(spellId, "championSpell"))); - maxim.AddSpell(championSpell); - selan.AddSpell(championSpell); - Spell *rallySpell(reinterpret_cast(intp.GetObject(spellId, "rallySpell"))); - maxim.AddSpell(rallySpell); - selan.AddSpell(rallySpell); - selan.AddSpell(reinterpret_cast(intp.GetObject(spellId, "escapeSpell"))); - Spell *valorSpell(reinterpret_cast(intp.GetObject(spellId, "valorSpell"))); - maxim.AddSpell(valorSpell); - selan.AddSpell(valorSpell); - - Inventory inventory; - inventory.Add(reinterpret_cast(intp.GetObject(itemId, "antidoteItem")), 9); - inventory.Add(reinterpret_cast(intp.GetObject(itemId, "magicJarItem")), 4); - inventory.Add(reinterpret_cast(intp.GetObject(itemId, "hiPotionItem")), 4); - inventory.Add(reinterpret_cast(intp.GetObject(itemId, "powerPotionItem")), 4); - inventory.Add(reinterpret_cast(intp.GetObject(itemId, "escapeItem")), 2); - inventory.Add(reinterpret_cast(intp.GetObject(itemId, "sleepBallItem")), 1); - battleRes->inventory = &inventory; - - maxim.SetWeapon(reinterpret_cast(intp.GetObject(itemId, "zircoSwordItem"))); - maxim.SetArmor(reinterpret_cast(intp.GetObject(itemId, "zirconArmorItem"))); - maxim.SetShield(reinterpret_cast(intp.GetObject(itemId, "holyShieldItem"))); - maxim.SetHelmet(reinterpret_cast(intp.GetObject(itemId, "legendHelmItem"))); - maxim.SetRing(reinterpret_cast(intp.GetObject(itemId, "sProRingItem"))); - maxim.SetJewel(reinterpret_cast(intp.GetObject(itemId, "evilJewelItem"))); - -// selan.SetWeapon(reinterpret_cast(intp.GetObject(itemId, "zircoWhipItem"))); - selan.SetArmor(reinterpret_cast(intp.GetObject(itemId, "zirconPlateItem"))); - selan.SetShield(reinterpret_cast(intp.GetObject(itemId, "zircoGlovesItem"))); - selan.SetHelmet(reinterpret_cast(intp.GetObject(itemId, "holyCapItem"))); - selan.SetRing(reinterpret_cast(intp.GetObject(itemId, "ghostRingItem"))); - selan.SetJewel(reinterpret_cast(intp.GetObject(itemId, "eagleRockItem"))); - -// guy.SetWeapon(reinterpret_cast(intp.GetObject(itemId, "zircoAxItem"))); - guy.SetArmor(reinterpret_cast(intp.GetObject(itemId, "zirconArmorItem"))); - guy.SetShield(reinterpret_cast(intp.GetObject(itemId, "megaShieldItem"))); - guy.SetHelmet(reinterpret_cast(intp.GetObject(itemId, "zircoHelmetItem"))); - guy.SetRing(reinterpret_cast(intp.GetObject(itemId, "powerRingItem"))); - guy.SetJewel(reinterpret_cast(intp.GetObject(itemId, "evilJewelItem"))); + 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 -// dekar.SetWeapon(reinterpret_cast(intp.GetObject(itemId, "lizardBlowItem"))); - dekar.SetArmor(reinterpret_cast(intp.GetObject(itemId, "holyRobeItem"))); - dekar.SetShield(reinterpret_cast(intp.GetObject(itemId, "zircoGlovesItem"))); - dekar.SetHelmet(reinterpret_cast(intp.GetObject(itemId, "holyCapItem"))); - dekar.SetRing(reinterpret_cast(intp.GetObject(itemId, "rocketRingItem"))); - dekar.SetJewel(reinterpret_cast(intp.GetObject(itemId, "krakenRockItem"))); +// 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 >(64, 128); + + gameState.heroes[1].MapEntity().Position() = Vector >(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 >(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 >(64, 128); + gameState.heroes[3].MapEntity().SetFlags(Entity::FLAG_NONBLOCKING); + gameState.heroes[2].MapEntity().AddFollower(&gameState.heroes[3].MapEntity()); InitScreen screen(width, height); - 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); - app.Buttons().MapKey(SDLK_w, Input::PAD_UP); - app.Buttons().MapKey(SDLK_d, Input::PAD_RIGHT); - app.Buttons().MapKey(SDLK_s, Input::PAD_DOWN); - app.Buttons().MapKey(SDLK_a, Input::PAD_LEFT); - app.Buttons().MapKey(SDLK_RIGHT, Input::ACTION_A); - app.Buttons().MapKey(SDLK_DOWN, Input::ACTION_B); - app.Buttons().MapKey(SDLK_UP, Input::ACTION_X); - app.Buttons().MapKey(SDLK_LEFT, Input::ACTION_Y); - app.Buttons().MapKey(SDLK_RETURN, Input::START); - app.Buttons().MapKey(SDLK_SPACE, Input::SELECT); - app.Buttons().MapKey(SDLK_RSHIFT, Input::SHOULDER_RIGHT); - app.Buttons().MapKey(SDLK_LSHIFT, Input::SHOULDER_LEFT); + 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); + MapKeys(app.Buttons()); app.Run(); return 0;