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

diff --git a/test-data/test.l2s b/test-data/test.l2s
index 2576b3c..5f4fe2c 100644
--- 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,10 @@ export Hero maxim {
 		gut: 100,
 		mgr:  10
 	},
+	ladder: [
+		10
+	],
+	useMask: maskMaxim,
 	attackAnimation: ComplexAnimation {
 		sprite: maximSprite,
 		frametime: frameTime,
@@ -146,6 +145,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 +163,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,
@@ -176,6 +181,7 @@ export Hero selan {
 		gut: 80,
 		mgr: 13
 	},
+	useMask: maskSelan,
 	attackAnimation: ComplexAnimation {
 		sprite: selanSprite,
 		frametime: frameTime,
@@ -223,6 +229,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 +247,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,
@@ -253,6 +265,7 @@ export Hero guy {
 		gut: 90,
 		mgr:  8
 	},
+	useMask: maskGuy,
 	attackAnimation: ComplexAnimation {
 		sprite: guySprite,
 		frametime: frameTime,
@@ -282,6 +295,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 +313,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,
@@ -312,6 +331,7 @@ export Hero dekar {
 		gut: 100,
 		mgr:   5
 	},
+	useMask: maskDekar,
 	attackAnimation: ComplexAnimation {
 		sprite: dekarSprite,
 		frametime: frameTime,
@@ -360,6 +380,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>
 	}
 }