Merge branch 'master' into menus

[l2e.git] / test-data / test.l2s

diff --git a/test-data/test.l2s b/test-data/test.l2s
index 2576b3cfb57383d62a16c82c1ea9ba52080a94ac..1267b9f9854ffcd979177574d6331d78c0e85250 100644 (file)
--- a/test-data/test.l2s
+++ b/test-data/test.l2s
@@ -70,15 +70,10 @@ Sprite maximSprite {
        image: :"maxim.png",
        size: <64,64>
 }
-Sprite maximMapSprite {
-       image: :"maxim-map.png",
-       size: <32,64>
-}
 export Hero maxim {
        name: "Maxim",
        level: 1,
        battleSprite: maximSprite,
-       mapSprite: maximMapSprite,
        maxHealth: 33,
        health: 33,
        maxMana: 20,
@@ -93,6 +88,9 @@ export Hero maxim {
                gut: 100,
                mgr:  10
        },
+       ladder: [
+               10
+       ],
        attackAnimation: ComplexAnimation {
                sprite: maximSprite,
                frametime: frameTime,
@@ -146,6 +144,17 @@ export Hero maxim {
                },
                frametime: twoFramesTime,
                framecount: 4
+       },
+       mapEntity: Entity {
+               animation: SimpleAnimation{
+                       sprite: Sprite {
+                               image: :"maxim-map.png",
+                               size: <32,64>
+                       },
+                       frametime: 120,
+                       framecount: 2
+               },
+               spriteOffset: <0,-32>
        }
 }
 
@@ -153,15 +162,10 @@ Sprite selanSprite {
        image: :"selan.png",
        size: <64,64>
 }
-Sprite selanMapSprite {
-       image: :"selan-map.png",
-       size: <32,64>
-}
 export Hero selan {
        name: "Selan",
        level: 1,
        battleSprite: selanSprite,
-       mapSprite: selanMapSprite,
        maxHealth: 28,
        health: 28,
        maxMana: 23,
@@ -223,6 +227,17 @@ export Hero selan {
                },
                frametime: twoFramesTime,
                framecount: 4
+       },
+       mapEntity: Entity {
+               animation: SimpleAnimation{
+                       sprite: Sprite {
+                               image: :"selan-map.png",
+                               size: <32,64>
+                       },
+                       frametime: 120,
+                       framecount: 2
+               },
+               spriteOffset: <0,-32>
        }
 }
 
@@ -230,15 +245,10 @@ Sprite guySprite {
        image: :"guy.png",
        size: <64,64>
 }
-Sprite guyMapSprite {
-       image: :"guy-map.png",
-       size: <32,64>
-}
 export Hero guy {
        name: "Guy",
        level: 1,
        battleSprite: guySprite,
-       mapSprite: guyMapSprite,
        maxHealth: 38,
        health: 38,
        maxMana: 0,
@@ -282,6 +292,17 @@ export Hero guy {
                },
                frametime: fourFramesTime,
                framecount: 4
+       },
+       mapEntity: Entity {
+               animation: SimpleAnimation{
+                       sprite: Sprite {
+                               image: :"guy-map.png",
+                               size: <32,64>
+                       },
+                       frametime: 120,
+                       framecount: 2
+               },
+               spriteOffset: <0,-32>
        }
 }
 
@@ -289,15 +310,10 @@ Sprite dekarSprite {
        image: :"dekar.png",
        size: <64,64>
 }
-Sprite dekarMapSprite {
-       image: :"dekar-map.png",
-       size: <32,64>
-}
 export Hero dekar {
        name: "Dekar",
        level: 1,
        battleSprite: dekarSprite,
-       mapSprite: dekarMapSprite,
        maxHealth: 38,
        health: 38,
        maxMana: 0,
@@ -360,6 +376,17 @@ export Hero dekar {
                },
                frametime: twoFramesTime,
                framecount: 4
+       },
+       mapEntity: Entity {
+               animation: SimpleAnimation{
+                       sprite: Sprite {
+                               image: :"dekar-map.png",
+                               size: <32,64>
+                       },
+                       frametime: 120,
+                       framecount: 2
+               },
+               spriteOffset: <0,-32>
        }
 }