X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=test-data%2Ftest.l2s;h=2576b3cfb57383d62a16c82c1ea9ba52080a94ac;hb=616330670a0c3d9d4554c145e997129747d05979;hp=48817f47965aca37ae2c3df5c209edbc1f250b30;hpb=a55d4589da1a0cdec73c0bcf69a2af6bccf868cb;p=l2e.git

diff --git a/test-data/test.l2s b/test-data/test.l2s
index 48817f4..2576b3c 100644
--- a/test-data/test.l2s
+++ b/test-data/test.l2s
@@ -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> },
@@ -69,10 +70,15 @@ Sprite maximSprite {
 	image: :"maxim.png",
 	size: <64,64>
 }
+Sprite maximMapSprite {
+	image: :"maxim-map.png",
+	size: <32,64>
+}
 export Hero maxim {
 	name: "Maxim",
 	level: 1,
-	sprite: maximSprite,
+	battleSprite: maximSprite,
+	mapSprite: maximMapSprite,
 	maxHealth: 33,
 	health: 33,
 	maxMana: 20,
@@ -91,7 +97,8 @@ export Hero maxim {
 		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 +132,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> }
@@ -145,10 +153,15 @@ Sprite selanSprite {
 	image: :"selan.png",
 	size: <64,64>
 }
+Sprite selanMapSprite {
+	image: :"selan-map.png",
+	size: <32,64>
+}
 export Hero selan {
 	name: "Selan",
 	level: 1,
-	sprite: selanSprite,
+	battleSprite: selanSprite,
+	mapSprite: selanMapSprite,
 	maxHealth: 28,
 	health: 28,
 	maxMana: 23,
@@ -167,7 +180,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 +202,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> },
@@ -215,10 +230,15 @@ Sprite guySprite {
 	image: :"guy.png",
 	size: <64,64>
 }
+Sprite guyMapSprite {
+	image: :"guy-map.png",
+	size: <32,64>
+}
 export Hero guy {
 	name: "Guy",
 	level: 1,
-	sprite: guySprite,
+	battleSprite: guySprite,
+	mapSprite: guyMapSprite,
 	maxHealth: 38,
 	health: 38,
 	maxMana: 0,
@@ -237,7 +257,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> },
@@ -268,10 +289,15 @@ Sprite dekarSprite {
 	image: :"dekar.png",
 	size: <64,64>
 }
+Sprite dekarMapSprite {
+	image: :"dekar-map.png",
+	size: <32,64>
+}
 export Hero dekar {
 	name: "Dekar",
 	level: 1,
-	sprite: dekarSprite,
+	battleSprite: dekarSprite,
+	mapSprite: dekarMapSprite,
 	maxHealth: 38,
 	health: 38,
 	maxMana: 0,
@@ -290,7 +316,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 +338,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> },
@@ -389,7 +417,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> },