]> git.localhorst.tv Git - l2e.git/blobdiff - src/main.cpp
moved Selan to test.l2s
[l2e.git] / src / main.cpp
index 14a6336f014df0d2028d3124f2699ca9a2af64b1..935d4519f46ed1dd52882f217f062cb66e315045 100644 (file)
@@ -17,7 +17,6 @@
 #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>
@@ -46,7 +50,6 @@ using common::Ikari;
 using common::Inventory;
 using common::Item;
 using common::Spell;
-using geometry::Point;
 using geometry::Vector;
 using graphics::ComplexAnimation;
 using graphics::Font;
@@ -55,6 +58,9 @@ 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;
@@ -70,112 +76,37 @@ int main(int argc, char **argv) {
 
        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();
+               cout << source;
+               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, 88));
-               monstersLayout.AddPosition(Point<Uint8>(128, 88));
-               monstersLayout.AddPosition(Point<Uint8>(168, 88));
-               monstersLayout.AddPosition(Point<Uint8>(208, 88));
+               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, 136));
-               heroesLayout.AddPosition(Point<Uint8>(128, 136));
-               heroesLayout.AddPosition(Point<Uint8>(80, 152));
-               heroesLayout.AddPosition(Point<Uint8>(160, 152));
-
-               SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
-               Sprite monsterSprite(monsterImg, 64, 64);
-               Monster monster;
-               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>(16, 0));
-               monsterAttackAnimation.AddFrame(0, 0, Vector<int>(16, 0));
-               monsterAttackAnimation.AddFrame(0, 1, Vector<int>(16, 0));
-               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);
-               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);
-               maxim.SetStats(Stats(28, 22, 28, 17, 14, 100, 10));
-               ComplexAnimation maximAttackAnimation(&maximSprite, framerate);
-               // TODO: cross check double frames; could be related to differences in framerates
-               maximAttackAnimation.AddFrames(1, 0, Vector<int>(0,  0), 7); // TODO: maybe this could also be a pause before the battle animation
-               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.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); // TODO: maybe this could also be a pause between two animations
-               maxim.SetAttackAnimation(&maximAttackAnimation);
-               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, 2 * framerate, 4);
-               maxim.SetMeleeAnimation(&maximMeleeAnimation);
-
-               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(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, 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, 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);
+               heroesLayout.AddPosition(Vector<Uint8>(48, 136));
+               heroesLayout.AddPosition(Vector<Uint8>(128, 136));
+               heroesLayout.AddPosition(Vector<Uint8>(80, 152));
+               heroesLayout.AddPosition(Vector<Uint8>(160, 152));
+
+               Monster monster(*intp.GetMonster("lizard"));
+               Hero maxim(*intp.GetHero("maxim"));
+               Hero selan(*intp.GetHero("selan"));
 
                SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
                Sprite guySprite(guyImg, 64, 64);
@@ -263,29 +194,30 @@ int main(int argc, char **argv) {
                Font largeFont(&largeFontSprite, 0, -2);
                battleRes.titleFont = &largeFont;
 
-               battleRes.numberAnimationPrototype = ComplexAnimation(0, framerate);
-               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);
@@ -355,9 +287,7 @@ int main(int argc, char **argv) {
                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;
@@ -482,6 +412,7 @@ int main(int argc, char **argv) {
                Item zircoSword;
                zircoSword.SetName("Zirco sword");
                zircoSword.SetMenuIcon(&swordIcon);
+               zircoSword.GetTargetingMode().TargetSingleEnemy();
                Ikari firestorm;
                firestorm.SetName("Firestorm");
                firestorm.SetCost(224);
@@ -506,7 +437,7 @@ int main(int argc, char **argv) {
                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);
@@ -516,7 +447,7 @@ int main(int argc, char **argv) {
                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);
@@ -544,6 +475,7 @@ int main(int argc, char **argv) {
                Item zircoWhip;
                zircoWhip.SetName("Zirco whip");
                zircoWhip.SetMenuIcon(&rodIcon);
+               zircoWhip.GetTargetingMode().TargetSingleEnemy();
                Ikari thundershriek;
                thundershriek.SetName("Thundershriek");
                thundershriek.SetCost(224);
@@ -605,6 +537,7 @@ int main(int argc, char **argv) {
                Item zircoAx;
                zircoAx.SetName("Zirco ax");
                zircoAx.SetMenuIcon(&axIcon);
+               zircoAx.GetTargetingMode().TargetSingleEnemy();
                Ikari torrent;
                torrent.SetName("Torrent");
                torrent.SetCost(224);
@@ -619,7 +552,7 @@ int main(int argc, char **argv) {
                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);
@@ -649,6 +582,7 @@ int main(int argc, char **argv) {
                Item lizardBlow;
                lizardBlow.SetName("Lizard blow");
                lizardBlow.SetMenuIcon(&swordIcon);
+               lizardBlow.GetTargetingMode().TargetSingleEnemy();
                Ikari dragonRush;
                dragonRush.SetName("Dragon rush");
                dragonRush.SetCost(164);
@@ -720,6 +654,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;