#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/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::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 {
+ ParsedSource source;
+ Parser parser("test-data/test.l2s", source);
+ parser.Parse();
+
+ cout << source;
+
+ return 0;
+
InitSDL sdl;
InitImage image(IMG_INIT_PNG);
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));
+ monstersLayout.AddPosition(Vector<Uint8>(88, 88));
+ monstersLayout.AddPosition(Vector<Uint8>(128, 88));
+ monstersLayout.AddPosition(Vector<Uint8>(168, 88));
+ monstersLayout.AddPosition(Vector<Uint8>(208, 88));
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));
+ heroesLayout.AddPosition(Vector<Uint8>(48, 136));
+ heroesLayout.AddPosition(Vector<Uint8>(128, 136));
+ heroesLayout.AddPosition(Vector<Uint8>(80, 152));
+ heroesLayout.AddPosition(Vector<Uint8>(160, 152));
SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
- Sprite dummySprite(monsterImg, 64, 64);
+ Sprite monsterSprite(monsterImg, 64, 64);
Monster monster;
- monster.SetName("Monster");
- monster.SetSprite(&dummySprite);
- monster.SetMaxHealth(10);
- monster.SetHealth(10);
+ monster.SetName("Lizard");
+ monster.SetSprite(&monsterSprite);
+ monster.SetLevel(1);
+ monster.SetMaxHealth(8);
+ monster.SetHealth(8);
+ monster.SetStats(Stats(14, 6, 6, 6, 6, 6, 6));
+ monster.SetReward(3, 5);
+ ComplexAnimation monsterAttackAnimation(&monsterSprite, 4 * framerate);
+ monsterAttackAnimation.AddFrame(0, 1, Vector<int>(0, 16));
+ monsterAttackAnimation.AddFrame(0, 0, Vector<int>(0, 16));
+ monsterAttackAnimation.AddFrame(0, 1, Vector<int>(0, 16));
+ monster.SetAttackAnimation(&monsterAttackAnimation);
+ SDL_Surface *monsterMeleeImg(IMG_Load("test-data/attack-monster.png"));
+ Sprite monsterMeleeSprite(monsterMeleeImg, 96, 64);
+ SimpleAnimation monsterMeleeAnimation(&monsterMeleeSprite, framerate, 14);
+ monster.SetMeleeAnimation(&monsterMeleeAnimation);
SDL_Surface *maximImg(IMG_Load("test-data/maxim.png"));
Sprite maximSprite(maximImg, 64, 64);
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));
+ maxim.SetStats(Stats(28, 22, 28, 17, 14, 100, 10));
+ ComplexAnimation maximAttackAnimation(&maximSprite, framerate);
+ maximAttackAnimation.AddFrames(1, 0, Vector<int>(0, 0), 7);
+ maximAttackAnimation.AddFrames(1, 0, Vector<int>(4, -1), 2);
+ maximAttackAnimation.AddFrames(2, 0, Vector<int>(4, -2), 2);
+ maximAttackAnimation.AddFrames(2, 0, Vector<int>(6, -2), 2);
+ maximAttackAnimation.AddFrames(2, 1, Vector<int>(6, -1), 1);
maximAttackAnimation.AddFrames(2, 1, Vector<int>(3, -1), 2);
- maximAttackAnimation.AddFrame(2, 1);
- maximAttackAnimation.AddFrames(2, 2, Vector<int>(), 2);
+ maximAttackAnimation.AddFrames(2, 1, Vector<int>(0, 0), 1);
+ maximAttackAnimation.AddFrames(2, 2, Vector<int>(0, 0), 2);
+ maximAttackAnimation.AddFrames(2, 2, Vector<int>(2, 0), 1);
+ maximAttackAnimation.AddFrames(1, 0, Vector<int>(0, 0), 7);
maxim.SetAttackAnimation(&maximAttackAnimation);
- ComplexAnimation maximSpellAnimation(&maximSprite, 150);
+ ComplexAnimation maximSpellAnimation(&maximSprite, 5 * framerate);
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);
+ SimpleAnimation maximMeleeAnimation(&maximMeleeSprite, 2 * framerate, 4);
+ maxim.SetMeleeAnimation(&maximMeleeAnimation);
SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
Sprite selanSprite(selanImg, 64, 64);
selan.SetHealth(28);
selan.SetMaxMana(23);
selan.SetMana(23);
- selan.SetIP(1);
- ComplexAnimation selanAttackAnimation(&selanSprite, 30);
+ selan.SetIP(0);
+ selan.SetStats(Stats(23, 21, 23, 19, 22, 80, 13));
+ ComplexAnimation selanAttackAnimation(&selanSprite, framerate);
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, 2, Vector<int>(-8, -8));
selanAttackAnimation.AddFrame(2, 2);
selan.SetAttackAnimation(&selanAttackAnimation);
- ComplexAnimation selanSpellAnimation(&selanSprite, 30);
+ ComplexAnimation selanSpellAnimation(&selanSprite, framerate);
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 *selanMeleeImg(IMG_Load("test-data/melee-selan.png"));
+ Sprite selanMeleeSprite(selanMeleeImg, 96, 96);
+ SimpleAnimation selanMeleeAnimation(&selanMeleeSprite, 2 * framerate, 4);
+ selan.SetMeleeAnimation(&selanMeleeAnimation);
SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
Sprite guySprite(guyImg, 64, 64);
guy.SetHealth(38);
guy.SetMaxMana(0);
guy.SetMana(0);
- guy.SetIP(254);
- ComplexAnimation guyAttackAnimation(&guySprite, 30);
+ guy.SetIP(0);
+ guy.SetStats(Stats(38, 25, 38, 13, 8, 90, 8));
+ ComplexAnimation guyAttackAnimation(&guySprite, framerate);
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, 2, Vector<int>(10, 0));
guyAttackAnimation.AddFrame(2, 2);
guy.SetAttackAnimation(&guyAttackAnimation);
+ SDL_Surface *guyMeleeImg(IMG_Load("test-data/melee-guy.png"));
+ Sprite guyMeleeSprite(guyMeleeImg, 96, 96);
+ SimpleAnimation guyMeleeAnimation(&guyMeleeSprite, 2 * framerate, 4);
+ guy.SetMeleeAnimation(&guyMeleeAnimation);
SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
Sprite dekarSprite(dekarImg, 64, 64);
dekar.SetHealth(38);
dekar.SetMaxMana(0);
dekar.SetMana(0);
- dekar.SetIP(255);
- ComplexAnimation dekarAttackAnimation(&dekarSprite, 30);
+ dekar.SetIP(0);
+ dekar.SetStats(Stats(46, 29, 46, 13, 7, 100, 5));
+ ComplexAnimation dekarAttackAnimation(&dekarSprite, framerate);
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, 2, Vector<int>(-2, 0));
dekarAttackAnimation.AddFrames(2, 2, Vector<int>(0, 0), 3);
dekar.SetAttackAnimation(&dekarAttackAnimation);
- ComplexAnimation dekarSpellAnimation(&dekarSprite, 30);
+ ComplexAnimation dekarSpellAnimation(&dekarSprite, framerate);
dekarSpellAnimation.AddFrames(2, 0, Vector<int>(), 6);
dekarSpellAnimation.AddFrames(2, 1, Vector<int>(), 2);
dekarSpellAnimation.AddFrames(2, 2, Vector<int>(), 3);
dekar.SetSpellAnimation(&dekarSpellAnimation);
+ SDL_Surface *dekarMeleeImg(IMG_Load("test-data/melee-dekar.png"));
+ Sprite dekarMeleeSprite(dekarMeleeImg, 96, 96);
+ SimpleAnimation dekarMeleeAnimation(&dekarMeleeSprite, 2 * framerate, 4);
+ dekar.SetMeleeAnimation(&dekarMeleeAnimation);
battle::Resources battleRes;
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));
+ ComplexAnimation numberAnimationPrototype(0, framerate);
+ numberAnimationPrototype.AddFrame(0, 0);
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -48));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
+ numberAnimationPrototype.AddFrame(0, 0);
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -24));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
+ numberAnimationPrototype.AddFrame(0, 0);
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
+ numberAnimationPrototype.AddFrames(0, 0, Vector<int>(), 14);
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -36));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -32));
+ numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -18));
+ battleRes.numberAnimationPrototype = &numberAnimationPrototype;
SDL_Surface *bigNumbersImg(IMG_Load("test-data/big-numbers.png"));
Sprite bigNumbersSprite(bigNumbersImg, 16, 32);
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