moved Guy's and Dekar's configuration to test.l2s

diff --git a/src/main.cpp b/src/main.cpp
index d4444256f5d12f890541826411a1142c8144cff1..3719a8de6e452e7850c5c8493c0aa480081a4f1e 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -106,68 +106,8 @@ int main(int argc, char **argv) {
                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);
-               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(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, 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 *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);
-               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(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, 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, 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);
+               Hero guy(*intp.GetHero("guy"));
+               Hero dekar(*intp.GetHero("dekar"));
 
                battle::Resources battleRes;
 

diff --git a/test-data/test.l2s b/test-data/test.l2s
index 8474e1f36c36ec9e46a5b35d7bf329e8a3b831ee..d53fe76b52257b5798d16e3b6354de74abea8794 100644 (file)
--- a/test-data/test.l2s
+++ b/test-data/test.l2s
@@ -190,3 +190,127 @@ export Hero selan {
                framecount: 4
        }
 }
+
+Sprite guySprite {
+       image: "test-data/guy.png",
+       size: <64,64>
+}
+export Hero guy {
+       name: "Guy",
+       level: 1,
+       sprite: guySprite,
+       maxHealth: 38,
+       health: 38,
+       maxMana: 0,
+       mana: 0,
+       ip: 0,
+       stats: Stats {
+               atp: 38,
+               dfp: 25,
+               str: 38,
+               agl: 13,
+               int:  8,
+               gut: 90,
+               mgr:  8
+       },
+       attackAnimation: ComplexAnimation {
+               sprite: guySprite,
+               frametime: frameTime,
+               repeat: false,
+               frames: [
+                       { column: 1, row: 0, disposition: <-4, 0> },
+                       { column: 1, row: 0, disposition: <-4, 0> },
+                       { column: 1, row: 0, disposition: <-8, 0> },
+                       { column: 1, row: 0, disposition: <-8, 0> },
+                       { column: 2, row: 0, disposition: <-8, 0> },
+                       { column: 2, row: 0, disposition: <-8, 0> },
+                       { column: 2, row: 0, disposition: <-4, 0> },
+                       { column: 2, row: 0, disposition: < 0, 0> },
+                       { column: 2, row: 0, disposition: < 0, 0> },
+                       { column: 2, row: 1, disposition: < 0, 0> },
+                       { column: 2, row: 1, disposition: < 4, 0> },
+                       { column: 2, row: 1, disposition: <10, 0> },
+                       { column: 2, row: 2, disposition: <10, 0> },
+                       { column: 2, row: 2, disposition: < 0, 0> }
+               ]
+       },
+       meleeAnimation: SimpleAnimation {
+               sprite: Sprite {
+                       image: "test-data/melee-guy.png",
+                       size: <96,96>
+               },
+               frametime: fourFramesTime,
+               framecount: 4
+       }
+}
+
+Sprite dekarSprite {
+       image: "test-data/dekar.png",
+       size: <64,64>
+}
+export Hero dekar {
+       name: "Dekar",
+       level: 1,
+       sprite: dekarSprite,
+       maxHealth: 38,
+       health: 38,
+       maxMana: 0,
+       mana: 0,
+       ip: 0,
+       stats: Stats {
+               atp:  46,
+               dfp:  29,
+               str:  46,
+               agl:  13,
+               int:   7,
+               gut: 100,
+               mgr:   5
+       },
+       attackAnimation: ComplexAnimation {
+               sprite: dekarSprite,
+               frametime: frameTime,
+               repeat: false,
+               frames: [
+                       { column: 1, row: 0, disposition: < 4, 0> },
+                       { column: 1, row: 0, disposition: < 8, 2> },
+                       { column: 2, row: 0, disposition: <12, 4> },
+                       { column: 2, row: 0, disposition: <16, 4> },
+                       { column: 2, row: 0, disposition: <10, 2> },
+                       { column: 2, row: 0, disposition: <10, 2> },
+                       { column: 2, row: 0, disposition: <10, 2> },
+                       { column: 2, row: 0, disposition: <10, 2> },
+                       { column: 2, row: 1, disposition: < 6, 2> },
+                       { column: 2, row: 1, disposition: < 0, 0> },
+                       { column: 2, row: 2, disposition: <-2, 0> },
+                       { column: 2, row: 2, disposition: < 0, 0> },
+                       { column: 2, row: 2, disposition: < 0, 0> },
+                       { column: 2, row: 2, disposition: < 0, 0> }
+               ]
+       },
+       spellAnimation: ComplexAnimation {
+               sprite: dekarSprite,
+               frametime: twoFramesTime,
+               repeat: false,
+               frames: [
+                       { column: 3, row: 0, disposition: < 0, 0> },
+                       { column: 3, row: 0, disposition: < 0, 0> },
+                       { column: 3, row: 0, disposition: < 0, 0> },
+                       { column: 3, row: 0, disposition: < 0, 0> },
+                       { column: 3, row: 0, disposition: < 0, 0> },
+                       { column: 3, row: 0, disposition: < 0, 0> },
+                       { column: 3, row: 1, disposition: < 0, 0> },
+                       { column: 3, row: 1, disposition: < 0, 0> },
+                       { column: 3, row: 2, disposition: < 0, 0> },
+                       { column: 3, row: 2, disposition: < 0, 0> },
+                       { column: 3, row: 2, disposition: < 0, 0> }
+               ]
+       },
+       meleeAnimation: SimpleAnimation {
+               sprite: Sprite {
+                       image: "test-data/melee-dekar.png",
+                       size: <96,96>
+               },
+               frametime: twoFramesTime,
+               framecount: 4
+       }
+}