#include "app/Application.h"
#include "app/Input.h"
-#include "battle/AttackAnimation.h"
#include "battle/BattleState.h"
#include "battle/Hero.h"
#include "battle/Monster.h"
#include "battle/PartyLayout.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/Point.h"
#include "geometry/Vector.h"
#include "graphics/ComplexAnimation.h"
#include "graphics/Font.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 <cstdlib>
+#include <ctime>
#include <exception>
#include <iostream>
#include <SDL.h>
using app::Application;
using app::Input;
-using battle::AttackAnimation;
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::Spell;
-using geometry::Point;
using geometry::Vector;
using graphics::ComplexAnimation;
using graphics::Font;
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;
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);
+
+ 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(IMG_Load("test-data/battle-bg.png"));
- PartyLayout monstersLayout;
- monstersLayout.AddPosition(Point<Uint8>(88, 104));
- monstersLayout.AddPosition(Point<Uint8>(128, 104));
- monstersLayout.AddPosition(Point<Uint8>(168, 104));
- monstersLayout.AddPosition(Point<Uint8>(208, 104));
- PartyLayout heroesLayout;
- heroesLayout.AddPosition(Point<Uint8>(48, 152));
- heroesLayout.AddPosition(Point<Uint8>(128, 152));
- heroesLayout.AddPosition(Point<Uint8>(80, 168));
- heroesLayout.AddPosition(Point<Uint8>(160, 168));
-
- SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
- Sprite dummySprite(monsterImg, 64, 64);
- Monster monster;
- monster.SetName("Monster");
- monster.SetSprite(&dummySprite);
- monster.SetMaxHealth(10);
- monster.SetHealth(10);
-
- SDL_Surface *maximImg(IMG_Load("test-data/maxim.png"));
- Sprite maximSprite(maximImg, 64, 64);
- Hero maxim;
- maxim.SetName("Maxim");
- maxim.SetLevel(1);
- maxim.SetSprite(&maximSprite);
- maxim.SetMaxHealth(33);
- maxim.SetHealth(33);
- maxim.SetMaxMana(20);
- maxim.SetMana(20);
- maxim.SetIP(0);
- ComplexAnimation maximAttackAnimation(&maximSprite, 30);
- maximAttackAnimation.AddFrame(1, 0, Vector<int>(2, 0));
- maximAttackAnimation.AddFrame(1, 0, Vector<int>(2, -1));
- maximAttackAnimation.AddFrames(2, 0, Vector<int>(2, -2), 2);
- maximAttackAnimation.AddFrame(2, 0, Vector<int>(4, -2));
- maximAttackAnimation.AddFrame(2, 0, Vector<int>(3, -1));
- maximAttackAnimation.AddFrames(2, 1, Vector<int>(3, -1), 2);
- maximAttackAnimation.AddFrame(2, 1);
- maximAttackAnimation.AddFrames(2, 2, Vector<int>(), 2);
- maxim.SetAttackAnimation(&maximAttackAnimation);
- ComplexAnimation maximSpellAnimation(&maximSprite, 150);
- maximSpellAnimation.AddFrames(3, 0, Vector<int>(), 2);
- maximSpellAnimation.AddFrame(3, 1);
- maxim.SetSpellAnimation(&maximSpellAnimation);
- SDL_Surface *maximMeleeImg(IMG_Load("test-data/melee-maxim.png"));
- Sprite maximMeleeSprite(maximMeleeImg, 96, 96);
- SimpleAnimation maximMeleeAnimation(&maximMeleeSprite, 30, 4);
- AttackAnimation maximMeleeScript;
- maximMeleeScript.PlayAttackAnimation();
- maximMeleeScript.StartTimer(150);
- maximMeleeScript.WaitForTimer();
- maximMeleeScript.PlayTargetAnimation(&maximMeleeAnimation);
- maximMeleeScript.WaitForAnimations();
- maxim.SetMeleeAnimation(&maximMeleeScript);
-
- SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
- Sprite selanSprite(selanImg, 64, 64);
- Hero selan;
- selan.SetName("Selan");
- selan.SetLevel(1);
- selan.SetSprite(&selanSprite);
- selan.SetMaxHealth(28);
- selan.SetHealth(28);
- selan.SetMaxMana(23);
- selan.SetMana(23);
- selan.SetIP(1);
- ComplexAnimation selanAttackAnimation(&selanSprite, 30);
- selanAttackAnimation.AddFrames(1, 0, Vector<int>(4, 0), 2);
- selanAttackAnimation.AddFrame(1, 0, Vector<int>(8, 2));
- selanAttackAnimation.AddFrame(2, 0, Vector<int>(10, 4));
- selanAttackAnimation.AddFrame(2, 0, Vector<int>(14, 4));
- selanAttackAnimation.AddFrames(2, 0, Vector<int>(12, 2), 3);
- selanAttackAnimation.AddFrames(2, 1, Vector<int>(14, 2), 2);
- selanAttackAnimation.AddFrame(2, 1, Vector<int>(2, 0));
- selanAttackAnimation.AddFrame(2, 2, Vector<int>(-2, -4));
- selanAttackAnimation.AddFrame(2, 2, Vector<int>(-8, -8));
- selanAttackAnimation.AddFrame(2, 2);
- selan.SetAttackAnimation(&selanAttackAnimation);
- ComplexAnimation selanSpellAnimation(&selanSprite, 30);
- selanSpellAnimation.AddFrames(2, 0, Vector<int>(), 3);
- selanSpellAnimation.AddFrames(2, 1, Vector<int>(), 2);
- selanSpellAnimation.AddFrames(2, 2, Vector<int>(), 3);
- selanSpellAnimation.AddFrames(2, 3, Vector<int>(), 2);
- selan.SetSpellAnimation(&selanSpellAnimation);
-
- SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
- Sprite guySprite(guyImg, 64, 64);
- Hero guy;
- guy.SetName("Guy");
- guy.SetLevel(1);
- guy.SetSprite(&guySprite);
- guy.SetMaxHealth(38);
- guy.SetHealth(38);
- guy.SetMaxMana(0);
- guy.SetMana(0);
- guy.SetIP(254);
- ComplexAnimation guyAttackAnimation(&guySprite, 30);
- guyAttackAnimation.AddFrames(1, 0, Vector<int>(-4, 0), 2);
- guyAttackAnimation.AddFrames(1, 0, Vector<int>(-8, 0), 2);
- guyAttackAnimation.AddFrames(2, 0, Vector<int>(-8, 0), 2);
- guyAttackAnimation.AddFrame(2, 0, Vector<int>(-4, 0));
- guyAttackAnimation.AddFrames(2, 0, Vector<int>(), 2);
- guyAttackAnimation.AddFrame(2, 1);
- guyAttackAnimation.AddFrame(2, 1, Vector<int>(4, 0));
- guyAttackAnimation.AddFrame(2, 1, Vector<int>(10, 0));
- guyAttackAnimation.AddFrame(2, 2, Vector<int>(10, 0));
- guyAttackAnimation.AddFrame(2, 2);
- guy.SetAttackAnimation(&guyAttackAnimation);
-
- SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
- Sprite dekarSprite(dekarImg, 64, 64);
- Hero dekar;
- dekar.SetName("Dekar");
- dekar.SetLevel(1);
- dekar.SetSprite(&dekarSprite);
- dekar.SetMaxHealth(38);
- dekar.SetHealth(38);
- dekar.SetMaxMana(0);
- dekar.SetMana(0);
- dekar.SetIP(255);
- ComplexAnimation dekarAttackAnimation(&dekarSprite, 30);
- dekarAttackAnimation.AddFrame(1, 0, Vector<int>(4, 0));
- dekarAttackAnimation.AddFrame(1, 0, Vector<int>(8, 2));
- dekarAttackAnimation.AddFrame(2, 0, Vector<int>(12, 4));
- dekarAttackAnimation.AddFrame(2, 0, Vector<int>(16, 4));
- dekarAttackAnimation.AddFrames(2, 0, Vector<int>(10, 2), 4);
- dekarAttackAnimation.AddFrame(2, 1, Vector<int>(6, 2));
- dekarAttackAnimation.AddFrame(2, 1, Vector<int>());
- dekarAttackAnimation.AddFrame(2, 2, Vector<int>(-2, 0));
- dekarAttackAnimation.AddFrames(2, 2, Vector<int>(0, 0), 3);
- dekar.SetAttackAnimation(&dekarAttackAnimation);
- ComplexAnimation dekarSpellAnimation(&dekarSprite, 30);
- dekarSpellAnimation.AddFrames(2, 0, Vector<int>(), 6);
- dekarSpellAnimation.AddFrames(2, 1, Vector<int>(), 2);
- dekarSpellAnimation.AddFrames(2, 2, Vector<int>(), 3);
- dekar.SetSpellAnimation(&dekarSpellAnimation);
+ 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;
- SDL_Surface *swapCursorImg(IMG_Load("test-data/swap-cursor.png"));
- Sprite swapCursorSprite(swapCursorImg, 32, 32);
- battleRes.swapCursor = &swapCursorSprite;
- SDL_Surface *attackIconsImg(IMG_Load("test-data/attack-type-icons.png"));
- Sprite attackIconsSprite(attackIconsImg, 32, 32);
- battleRes.attackIcons = &attackIconsSprite;
- SDL_Surface *attackChoiceIconsImg(IMG_Load("test-data/attack-choice-icons.png"));
- Sprite attackChoiceIconsSprite(attackChoiceIconsImg, 16, 16);
- battleRes.attackChoiceIcons = &attackChoiceIconsSprite;
- SDL_Surface *moveIconsImg(IMG_Load("test-data/move-icons.png"));
- Sprite moveIconsSprite(moveIconsImg, 32, 32);
- battleRes.moveIcons = &moveIconsSprite;
-
- SDL_Surface *titleFrameImg(IMG_Load("test-data/title-frame.png"));
- Frame titleFrame(titleFrameImg, 16, 16);
- battleRes.titleFrame = &titleFrame;
-
- SDL_Surface *largeFontImg(IMG_Load("test-data/large-font.png"));
- Sprite largeFontSprite(largeFontImg, 16, 32);
- Font largeFont(&largeFontSprite, 0, -2);
- battleRes.titleFont = &largeFont;
-
- battleRes.numberAnimationPrototype = ComplexAnimation(0, 30);
- battleRes.numberAnimationPrototype.AddFrame(0, 0);
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -48));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
- battleRes.numberAnimationPrototype.AddFrame(0, 0);
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -24));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
- battleRes.numberAnimationPrototype.AddFrame(0, 0);
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
- battleRes.numberAnimationPrototype.AddFrames(0, 0, Vector<int>(), 14);
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -36));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -32));
- battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -18));
-
- SDL_Surface *bigNumbersImg(IMG_Load("test-data/big-numbers.png"));
- Sprite bigNumbersSprite(bigNumbersImg, 16, 32);
- battleRes.bigNumberSprite = &bigNumbersSprite;
- SDL_Surface *bigGreenNumbersImg(IMG_Load("test-data/big-green-numbers.png"));
- Sprite bigGreenNumbersSprite(bigGreenNumbersImg, 16, 32);
- battleRes.greenNumberSprite = &bigGreenNumbersSprite;
-
- SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png"));
- Sprite heroTagSprite(heroTagImg, 32, 16);
- battleRes.heroTagLabels = &heroTagSprite;
+ 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.ikariLabelCol = 0;
battleRes.ikariLabelRow = 4;
- SDL_Surface *numbersImg(IMG_Load("test-data/numbers.png"));
- Sprite numbersSprite(numbersImg, 16, 16);
- Font heroTagFont(&numbersSprite, 0, -3);
- battleRes.heroTagFont = &heroTagFont;
- SDL_Surface *tagFramesImg(IMG_Load("test-data/tag-frames.png"));
- Frame heroTagFrame(tagFramesImg, 16, 16, 1, 1, 0, 33);
- battleRes.heroTagFrame = &heroTagFrame;
- Frame activeHeroTagFrame(tagFramesImg, 16, 16);
- battleRes.activeHeroTagFrame = &activeHeroTagFrame;
- SDL_Surface *smallTagFrameImg(IMG_Load("test-data/small-tag-frame.png"));
- Frame smallTagFrame(smallTagFrameImg, 8, 16);
- battleRes.smallHeroTagFrame = &smallTagFrame;
- Frame lastSmallTagFrame(smallTagFrameImg, 8, 16, 1, 1, 0, 33);
- battleRes.lastSmallHeroTagFrame = &lastSmallTagFrame;
+ 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);
SDL_Surface *gauges(IMG_Load("test-data/gauges.png"));
Sprite magicTargetCursor(targetingIconsImg, 32, 32, 0, 32);
Sprite itemTargetCursor(targetingIconsImg, 32, 32, 0, 64);
battleRes.weaponTargetCursor = &weaponTargetCursor;
- // TODO: add image for magic targeting cursor
battleRes.magicTargetCursor = &magicTargetCursor;
- // TODO: add image for item targeting cursor
battleRes.itemTargetCursor = &itemTargetCursor;
Spell resetSpell;
battleRes.itemMenuHeadline = "Please choose an item.";
battleRes.itemMenuPrototype = Menu<const common::Item *>(&normalFont, &disabledFont, &handCursorSprite, 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);
+
Item zircoSword;
zircoSword.SetName("Zirco sword");
zircoSword.SetMenuIcon(&swordIcon);
+ zircoSword.GetTargetingMode().TargetSingleEnemy();
Ikari firestorm;
firestorm.SetName("Firestorm");
firestorm.SetCost(224);
firestorm.GetTargetingMode().TargetAllEnemies();
firestorm.SetPhysical();
zircoSword.SetIkari(&firestorm);
-// maxim.SetWeapon(&zircoSword);
+ zircoSword.SetAttackAnimation(&swordAttackAnimation);
+ maxim.SetWeapon(&zircoSword);
Item zirconArmor;
zirconArmor.SetName("Zircon armor");
zirconArmor.SetMenuIcon(&armorIcon);
Ikari lightGuard;
lightGuard.SetName("Light guard");
lightGuard.SetCost(128);
- lightGuard.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
+ lightGuard.GetTargetingMode().TargetAllAllies(); // actually only targets self
lightGuard.SetMagical();
holyShield.SetIkari(&lightGuard);
maxim.SetShield(&holyShield);
Ikari boomerang;
boomerang.SetName("Boomerang");
boomerang.SetCost(164);
- boomerang.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
+ boomerang.GetTargetingMode().TargetAllAllies(); // actually only targets self
boomerang.SetMagical();
legendHelm.SetIkari(&boomerang);
maxim.SetHelmet(&legendHelm);
Item zircoWhip;
zircoWhip.SetName("Zirco whip");
zircoWhip.SetMenuIcon(&rodIcon);
+ zircoWhip.GetTargetingMode().TargetSingleEnemy();
Ikari thundershriek;
thundershriek.SetName("Thundershriek");
thundershriek.SetCost(224);
thundershriek.GetTargetingMode().TargetAllEnemies();
thundershriek.SetPhysical();
zircoWhip.SetIkari(&thundershriek);
- selan.SetWeapon(&zircoWhip);
+// selan.SetWeapon(&zircoWhip);
Item zirconPlate;
zirconPlate.SetName("Zircon plate");
zirconPlate.SetMenuIcon(&armorIcon);
Item zircoAx;
zircoAx.SetName("Zirco ax");
zircoAx.SetMenuIcon(&axIcon);
+ zircoAx.GetTargetingMode().TargetSingleEnemy();
Ikari torrent;
torrent.SetName("Torrent");
torrent.SetCost(224);
torrent.GetTargetingMode().TargetAllEnemies();
torrent.SetPhysical();
zircoAx.SetIkari(&torrent);
- guy.SetWeapon(&zircoAx);
+// guy.SetWeapon(&zircoAx);
guy.SetArmor(&zirconArmor);
Item megaShield;
megaShield.SetName("Mega shield");
Ikari ironBarrier;
ironBarrier.SetName("Iron barrier");
ironBarrier.SetCost(255);
- ironBarrier.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
+ ironBarrier.GetTargetingMode().TargetAllAllies(); // actually only targets self
ironBarrier.SetMagical();
megaShield.SetIkari(&ironBarrier);
guy.SetShield(&megaShield);
Item lizardBlow;
lizardBlow.SetName("Lizard blow");
lizardBlow.SetMenuIcon(&swordIcon);
+ lizardBlow.GetTargetingMode().TargetSingleEnemy();
Ikari dragonRush;
dragonRush.SetName("Dragon rush");
dragonRush.SetCost(164);
dragonRush.GetTargetingMode().TargetSingleEnemy();
dragonRush.SetPhysical();
lizardBlow.SetIkari(&dragonRush);
- dekar.SetWeapon(&lizardBlow);
+// dekar.SetWeapon(&lizardBlow);
Item holyRobe;
holyRobe.SetName("Holy robe");
holyRobe.SetMenuIcon(&armorIcon);
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;
projects / l2e.git / blobdiff