X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=test-data%2Ftest.l2s;h=1267b9f9854ffcd979177574d6331d78c0e85250;hb=f552d26f537af9fa48255bd71cdc1a0a1b860bac;hp=098e0b20c1cbd89e1aecd0d3cf4f288d6ef7b87e;hpb=953e7c370a2f955d2aaf9b41a3e9cc3a4911c852;p=l2e.git

diff --git a/test-data/test.l2s b/test-data/test.l2s
index 098e0b2..1267b9f 100644
--- a/test-data/test.l2s
+++ b/test-data/test.l2s
@@ -1,6 +1,6 @@
-include "ikaris.l2s"
-include "items.l2s"
-include "spells.l2s"
+include "ikaris.l2h"
+include "items.l2h"
+include "spells.l2h"
 
 Number frameTime 33
 Number twoFramesTime 66
@@ -48,7 +48,8 @@ export Monster lizard {
 		sprite: lizardSprite,
 		frametime: fourFramesTime,
 		repeat: false,
-		frames: [
+		frames:
+		[ ComplexAnimationFrame
 			{ column: 0, row: 1, disposition: < 0, 16> },
 			{ column: 0, row: 0, disposition: < 0, 16> },
 			{ column: 0, row: 1, disposition: < 0, 16> },
@@ -72,7 +73,7 @@ Sprite maximSprite {
 export Hero maxim {
 	name: "Maxim",
 	level: 1,
-	sprite: maximSprite,
+	battleSprite: maximSprite,
 	maxHealth: 33,
 	health: 33,
 	maxMana: 20,
@@ -87,11 +88,15 @@ export Hero maxim {
 		gut: 100,
 		mgr:  10
 	},
+	ladder: [
+		10
+	],
 	attackAnimation: ComplexAnimation {
 		sprite: maximSprite,
 		frametime: frameTime,
 		repeat: false,
-		frames: [
+		frames:
+		[ ComplexAnimationFrame
 			{ column: 1, row: 0, disposition: < 0, 0> },
 			{ column: 1, row: 0, disposition: < 0, 0> },
 			{ column: 1, row: 0, disposition: < 0, 0> },
@@ -125,7 +130,8 @@ export Hero maxim {
 		sprite: maximSprite,
 		frametime: fiveFramesTime,
 		repeat: false,
-		frames: [
+		frames:
+		[ ComplexAnimationFrame
 			{ column: 3, row: 0, disposition: < 0, 0> },
 			{ column: 3, row: 0, disposition: < 0, 0> },
 			{ column: 3, row: 1, disposition: < 0, 0> }
@@ -138,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>
 	}
 }
 
@@ -148,7 +165,7 @@ Sprite selanSprite {
 export Hero selan {
 	name: "Selan",
 	level: 1,
-	sprite: selanSprite,
+	battleSprite: selanSprite,
 	maxHealth: 28,
 	health: 28,
 	maxMana: 23,
@@ -167,7 +184,8 @@ export Hero selan {
 		sprite: selanSprite,
 		frametime: frameTime,
 		repeat: false,
-		frames: [
+		frames:
+		[ ComplexAnimationFrame
 			{ column: 1, row: 0, disposition: < 4, 0> },
 			{ column: 1, row: 0, disposition: < 4, 0> },
 			{ column: 1, row: 0, disposition: < 8, 2> },
@@ -188,7 +206,8 @@ export Hero selan {
 		sprite: selanSprite,
 		frametime: frameTime,
 		repeat: false,
-		frames: [
+		frames:
+		[ ComplexAnimationFrame
 			{ column: 3, row: 0, disposition: < 0, 0> },
 			{ column: 3, row: 0, disposition: < 0, 0> },
 			{ column: 3, row: 0, disposition: < 0, 0> },
@@ -208,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>
 	}
 }
 
@@ -218,7 +248,7 @@ Sprite guySprite {
 export Hero guy {
 	name: "Guy",
 	level: 1,
-	sprite: guySprite,
+	battleSprite: guySprite,
 	maxHealth: 38,
 	health: 38,
 	maxMana: 0,
@@ -237,7 +267,8 @@ export Hero guy {
 		sprite: guySprite,
 		frametime: frameTime,
 		repeat: false,
-		frames: [
+		frames:
+		[ ComplexAnimationFrame
 			{ column: 1, row: 0, disposition: <-4, 0> },
 			{ column: 1, row: 0, disposition: <-4, 0> },
 			{ column: 1, row: 0, disposition: <-8, 0> },
@@ -261,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>
 	}
 }
 
@@ -271,7 +313,7 @@ Sprite dekarSprite {
 export Hero dekar {
 	name: "Dekar",
 	level: 1,
-	sprite: dekarSprite,
+	battleSprite: dekarSprite,
 	maxHealth: 38,
 	health: 38,
 	maxMana: 0,
@@ -290,7 +332,8 @@ export Hero dekar {
 		sprite: dekarSprite,
 		frametime: frameTime,
 		repeat: false,
-		frames: [
+		frames:
+		[ ComplexAnimationFrame
 			{ column: 1, row: 0, disposition: < 4, 0> },
 			{ column: 1, row: 0, disposition: < 8, 2> },
 			{ column: 2, row: 0, disposition: <12, 4> },
@@ -311,7 +354,8 @@ export Hero dekar {
 		sprite: dekarSprite,
 		frametime: twoFramesTime,
 		repeat: false,
-		frames: [
+		frames:
+		[ ComplexAnimationFrame
 			{ column: 3, row: 0, disposition: < 0, 0> },
 			{ column: 3, row: 0, disposition: < 0, 0> },
 			{ column: 3, row: 0, disposition: < 0, 0> },
@@ -332,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>
 	}
 }
 
@@ -389,7 +444,8 @@ export BattleResources battleResources {
 	numberAnimationPrototype: ComplexAnimation {
 		frametime: frameTime,
 		repeat: false,
-		frames: [
+		frames:
+		[ ComplexAnimationFrame
 			{ column: 0, row: 0, disposition: <  0,  0> },
 			{ column: 0, row: 0, disposition: <  0,-26> },
 			{ column: 0, row: 0, disposition: <  0,-42> },