#include "loader/Interpreter.h"
#include "loader/ParsedSource.h"
#include "loader/Parser.h"
+#include "loader/TypeDescription.h"
#include "sdl/InitImage.h"
#include "sdl/InitScreen.h"
#include "sdl/InitSDL.h"
using loader::Interpreter;
using loader::ParsedSource;
using loader::Parser;
+using loader::TypeDescription;
using sdl::InitImage;
using sdl::InitScreen;
using sdl::InitSDL;
const int width = 800;
const int height = 480;
- const int framerate = 33;
-
// std::srand(std::time(0));
try {
InitSDL sdl;
InitImage image(IMG_INIT_PNG);
+ battle::Resources::CreateTypeDescription();
+ ComplexAnimation::CreateTypeDescription();
+ Font::CreateTypeDescription();
+ Frame::CreateTypeDescription();
+ Gauge::CreateTypeDescription();
+ Hero::CreateTypeDescription();
+ Ikari::CreateTypeDescription();
+ Item::CreateTypeDescription();
+ graphics::MenuProperties::CreateTypeDescription();
+ PartyLayout::CreateTypeDescription();
+ SimpleAnimation::CreateTypeDescription();
+ Spell::CreateTypeDescription();
+ Sprite::CreateTypeDescription();
+ Stats::CreateTypeDescription();
+ common::TargetingMode::CreateTypeDescription();
+
ParsedSource source;
- Parser parser("test-data/test.l2s", source);
- parser.Parse();
+ 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);
+ 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"));
// 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");
+ PartyLayout monstersLayout(*reinterpret_cast<PartyLayout *>(intp.GetObject(partyLayoutId, "monstersLayout")));
+ PartyLayout heroesLayout(*reinterpret_cast<PartyLayout *>(intp.GetObject(partyLayoutId, "heroesLayout")));
- battleRes.selectFrame = intp.GetFrame("selectFrame");
- battleRes.normalFont = intp.GetFont("normalFont");
- battleRes.disabledFont = intp.GetFont("disabledFont");
- battleRes.menuCursor = intp.GetSprite("handCursor");
+ Monster monster(*reinterpret_cast<Monster *>(intp.GetObject(monsterId, "lizard")));
+ Hero maxim(*reinterpret_cast<Hero *>(intp.GetObject(heroId, "maxim")));
+ Hero selan(*reinterpret_cast<Hero *>(intp.GetObject(heroId, "selan")));
+ Hero guy(*reinterpret_cast<Hero *>(intp.GetObject(heroId, "guy")));
+ Hero dekar(*reinterpret_cast<Hero *>(intp.GetObject(heroId, "dekar")));
- battleRes.weaponTargetCursor = intp.GetSprite("weaponTargetCursor");
- battleRes.magicTargetCursor = intp.GetSprite("magicTargetCursor");
- battleRes.itemTargetCursor = intp.GetSprite("itemTargetCursor");
+ battle::Resources *battleRes(reinterpret_cast<battle::Resources *>(intp.GetObject(battleResId, "battleResources")));
- maxim.AddSpell(intp.GetSpell("resetSpell"));
- Spell *strongSpell(intp.GetSpell("strongSpell"));
+ maxim.AddSpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "resetSpell")));
+ Spell *strongSpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "strongSpell")));
maxim.AddSpell(strongSpell);
selan.AddSpell(strongSpell);
- Spell *strongerSpell(intp.GetSpell("strongerSpell"));
+ Spell *strongerSpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "strongerSpell")));
maxim.AddSpell(strongerSpell);
selan.AddSpell(strongerSpell);
- Spell *championSpell(intp.GetSpell("championSpell"));
+ Spell *championSpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "championSpell")));
maxim.AddSpell(championSpell);
selan.AddSpell(championSpell);
- Spell *rallySpell(intp.GetSpell("rallySpell"));
+ Spell *rallySpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "rallySpell")));
maxim.AddSpell(rallySpell);
selan.AddSpell(rallySpell);
- selan.AddSpell(intp.GetSpell("escapeSpell"));
- Spell *valorSpell(intp.GetSpell("valorSpell"));
+ selan.AddSpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "escapeSpell")));
+ Spell *valorSpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "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;
- 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.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);
-
- 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"));
+ inventory.Add(reinterpret_cast<Item *>(intp.GetObject(itemId, "antidoteItem")), 9);
+ inventory.Add(reinterpret_cast<Item *>(intp.GetObject(itemId, "magicJarItem")), 4);
+ inventory.Add(reinterpret_cast<Item *>(intp.GetObject(itemId, "hiPotionItem")), 4);
+ inventory.Add(reinterpret_cast<Item *>(intp.GetObject(itemId, "powerPotionItem")), 4);
+ inventory.Add(reinterpret_cast<Item *>(intp.GetObject(itemId, "escapeItem")), 2);
+ inventory.Add(reinterpret_cast<Item *>(intp.GetObject(itemId, "sleepBallItem")), 1);
+ battleRes->inventory = &inventory;
+
+ maxim.SetWeapon(reinterpret_cast<Item *>(intp.GetObject(itemId, "zircoSwordItem")));
+ maxim.SetArmor(reinterpret_cast<Item *>(intp.GetObject(itemId, "zirconArmorItem")));
+ maxim.SetShield(reinterpret_cast<Item *>(intp.GetObject(itemId, "holyShieldItem")));
+ maxim.SetHelmet(reinterpret_cast<Item *>(intp.GetObject(itemId, "legendHelmItem")));
+ maxim.SetRing(reinterpret_cast<Item *>(intp.GetObject(itemId, "sProRingItem")));
+ maxim.SetJewel(reinterpret_cast<Item *>(intp.GetObject(itemId, "evilJewelItem")));
+
+// selan.SetWeapon(reinterpret_cast<Item *>(intp.GetObject(itemId, "zircoWhipItem")));
+ selan.SetArmor(reinterpret_cast<Item *>(intp.GetObject(itemId, "zirconPlateItem")));
+ selan.SetShield(reinterpret_cast<Item *>(intp.GetObject(itemId, "zircoGlovesItem")));
+ selan.SetHelmet(reinterpret_cast<Item *>(intp.GetObject(itemId, "holyCapItem")));
+ selan.SetRing(reinterpret_cast<Item *>(intp.GetObject(itemId, "ghostRingItem")));
+ selan.SetJewel(reinterpret_cast<Item *>(intp.GetObject(itemId, "eagleRockItem")));
+
+// guy.SetWeapon(reinterpret_cast<Item *>(intp.GetObject(itemId, "zircoAxItem")));
+ guy.SetArmor(reinterpret_cast<Item *>(intp.GetObject(itemId, "zirconArmorItem")));
+ guy.SetShield(reinterpret_cast<Item *>(intp.GetObject(itemId, "megaShieldItem")));
+ guy.SetHelmet(reinterpret_cast<Item *>(intp.GetObject(itemId, "zircoHelmetItem")));
+ guy.SetRing(reinterpret_cast<Item *>(intp.GetObject(itemId, "powerRingItem")));
+ guy.SetJewel(reinterpret_cast<Item *>(intp.GetObject(itemId, "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(intp.GetItem("zircoGlovesItem"));
- dekar.SetHelmet(intp.GetItem("holyCapItem"));
- 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);
+// dekar.SetWeapon(reinterpret_cast<Item *>(intp.GetObject(itemId, "lizardBlowItem")));
+ dekar.SetArmor(reinterpret_cast<Item *>(intp.GetObject(itemId, "holyRobeItem")));
+ dekar.SetShield(reinterpret_cast<Item *>(intp.GetObject(itemId, "zircoGlovesItem")));
+ dekar.SetHelmet(reinterpret_cast<Item *>(intp.GetObject(itemId, "holyCapItem")));
+ dekar.SetRing(reinterpret_cast<Item *>(intp.GetObject(itemId, "rocketRingItem")));
+ dekar.SetJewel(reinterpret_cast<Item *>(intp.GetObject(itemId, "krakenRockItem")));
- 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.";
+ InitScreen screen(width, height);
- BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
+ BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, battleRes));
battleState->AddMonster(monster);
battleState->AddMonster(monster);
battleState->AddMonster(monster);
projects / l2e.git / blobdiff