X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=test-data%2Ftest.l2s;h=4a4bb059b16dc9de5e1d57922bad2d2224354121;hb=aedf4ae020e3c811341df79ceae63ca56fb7ce83;hp=b4ff641aec4cb1b628bdbe01625a0e1627d25454;hpb=dbf125bd2ef4f68af92aa0872e8d8a6abaf4ee00;p=l2e.git

diff --git a/test-data/test.l2s b/test-data/test.l2s
index b4ff641..4a4bb05 100644
--- a/test-data/test.l2s
+++ b/test-data/test.l2s
@@ -1,3 +1,7 @@
+include "ikaris.l2h"
+include "items.l2h"
+include "spells.l2h"
+
 Number frameTime 33
 Number twoFramesTime 66
 Number fourFramesTime 132
@@ -21,8 +25,7 @@ export PartyLayout heroesLayout {
 }
 
 Sprite lizardSprite {
-	// using pathes relative to project root until path resolution is implemented
-	image: "test-data/monster.png",
+	image: :"monster.png",
 	size: <64,64>
 }
 
@@ -45,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> },
@@ -54,7 +58,7 @@ export Monster lizard {
 	},
 	meleeAnimation: SimpleAnimation {
 		sprite: Sprite {
-			image: "test-data/attack-monster.png",
+			image: :"attack-monster.png",
 			size: <96,64>
 		},
 		frametime: frameTime,
@@ -63,13 +67,13 @@ export Monster lizard {
 }
 
 Sprite maximSprite {
-	image: "test-data/maxim.png",
+	image: :"maxim.png",
 	size: <64,64>
 }
 export Hero maxim {
 	name: "Maxim",
 	level: 1,
-	sprite: maximSprite,
+	battleSprite: maximSprite,
 	maxHealth: 33,
 	health: 33,
 	maxMana: 20,
@@ -88,7 +92,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> },
@@ -122,7 +127,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> }
@@ -130,22 +136,33 @@ export Hero maxim {
 	},
 	meleeAnimation: SimpleAnimation {
 		sprite: Sprite {
-			image: "test-data/melee-maxim.png",
+			image: :"melee-maxim.png",
 			size: <96,96>
 		},
 		frametime: twoFramesTime,
 		framecount: 4
+	},
+	mapEntity: Entity {
+		animation: SimpleAnimation{
+			sprite: Sprite {
+				image: :"maxim-map.png",
+				size: <32,64>
+			},
+			frametime: 120,
+			framecount: 2
+		},
+		spriteOffset: <0,-32>
 	}
 }
 
 Sprite selanSprite {
-	image: "test-data/selan.png",
+	image: :"selan.png",
 	size: <64,64>
 }
 export Hero selan {
 	name: "Selan",
 	level: 1,
-	sprite: selanSprite,
+	battleSprite: selanSprite,
 	maxHealth: 28,
 	health: 28,
 	maxMana: 23,
@@ -164,7 +181,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> },
@@ -185,7 +203,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> },
@@ -200,22 +219,33 @@ export Hero selan {
 	},
 	meleeAnimation: SimpleAnimation {
 		sprite: Sprite {
-			image: "test-data/melee-selan.png",
+			image: :"melee-selan.png",
 			size: <96,96>
 		},
 		frametime: twoFramesTime,
 		framecount: 4
+	},
+	mapEntity: Entity {
+		animation: SimpleAnimation{
+			sprite: Sprite {
+				image: :"selan-map.png",
+				size: <32,64>
+			},
+			frametime: 120,
+			framecount: 2
+		},
+		spriteOffset: <0,-32>
 	}
 }
 
 Sprite guySprite {
-	image: "test-data/guy.png",
+	image: :"guy.png",
 	size: <64,64>
 }
 export Hero guy {
 	name: "Guy",
 	level: 1,
-	sprite: guySprite,
+	battleSprite: guySprite,
 	maxHealth: 38,
 	health: 38,
 	maxMana: 0,
@@ -234,7 +264,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> },
@@ -253,22 +284,33 @@ export Hero guy {
 	},
 	meleeAnimation: SimpleAnimation {
 		sprite: Sprite {
-			image: "test-data/melee-guy.png",
+			image: :"melee-guy.png",
 			size: <96,96>
 		},
 		frametime: fourFramesTime,
 		framecount: 4
+	},
+	mapEntity: Entity {
+		animation: SimpleAnimation{
+			sprite: Sprite {
+				image: :"guy-map.png",
+				size: <32,64>
+			},
+			frametime: 120,
+			framecount: 2
+		},
+		spriteOffset: <0,-32>
 	}
 }
 
 Sprite dekarSprite {
-	image: "test-data/dekar.png",
+	image: :"dekar.png",
 	size: <64,64>
 }
 export Hero dekar {
 	name: "Dekar",
 	level: 1,
-	sprite: dekarSprite,
+	battleSprite: dekarSprite,
 	maxHealth: 38,
 	health: 38,
 	maxMana: 0,
@@ -287,7 +329,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> },
@@ -308,7 +351,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> },
@@ -324,10 +368,276 @@ export Hero dekar {
 	},
 	meleeAnimation: SimpleAnimation {
 		sprite: Sprite {
-			image: "test-data/melee-dekar.png",
+			image: :"melee-dekar.png",
 			size: <96,96>
 		},
 		frametime: twoFramesTime,
 		framecount: 4
+	},
+	mapEntity: Entity {
+		animation: SimpleAnimation{
+			sprite: Sprite {
+				image: :"dekar-map.png",
+				size: <32,64>
+			},
+			frametime: 120,
+			framecount: 2
+		},
+		spriteOffset: <0,-32>
 	}
 }
+
+Sprite handCursor {
+	image: :"cursor-hand.png",
+	size: <32,32>
+}
+
+Font normalFont {
+	sprite: Sprite {
+		image: :"normal-font.png",
+		size: <16,16>
+	},
+	rowoffset: -2
+}
+
+Font disabledFont {
+	sprite: Sprite {
+		image: :"disabled-font.png",
+		size: <16,16>
+	},
+	rowoffset: -2
+}
+
+export BattleResources battleResources {
+	swapCursor: Sprite {
+		image: :"swap-cursor.png",
+		size: <32,32>
+	},
+	attackIcons: Sprite {
+		image: :"attack-type-icons.png",
+		size: <32,32>
+	},
+	attackChoiceIcons: Sprite {
+		image: :"attack-choice-icons.png",
+		size: <16,16>
+	},
+	moveIcons: Sprite {
+		image: :"move-icons.png",
+		size: <32,32>
+	},
+	
+	titleFrame: Frame {
+		image: :"title-frame.png",
+		border: <16,16>
+	},
+	titleFont: Font {
+		sprite: Sprite {
+			image: :"large-font.png",
+			size: <16,32>
+		},
+		rowoffset: -2
+	},
+	
+	numberAnimationPrototype: ComplexAnimation {
+		frametime: frameTime,
+		repeat: false,
+		frames:
+		[ ComplexAnimationFrame
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,-26> },
+			{ column: 0, row: 0, disposition: <  0,-42> },
+			{ column: 0, row: 0, disposition: <  0,-48> },
+			{ column: 0, row: 0, disposition: <  0,-42> },
+			{ column: 0, row: 0, disposition: <  0,-26> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,-12> },
+			{ column: 0, row: 0, disposition: <  0,-20> },
+			{ column: 0, row: 0, disposition: <  0,-24> },
+			{ column: 0, row: 0, disposition: <  0,-20> },
+			{ column: 0, row: 0, disposition: <  0,-12> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0, -6> },
+			{ column: 0, row: 0, disposition: <  0,-10> },
+			{ column: 0, row: 0, disposition: <  0,-12> },
+			{ column: 0, row: 0, disposition: <  0,-10> },
+			{ column: 0, row: 0, disposition: <  0, -6> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,  0> },
+			{ column: 0, row: 0, disposition: <  0,-36> },
+			{ column: 0, row: 0, disposition: <  0,-32> },
+			{ column: 0, row: 0, disposition: <  0,-18> }
+		]
+	},
+	bigNumberSprite: Sprite {
+		image: :"big-numbers.png",
+		size: <16,32>
+	},
+	greenNumberSprite: Sprite {
+		image: :"big-green-numbers.png",
+		size: <16,32>
+	},
+	
+	heroTagLabels: Sprite {
+		image: :"hero-tag-sprites.png",
+		size: <32,16>
+	},
+	levelLabelCol: 0,
+	levelLabelRow: 0,
+	healthLabelCol: 0,
+	healthLabelRow: 1,
+	manaLabelCol: 0,
+	manaLabelRow: 2,
+	moveLabelCol: 0,
+	moveLabelRow: 3,
+	ikariLabelCol: 0,
+	ikariLabelRow: 4,
+	heroTagFont: Font {
+		sprite: Sprite {
+			image: :"numbers.png",
+			size: <16,16>
+		},
+		rowoffset: -3
+	},
+	
+	activeHeroTagFrame: Frame {
+		image: :"tag-frames.png",
+		border: <16,16>
+	},
+	heroTagFrame: Frame {
+		image: :"tag-frames.png",
+		border: <16,16>,
+		offset: < 0,33>
+	},
+	
+	smallHeroTagFrame: Frame {
+		image: :"small-tag-frame.png",
+		border: <8,16>
+	},
+	lastSmallHeroTagFrame: Frame {
+		image: :"small-tag-frame.png",
+		border: <8,16>,
+		offset: <0,33>
+	},
+	heroesBgColor: (24, 40, 49),
+	
+	healthGauge: Gauge {
+		image: :"gauges.png",
+		full:  <0,16>,
+		empty: <0, 0>,
+		height: 16,
+		start:   6,
+		repeat:  1,
+		end:     6
+	},
+	manaGauge: Gauge {
+		image: :"gauges.png",
+		full:  <0,32>,
+		empty: <0, 0>,
+		height: 16,
+		start:   6,
+		repeat:  1,
+		end:     6
+	},
+	ikariGauge: Gauge {
+		image: :"gauges.png",
+		full:  <0,48>,
+		empty: <0, 0>,
+		height: 16,
+		start:   6,
+		repeat:  1,
+		end:     6
+	},
+	
+	selectFrame: Frame {
+		image: :"select-frame.png",
+		border: <16,16>
+	},
+	normalFont: normalFont,
+	disabledFont: disabledFont,
+	menuCursor: Sprite {
+		image: :"cursor-hand.png",
+		size: <32,32>
+	},
+	
+	weaponTargetCursor: Sprite {
+		image: :"targeting-icons.png",
+		size: <32,32>
+	},
+	magicTargetCursor: Sprite {
+		image: :"targeting-icons.png",
+		size: <32,32>,
+		offset: <0,32>
+	},
+	itemTargetCursor: Sprite {
+		image: :"targeting-icons.png",
+		size: <32,32>,
+		offset: <0,64>
+	},
+	
+	weaponMenuIcon: swordIcon,
+	armorMenuIcon: armorIcon,
+	shieldMenuIcon: shieldIcon,
+	helmetMenuIcon: helmetIcon,
+	ringMenuIcon: ringIcon,
+	jewelMenuIcon: jewelIcon,
+	
+	spellMenuHeadline: "Please choose a spell.",
+	spellMenuProperties: MenuProperties {
+		font: normalFont,
+		disabledFont: disabledFont,
+		cursor: handCursor,
+		charsPerEntry: 9,
+		rows: 6,
+		rowGap: 8,
+		iconSpace: 0,
+		cols: 2,
+		colGap: 32,
+		charsPerNumber: 2,
+		delimiter: ":"
+	},
+	
+	itemMenuHeadline: "Please choose an item.",
+	itemMenuProperties: MenuProperties {
+		font: normalFont,
+		disabledFont: disabledFont,
+		cursor: handCursor,
+		charsPerEntry: 15,
+		rows: 6,
+		rowGap: 8,
+		iconSpace: 16,
+		cols: 1,
+		colGap: 32,
+		charsPerNumber: 2,
+		delimiter: ":"
+	},
+	
+	ikariMenuHeadline: "Please choose equipment.",
+	ikariMenuProperties: MenuProperties {
+		font: normalFont,
+		disabledFont: disabledFont,
+		cursor: handCursor,
+		charsPerEntry: 12,
+		rows: 6,
+		rowGap: 8,
+		iconSpace: 16,
+		cols: 1,
+		colGap: 32,
+		charsPerAdditionalText: 12,
+		additionalTextGap: 16
+	},
+	noEquipmentText: "No equip",
+	
+	escapeText: "Escapes."
+}
\ No newline at end of file