Fix Cursor file

ABrandau · Nov 25, 2023 · d448fa7 · d448fa7
1 parent 15f465a
commit d448fa7
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 20 deletions.
diff --git a/mods/sp/cursors.yaml b/mods/sp/cursors.yaml
@@ -1,40 +1,61 @@
-Palettes:
-	cursor: mousepal.pal
-
 Cursors:
-	mouse.shp: cursor
+	mouse.shp: mouse
 		scroll-t:
 			Start: 2
+			Y: -19
 		scroll-tr:
 			Start: 3
+			X: 26
+			Y: -16
 		scroll-r:
 			Start: 4
+			X: 28
 		scroll-br:
 			Start: 5
+			X: 25
+			Y: 19
 		scroll-b:
 			Start: 6
+			Y: 18
 		scroll-bl:
 			Start: 7
+			X: -26
+			Y: 16
 		scroll-l:
 			Start: 8
+			X: -28
 		scroll-tl:
 			Start: 9
+			X: -26
+			Y: -16
 		scroll-t-blocked:
 			Start: 10
+			Y: -19
 		scroll-tr-blocked:
 			Start: 11
+			X: 26
+			Y: -16
 		scroll-r-blocked:
 			Start: 12
+			X: 28
 		scroll-br-blocked:
 			Start: 13
+			X: 25
+			Y: 19
 		scroll-b-blocked:
 			Start: 14
+			Y: 18
 		scroll-bl-blocked:
 			Start: 15
+			X: -26
+			Y: 16
 		scroll-l-blocked:
 			Start: 16
+			X: -28
 		scroll-tl-blocked:
 			Start: 17
+			X: -26
+			Y: -16
 		select:
 			Start: 18
 			Length: 12
@@ -66,7 +87,7 @@ Cursors:
 		attack:
 			Start: 53
 			Length: 5
-		attack-blocked:
+		attack-blocked: # TODO: unused
 			Start: 41
 			Length: 1
 		attack-minimap:
@@ -78,15 +99,6 @@ Cursors:
 		attackoutsiderange-minimap:
 			Start: 63
 			Length: 5
-		attackmove:
-			Start: 58
-			Length: 5
-		assaultmove:
-			Start: 8
-			Length: 4
-		attackmove-minimap:
-			Start: 68
-			Length: 5
 		harvest:
 			Start: 53
 			Length: 5
@@ -144,14 +156,17 @@ Cursors:
 			Start: 120
 			Length: 9
 		goldwrench:
-			Start: 170
-			Length: 24
-		goldwrench-blocked:
-			Start: 213
+			Start: 150
+			Length: 20
+		goldwrench-blocked: #TODO
+			Start: 190
 			Length: 1
 		ioncannon:
 			Start: 279
 			Length: 20
+		bioweapon:
+			Start: 299
+			Length: 10
 		nuke:
 			Start: 319
 			Length: 9
@@ -164,7 +179,7 @@ Cursors:
 		sell:
 			Start: 129
 			Length: 10
-		sell-minimap:
+		sell-minimap: #TODO: unused
 			Start: 139
 			Length: 10
 		sell-blocked:
@@ -203,3 +218,29 @@ Cursors:
 			Start: 385
 		joystick-tl-blocked:
 			Start: 386
+	attackmove.shp: mouse
+		attackmove:
+			Start: 0
+			Length: 10
+		attackmove-blocked:
+			Start: 10
+			Length: 1
+		attackmove-minimap:
+			Start: 11
+			Length: 10
+		attackmove-minimap-blocked:
+			Start: 21
+			Length: 1
+	assaultmove.shp: mouse
+		assaultmove:
+			Start: 0
+			Length: 10
+		assaultmove-blocked:
+			Start: 10
+			Length: 1
+		assaultmove-minimap:
+			Start: 11
+			Length: 10
+		assaultmove-minimap-blocked:
+			Start: 21
+			Length: 1
diff --git a/mods/sp/mod.yaml b/mods/sp/mod.yaml
@@ -209,7 +209,7 @@ MapGrid:
 	DefaultSubCell: 2
 
 Cursors:
-	ts|cursors.yaml
+	sp|cursors.yaml
 
 Chrome:
 	sp|chrome.yaml

diff --git a/mods/sp/rules/structures.yaml b/mods/sp/rules/structures.yaml
@@ -1357,6 +1357,7 @@ MUTSW2:
 	ProvidesPrerequisite@swlimit:
 		Prerequisite: enoughmutsw2
 	NukePower:
+		Cursor: bioweapon
 		Prerequisites:
 			1: mutsw2
 		MissileWeapons: