X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=491a0ec6c77d8fda2791dd5ae3d287b8fc89ae54;hb=3ecf065f3bcef720e82bb137a2be734ed7e16746;hp=bd8ff4a48c0850c58232857a6b439d23bdff3853;hpb=628b3a7276d0b330719e05504b23bafcf88f8fca;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index bd8ff4a..491a0ec 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,12 +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 @@ -28,8 +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; @@ -43,59 +74,158 @@ 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 parser("test-data/test.l2s", source); + parser.Parse(); + Interpreter intp(source); + intp.ReadSource(); + InitScreen screen(width, height); // temporary test data - SDL_Surface *bg(SDL_CreateRGBSurface(0, width, height, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF)); - SDL_FillRect(bg, 0, SDL_MapRGB(bg->format, 0xFF, 0xFF, 0xFF)); - SDL_Rect r; - r.x = 1; - r.y = 1; - r.w = width - 2; - r.h = height - 2; - SDL_FillRect(bg, &r, SDL_MapRGB(bg->format, 0, 0, 0)); - PartyLayout monstersLayout; - monstersLayout.AddPosition(Point(50, 100)); - monstersLayout.AddPosition(Point(100, 100)); - monstersLayout.AddPosition(Point(150, 100)); - monstersLayout.AddPosition(Point(200, 100)); - PartyLayout heroesLayout; - heroesLayout.AddPosition(Point(27, 219)); - heroesLayout.AddPosition(Point(104, 227)); - heroesLayout.AddPosition(Point(66, 238)); - heroesLayout.AddPosition(Point(143, 246)); - SDL_Surface *white96(SDL_CreateRGBSurface(0, 96, 96, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF)); - SDL_FillRect(white96, 0, SDL_MapRGB(bg->format, 0xFF, 0xFF, 0xFF)); - Sprite dummySprite(white96, 96, 96); - Monster monster; - monster.SetSprite(&dummySprite); - Hero hero; - hero.SetName("Name"); - hero.SetLevel(34); - hero.SetSprite(&dummySprite); - 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); - - BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite)); + 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 = intp.GetColor("heroesBgColor"); + + 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.spellMenuProperties = intp.GetMenuProperties("spellMenuPrototype"); + + 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; + 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; + + battleRes.itemMenuHeadline = intp.GetString("itemMenuHeadline"); + battleRes.itemMenuProperties = intp.GetMenuProperties("itemMenuPrototype"); + + 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")); + + battleRes.ikariMenuHeadline = intp.GetString("ikariMenuHeadline"); + battleRes.noEquipmentText = intp.GetString("noEquipmentText"); + battleRes.ikariMenuProperties = intp.GetMenuProperties("ikariMenuPrototype"); + battleRes.escapeText = intp.GetString("escapeText"); + + 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); @@ -112,6 +242,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;