X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=test-data%2Ftest.l2s;h=4fd4e9767b0e52e5ad9f2090c9464a4a539427bd;hb=8f4e771181491f1d83ce0c907b8dda0fbbe0ce93;hp=98553dff786bb759b0110353ed08f50ee677ef91;hpb=10a8d3a83e7ad6815bc9f752922239ef32073a5e;p=l2e.git

diff --git a/test-data/test.l2s b/test-data/test.l2s
index 98553df..4fd4e97 100644
--- a/test-data/test.l2s
+++ b/test-data/test.l2s
@@ -45,6 +45,8 @@ export Monster lizard {
 		gut:  6,
 		mgr:  6
 	},
+	expReward: 2,
+	goldReward: 5,
 	attackAnimation: ComplexAnimation {
 		sprite: lizardSprite,
 		frametime: fourFramesTime,
@@ -433,7 +435,7 @@ export BattleResources battleResources {
 		image: :"move-icons.png",
 		size: <32,32>
 	},
-	
+
 	titleFrame: Frame {
 		image: :"title-frame.png",
 		border: <16,16>
@@ -445,7 +447,7 @@ export BattleResources battleResources {
 		},
 		rowoffset: -2
 	},
-	
+
 	numberAnimationPrototype: ComplexAnimation {
 		frametime: frameTime,
 		repeat: false,
@@ -496,7 +498,7 @@ export BattleResources battleResources {
 		image: :"big-green-numbers.png",
 		size: <16,32>
 	},
-	
+
 	heroTagLabels: Sprite {
 		image: :"hero-tag-sprites.png",
 		size: <32,16>
@@ -518,7 +520,7 @@ export BattleResources battleResources {
 		},
 		rowoffset: -3
 	},
-	
+
 	activeHeroTagFrame: Frame {
 		image: :"tag-frames.png",
 		border: <16,16>
@@ -528,7 +530,7 @@ export BattleResources battleResources {
 		border: <16,16>,
 		offset: < 0,33>
 	},
-	
+
 	smallHeroTagFrame: Frame {
 		image: :"small-tag-frame.png",
 		border: <8,16>
@@ -539,7 +541,7 @@ export BattleResources battleResources {
 		offset: <0,33>
 	},
 	heroesBgColor: (24, 40, 49),
-	
+
 	healthGauge: Gauge {
 		image: :"gauges.png",
 		full:  <0,16>,
@@ -567,7 +569,7 @@ export BattleResources battleResources {
 		repeat:  1,
 		end:     6
 	},
-	
+
 	selectFrame: Frame {
 		image: :"select-frame.png",
 		border: <16,16>
@@ -578,7 +580,7 @@ export BattleResources battleResources {
 		image: :"cursor-hand.png",
 		size: <32,32>
 	},
-	
+
 	weaponTargetCursor: Sprite {
 		image: :"targeting-icons.png",
 		size: <32,32>
@@ -593,14 +595,14 @@ export BattleResources battleResources {
 		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,
@@ -615,7 +617,7 @@ export BattleResources battleResources {
 		charsPerNumber: 2,
 		delimiter: ":"
 	},
-	
+
 	itemMenuHeadline: "Please choose an item.",
 	itemMenuProperties: MenuProperties {
 		font: normalFont,
@@ -630,7 +632,7 @@ export BattleResources battleResources {
 		charsPerNumber: 2,
 		delimiter: ":"
 	},
-	
+
 	ikariMenuHeadline: "Please choose equipment.",
 	ikariMenuProperties: MenuProperties {
 		font: normalFont,
@@ -646,7 +648,7 @@ export BattleResources battleResources {
 		additionalTextGap: 16
 	},
 	noEquipmentText: "No equip",
-	
+
 	escapeText: "Escapes."
 }
 
@@ -672,6 +674,32 @@ Sprite menuActiveCursor {
 	image: :"menu-cursor-active.png",
 	size: <32, 18>
 }
+SimpleAnimation menuCursorAnimation {
+	sprite: menuCursor,
+	frametime: fourFramesTime,
+	framecount: 6,
+	repeat: true
+}
+ComplexAnimation menuActiveCursorAnimation {
+	sprite: menuActiveCursor,
+	frametime: fourFramesTime,
+	repeat: true,
+	frames:
+	[ ComplexAnimationFrame
+		{ row: 0 },
+		{ row: 0 },
+		{ row: 0 },
+		{ row: 0 },
+		{ row: 0 },
+		{ row: 0 },
+		{ row: 0 },
+		{ row: 0 },
+		{ row: 1 },
+		{ row: 2 },
+		{ row: 3 },
+		{ row: 4 }
+	]
+}
 
 export MenuResources menuResources {
 	menubg: Texture {
@@ -697,6 +725,7 @@ export MenuResources menuResources {
 		rowGap: 8,
 		colGap: 32,
 		cursor: menuCursor,
+		cursorAnimation: menuCursorAnimation,
 		font: menuFont,
 		disabledFont: menuInactiveFont,
 		wrapX: true,
@@ -729,7 +758,9 @@ export MenuResources menuResources {
 	intLabel: "INT",
 	gutLabel: "GUT",
 	mgrLabel: "MGR",
+	hpLabel: "HP",
 	ipLabel: "IP",
+	levelLabel: "LEVEL",
 	experienceLabel: "NOW EXP",
 	nextLevelLabel: "NEXT LEVEL",
 	statusMenu: MenuProperties {
@@ -738,6 +769,7 @@ export MenuResources menuResources {
 		charsPerEntry: 6,
 		colGap: 16,
 		cursor: menuCursor,
+		cursorAnimation: menuCursorAnimation,
 		font: menuFont,
 		wrapX: true
 	},
@@ -751,6 +783,8 @@ export MenuResources menuResources {
 		colGap: 16,
 		cursor: menuCursor,
 		selectedCursor: menuActiveCursor,
+		cursorAnimation: menuCursorAnimation,
+		selectedCursorAnimation: menuActiveCursorAnimation,
 		font: menuFont,
 		wrapX: true,
 		wrapY: true
@@ -758,6 +792,7 @@ export MenuResources menuResources {
 	itemMenuUseText: "USE",
 	itemMenuSortText: "SORT",
 	itemMenuDropText: "DROP",
+	itemMenuSelectText: "SELECT",
 	inventoryMenu: MenuProperties {
 		cols: 1,
 		rows: 6,
@@ -765,11 +800,14 @@ export MenuResources menuResources {
 		rowGap: 8,
 		cursor: menuCursor,
 		selectedCursor: menuActiveCursor,
+		cursorAnimation: menuCursorAnimation,
+		selectedCursorAnimation: menuActiveCursorAnimation,
 		font: menuFont,
 		disabledFont: menuInactiveFont,
 		iconSpace: 16,
 		charsPerNumber: 2,
-		delimiter: ":"
+		delimiter: ":",
+		thirdColumnHack: 1
 	},
 	spellMenu: MenuProperties {
 		cols: 2,
@@ -779,6 +817,8 @@ export MenuResources menuResources {
 		colGap: 48,
 		cursor: menuCursor,
 		selectedCursor: menuActiveCursor,
+		cursorAnimation: menuCursorAnimation,
+		selectedCursorAnimation: menuActiveCursorAnimation,
 		font: menuFont,
 		disabledFont: menuInactiveFont,
 		charsPerNumber: 2,
@@ -791,6 +831,8 @@ export MenuResources menuResources {
 		rowGap: 8,
 		cursor: menuCursor,
 		selectedCursor: menuActiveCursor,
+		cursorAnimation: menuCursorAnimation,
+		selectedCursorAnimation: menuActiveCursorAnimation,
 		font: menuFont
 	},
 	equipmentMenu: MenuProperties {
@@ -800,6 +842,8 @@ export MenuResources menuResources {
 		rowGap: 16,
 		cursor: menuCursor,
 		selectedCursor: menuActiveCursor,
+		cursorAnimation: menuCursorAnimation,
+		selectedCursorAnimation: menuActiveCursorAnimation,
 		font: normalFont,
 		iconSpace: 16,
 		wrapY: true
@@ -815,6 +859,7 @@ export MenuResources menuResources {
 		charsPerEntry: 8,
 		rowGap: 32,
 		cursor: menuCursor,
+		cursorAnimation: menuCursorAnimation,
 		font: menuFont,
 		wrapY: true
 	},
@@ -835,6 +880,7 @@ export MenuResources menuResources {
 		charsPerEntry: 14,
 		rowGap: 8,
 		cursor: menuCursor,
+		cursorAnimation: menuCursorAnimation,
 		font: menuFont
 	},
 	scenarioMenuHeadline: "SCENARIO ITEM",
@@ -844,7 +890,25 @@ export MenuResources menuResources {
 	},
 	capsuleMenu: MenuProperties {
 		cols: 3,
-		rows: 1
+		rows: 1,
+		charsPerEntry: 7,
+		cursor: menuCursor,
+		selectedCursor: menuActiveCursor,
+		cursorAnimation: menuCursorAnimation,
+		selectedCursorAnimation: menuActiveCursorAnimation,
+		font: menuFont,
+		thirdColumnHack: 2
+	},
+	capsuleFeedMenu: MenuProperties {
+		cols: 2,
+		rows: 1,
+		charsPerEntry: 7,
+		colGap: 32,
+		cursor: menuCursor,
+		selectedCursor: menuActiveCursor,
+		cursorAnimation: menuCursorAnimation,
+		selectedCursorAnimation: menuActiveCursorAnimation,
+		font: menuFont
 	},
 	capsuleFeedLabel: "FEED",
 	capsuleChangeLabel: "CHANGE",
@@ -854,5 +918,90 @@ export MenuResources menuResources {
 	capsuleTribeLabel: "TRIBE",
 	capsuleAttack1Label: "SP.1",
 	capsuleAttack2Label: "SP.2",
-	capsuleAttack3Label: "SP.3"
+	capsuleAttack3Label: "SP.3",
+	capsuleNoAttackText: "Nothing",
+	capsuleNotHungryText: "I'm not hungry.",
+	capsuleNameSelect: CharSelect {
+		font: menuFont,
+		cursor: Sprite {
+			image: :"alpha-cursor.png",
+			size: <20, 28>
+		},
+		chars: "0123456789ABCDEabcdeFGHIJfghijKLMNOklmnoPQRSTpqrstUVWXYuvwxyZ!?  z!?  ",
+		width: 10,
+		groupX: 5
+	},
+	capsuleSelectTopLeft: Sprite {
+		image: :"capsule-sprites.png",
+		size: <32, 8>,
+		offset: <64, 0>
+	},
+	capsuleSelectTopRight: Sprite {
+		image: :"capsule-sprites.png",
+		size: <32, 8>,
+		offset: <128, 0>
+	},
+	capsuleSelectTopRepeat: Texture {
+		image: :"capsule-sprites.png",
+		size: <32, 8>,
+		offset: <96, 0>
+	},
+	capsuleSelectBottomLeft: Sprite {
+		image: :"capsule-sprites.png",
+		size: <32, 32>,
+		offset: <0, 32>
+	},
+	capsuleSelectBottomRight: Sprite {
+		image: :"capsule-sprites.png",
+		size: <32, 32>,
+		offset: <128, 64>
+	},
+	capsuleSelectBottomRepeat: Sprite {
+		image: :"capsule-sprites.png",
+		size: <32, 32>,
+		offset: <0, 64>
+	},
+	capsuleSelectLeftRepeat: Texture {
+		image: :"capsule-sprites.png",
+		size: <32, 32>
+	},
+	capsuleSelectRightRepeat: Texture {
+		image: :"capsule-sprites.png",
+		size: <32, 32>,
+		offset: <128, 32>
+	},
+	capsuleSelectLadder: Sprite {
+		image: :"capsule-sprites.png",
+		size: <32, 24>,
+		offset: <64, 8>
+	},
+	capsuleSelectCursor: Sprite {
+		image: :"capsule-sprites.png",
+		size: <32, 24>,
+		offset: <128, 8>
+	},
+	capsuleAlignmentWheel: Sprite {
+		image: :"capsule-sprites.png",
+		size: <128, 128>,
+		offset: <0, 128>
+	},
+	capsuleAlignmentCursor: Sprite {
+		image: :"capsule-sprites.png",
+		size: <32, 32>,
+		offset: <128, 128>
+	},
+	capsuleGrowthLabel: Sprite {
+		image: :"capsule-feed.png",
+		size: <32, 10>
+	},
+	capsuleGrowthBar: Sprite {
+		image: :"capsule-feed.png",
+		size: <8, 10>,
+		offset: <8, 10>
+	},
+	capsuleGrowthBarFilled: Sprite {
+		image: :"capsule-feed.png",
+		size: <8, 10>,
+		offset: <0, 10>
+	}
 }