X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=4280985185a5e8e144aa6f46d855c463dcf635d1;hb=a55d4589da1a0cdec73c0bcf69a2af6bccf868cb;hp=767464bfe5f7be7b33799aa87cf4b38cc26c1f88;hpb=cccda573516f3bce30efbaba3fc20e4148d3cdc8;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 767464b..4280985 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,13 +11,29 @@ #include "battle/Hero.h" #include "battle/Monster.h" #include "battle/PartyLayout.h" -#include "geometry/Point.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/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 +#include #include #include #include @@ -29,9 +45,22 @@ using battle::BattleState; using battle::Hero; using battle::Monster; using battle::PartyLayout; -using geometry::Point; +using battle::Stats; +using common::Ikari; +using common::Inventory; +using common::Item; +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 loader::Interpreter; +using loader::ParsedSource; +using loader::Parser; using sdl::InitImage; using sdl::InitScreen; using sdl::InitSDL; @@ -45,58 +74,100 @@ 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(50, 100)); - monstersLayout.AddPosition(Point(100, 108)); - monstersLayout.AddPosition(Point(150, 100)); - monstersLayout.AddPosition(Point(200, 108)); - PartyLayout heroesLayout; - heroesLayout.AddPosition(Point(27, 219)); - heroesLayout.AddPosition(Point(104, 227)); - heroesLayout.AddPosition(Point(66, 238)); - heroesLayout.AddPosition(Point(143, 246)); - - SDL_Surface *monsterImg(IMG_Load("test-data/monster.png")); - Sprite dummySprite(monsterImg, 96, 96); - Monster monster; - monster.SetSprite(&dummySprite); - - SDL_Surface *heroImg(IMG_Load("test-data/hero.png")); - Sprite heroSprite(heroImg, 96, 96); - Hero hero; - hero.SetName("Name"); - hero.SetLevel(34); - hero.SetSprite(&heroSprite); - hero.SetMaxHealth(100); - hero.SetHealth(50); - hero.SetMaxMana(100); - hero.SetMana(66); - hero.SetIP(160); - - 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, 8, 8, 1, 1, 17); - Frame activeHeroTagFrame(tagFrames, 8, 8); - - BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame)); + 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; + 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 +// 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); battleState->AddMonster(monster); - battleState->AddHero(hero); - battleState->AddHero(hero); - battleState->AddHero(hero); - battleState->AddHero(hero); + 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); @@ -113,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;