From cffaabb3bfb8737a57736bb95e2d2fd2f41e025b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 2 Jun 2012 11:41:18 +0200
Subject: [PATCH] added d2k mouse pointer, fixed aircrafts

---
 mods/d2k/bits/cursor.pal       | Bin 768 -> 0 bytes
 mods/d2k/cursors.yaml          | 161 +++++++++++++--------------------
 mods/d2k/rules/aircraft.yaml   |   8 +-
 mods/d2k/rules/defaults.yaml   |   6 --
 mods/d2k/rules/structures.yaml |   2 +
 mods/d2k/rules/system.yaml     |   2 +-
 ripD2kGameFiles.sh             |   6 ++
 7 files changed, 80 insertions(+), 105 deletions(-)
 delete mode 100644 mods/d2k/bits/cursor.pal

diff --git a/mods/d2k/bits/cursor.pal b/mods/d2k/bits/cursor.pal
deleted file mode 100644
index bb63fcdd50490a6ace83199cf15196a1e551c57e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 768
zcmWlX>5{7;5QV#v7<b|Zh>8wGj7yAT)^T#DeE+w)r215IPWK<`0|4kh^=V|qs}{yR
z)(Lb-lJ&FKUJv_zUDw@qyWJUvvA0aqv~1gUJjZc7*Y*7nAt!YFz;OeFbVv?icwh<A
z!4GpBMG=lLi5S6{#Sz1d#hk?~BV3D9!c%=@B`Z0XB#{M?Wu6Pl1uGR7GE-U&?-j2*
z-uERfJ6ZNb)a6l@a>&#yrBF(A>NpHXDaS@#I@Nd0Wgd^`;d&jf%X9gAl*_evOxb)+
z$By(3u4P>FKolrvh+r4Tb`)C3H+|P|tPP!Cw7b&dNO||^+K;aZ;Qrmtqq_9sd@8#-
zS6`{jlPZngKhM`~zFp3juIXx_szMa3APJ3v<lrA%$2Iq$q0RtD00Qs#ds&wI{XR|8
zFbr+mDy5{9RaF&5!5E{I#&N76YSx<jyomF?I!#;-dD*Z`YHo4N4hQUcp>6y7y}eu4
z)B1pQgjK@N@^`!cj?=5{uSa#M#E|ipWGciGMU@wD2j!NV?p?gK!j0jJZs6*~z9i0h
zNKzEVw&xp`9oAJKIO4gPr+X5cL9q3Gu&nX9R@1*wEl&Bg@ogWD#^JQ{<h`lBWi}Rg
zpkWgu5qO1br?$B+YJF6HbMYSVZyPMN^C)+73S$Hvg2n-1LB0dJffxV*(C-ePo4A$p
zJU<`Lm44v80iFOi0R0eW00kfbH~<4M_Z!>VI`+=<421MGttfJm#3KaJG+<ej7nql{
L`pSgl`ak~%DU?vj

diff --git a/mods/d2k/cursors.yaml b/mods/d2k/cursors.yaml
index 24842a8825..81225c9004 100644
--- a/mods/d2k/cursors.yaml
+++ b/mods/d2k/cursors.yaml
@@ -1,262 +1,229 @@
 Palettes:
-	cursor: cursor.pal
+	cursor: d2k.pal
 
 Cursors:
 	mouse: cursor
 		scroll-t:
-			start:1
+			start:112
 			x: 12
 			y: 12
 		scroll-tr:
-			start: 2
+			start: 120
 			x: 12
 			y: 12
 		scroll-r:
-			start: 3
+			start: 128
 			x: 12
 			y: 12
 		scroll-br:
-			start: 4
+			start: 136
 			x: 12
 			y: 12
 		scroll-b:
-			start:5
+			start:148
 			x: 12
 			y: 12
 		scroll-bl:
-			start:6
+			start:156
 			x: 12
 			y: 12
 		scroll-l:
-			start:7
+			start:164
 			x: 12
 			y: 12
 		scroll-tl:
-			start:8
+			start:172
 			x: 12
 			y: 12
 		scroll-t-blocked:
-			start:124
+			start:180
 			x: 12
 			y: 12
 		scroll-tr-blocked:
-			start:125
+			start:188
 			x: 12
 			y: 12
 		scroll-r-blocked:
-			start:126
+			start:196
 			x: 12
 			y: 12
 		scroll-br-blocked:
-			start:127
+			start:204
 			x: 12
 			y: 12
 		scroll-b-blocked:
-			start:128
+			start:212
 			x: 12
 			y: 12
 		scroll-bl-blocked:
-			start:129
+			start:220
 			x: 12
 			y: 12
 		scroll-l-blocked:
-			start:130
+			start:228
 			x: 12
 			y: 12
 		scroll-tl-blocked:
-			start:131
+			start:236
 			x: 12
 			y: 12
 		select:
-			start:15
-			length: 6
+			start:40
+			length: 8
 			x: 12
 			y: 12
 	
 		default:
 			start:0
 		default-minimap:
-			start:80
+			start:0
 		generic-blocked:
-			start:9
+			start:24
 		generic-blocked-minimap:
-			start:33
+			start:24
 		move:
-			start:10
-			length: 4
+			start:8
+			length: 8
 			x: 12
 			y: 12
 		move-minimap:
-			start:29
-			length: 4
+			start:48
+			length: 8
 			x: 12
 			y: 12
 		move-blocked:
-			start:14
+			start:24
 			x: 12
 			y: 12
 		move-blocked-minimap:
-			start:33
+			start:24
 			x: 12
 			y: 12
 		attack:
-			start:195
+			start:16
 			length: 8
 			x: 12
 			y: 12
 		attack-minimap:
-			start:203
+			start:16
 			length: 8
 			x: 12
 			y: 12
 		attackmove:
-			start:21
+			start:16
 			length: 8
 			x: 12
 			y: 12
 		attackmove-minimap:
-			start:134
+			start:16
 			length: 8
 			x: 12
 			y: 12
 		harvest:
-			start:21
+			start:16
 			length: 8
 			x: 12
 			y: 12
 		harvest-minimap:
-			start:134
+			start:203
 			length: 8
 			x: 12
 			y: 12
 		enter:
-			start:113
-			length: 3
+			start:32
+			length: 8
 			x: 12
 			y: 12
 		enter-minimap:
-			start:139
-			length: 3
+			start:32
+			length: 8
 			x: 12
 			y: 12
 		enter-blocked:
-			start:212
+			start:104
 			length: 1
 			x: 12
 			y: 12
 		enter-blocked-minimap:
-			start:33
+			start:104
 		c4:
-			start:116
-			length: 3
+			start:252
+			length: 8
 			x: 12
 			y: 12
 		c4-minimap:
-			start:121
-			length: 3
+			start:252
+			length: 8
 			x: 12
 			y: 12
 		guard:
-			start:147
-			length: 1
+			start:72
+			length: 8
 			x: 12
 			y: 12
 		guard-minimap:
-			start:146
-			length: 1
+			start:72
+			length: 8
 			x: 12
 			y: 12
 		capture:
-			start:164
-			length: 3
+			start:32
+			length: 8
 			x: 12
 			y: 12
 		capture-minimap:
-			start:167
-			length: 3
-			x: 12
-			y: 12
-		heal:
-			start:160
-			length: 4
-			x: 12
-			y: 12
-		heal-minimap:
-			start:194
-			length: 1
+			start:32
+			length: 8
 			x: 12
 			y: 12
 		ability:
-			start:82
+			start:96
 			length: 8
 			x: 12
 			y: 12
 		ability-minimap:
-			start:214
+			start:96
 			length: 8
 			x: 12
 			y: 12
 
 # Cursors that need minimap variants
 		deploy:
-			start:59
-			length: 9
+			start:96
+			length: 8
 			x: 12
 			y: 12
 		deploy-blocked:
-			start:211
-			length: 1
-			x: 12
-			y: 12
-		goldwrench:
-			start:170
-			length: 24
-			x: 12
-			y: 12
-		goldwrench-blocked:
-			start:213
+			start:104
 			length: 1
 			x: 12
 			y: 12
 		nuke:
-			start:90
-			length: 7
-			x: 12
-			y: 12
-		chrono-select:
-			start:97
-			length: 8
-			x: 12
-			y: 12
-		chrono-target:
-			start:105
+			start:244
 			length: 8
 			x: 12
 			y: 12
 
 		sell:
-			start:68
-			length: 12
+			start:80
+			length: 8
 			x: 12
 			y: 12
 		sell-blocked:
-			start:119
+			start:56
 			length: 1
 			x: 12
 			y: 12
 		repair:
-			start:35
-			length: 24
+			start:88
+			length: 8
 			x: 12
 			y: 12
 		repair-blocked:
-			start:120
+			start:64
 			length: 1
 			x: 12
 			y: 12
-		sell2:
-			start:148
-			length: 12
 
 	nopower: cursor
 		powerdown-blocked:
diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
index 3e31d5d373..ff0e4b8ac7 100644
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -22,6 +22,8 @@ CARRYALL:
 		ROT: 5
 		Speed: 15
 		LandableTerrainTypes: Clear,Rough,Road,Ore,Beach
+		RepairBuildings: repaira,repairo,repairh
+		RearmBuildings: hightecha
 	RenderUnit:
 	RenderCargo:
 	WithShadow:
@@ -32,7 +34,7 @@ CARRYALL:
 	FallsToEarth:
 		Explosion: UnitExplode
 
-C17:
+FRIGATE:
 	ParaDrop:
 		LZRange: 1
 	Inherits: ^Plane
@@ -42,6 +44,8 @@ C17:
 	Plane:
 		ROT: 5
 		Speed: 35
+		RepairBuildings: repaira,repairo,repairh
+		RearmBuildings: hightecha
 	Health:
 		HP: 25
 	Armor:
@@ -85,6 +89,8 @@ ORNI:
 		InitialFacing: 20
 		ROT: 4
 		Speed: 12
+		RepairBuildings: repaira,repairo,repairh
+		RearmBuildings: hightecha
 	RenderUnit:
 	WithShadow:
 	Selectable:
diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index ab551367a8..b9a5a7e09a 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -110,9 +110,6 @@
 	TargetableAircraft:
 		TargetTypes: Air
 		GroundedTargetTypes: Ground
-	Plane:
-		RepairBuildings: repaira,repairo,repairh
-		RearmBuildings: hightecha
 	HiddenUnderFog:
 	GainsExperience:
 	GivesExperience:
@@ -132,9 +129,6 @@
 
 ^Helicopter:
 	Inherits: ^Plane
-	Helicopter:
-		RepairBuildings: repaira,repairo,repairh
-		RearmBuildings: hightecha
 
 ^Building:
 	AppearsOnRadar:
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index 462db8330b..eb87a5a3b5 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -344,6 +344,8 @@
 		ExitCell: 3,1
 	ProductionAirdrop:
 		Produces: Vehicle
+		ReadyAudio: AI_REINF.AUD
+		ActorType: frigate
 	ProductionQueue:
 		Type: Vehicle
 		Group: Vehicle
diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml
index 10356cf2c9..b89f4c3f53 100644
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -132,7 +132,7 @@ World:
 		Filename: d2k.pal
 	PaletteFromFile@effect:
 		Name: effect
-		Filename: temperat.pal
+		Filename: d2k.pal
 	PaletteFromRGBA@shadow:
 		Name: shadow
 		R: 0
diff --git a/ripD2kGameFiles.sh b/ripD2kGameFiles.sh
index 7d362d6212..8767030ea7 100755
--- a/ripD2kGameFiles.sh
+++ b/ripD2kGameFiles.sh
@@ -376,4 +376,10 @@ mono OpenRA.Utility.exe --shp windtrap_anim.png 96
 mono OpenRA.Utility.exe --r8 $R8 $PAL 4820 4840 "missile_launch"
 mono OpenRA.Utility.exe --shp missile_launch.png 96
 
+R8="/home/matthias/.openra/Content/d2k/MOUSE.R8"
+PAL="mods/d2k/bits/d2k.pal"
+
+mono OpenRA.Utility.exe --r8 $R8 $PAL 0 264 "mouse" --transparent
+mono OpenRA.Utility.exe --shp mouse.png 48
+
 mv *.shp mods/d2k/bits
\ No newline at end of file