From ee24d0539ae1a287899ae84d62fd359213f45d48 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Thu, 27 Mar 2025 20:15:39 +0000
Subject: [PATCH] Replace custom oil derrick sprite with palette.

---
 mods/cnc/bits/v19.shp                 | Bin 3601 -> 0 bytes
 mods/cnc/rules/campaign-palettes.yaml |   9 +++++++++
 mods/cnc/rules/palettes.yaml          |   4 ++++
 mods/cnc/rules/tech.yaml              |   4 ++++
 4 files changed, 17 insertions(+)
 delete mode 100644 mods/cnc/bits/v19.shp

diff --git a/mods/cnc/bits/v19.shp b/mods/cnc/bits/v19.shp
deleted file mode 100644
index 033b10d3a26c0178c9b01f05df6a58f790eef96a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3601
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

diff --git a/mods/cnc/rules/campaign-palettes.yaml b/mods/cnc/rules/campaign-palettes.yaml
index 80f5e43425..b1418ae35f 100644
--- a/mods/cnc/rules/campaign-palettes.yaml
+++ b/mods/cnc/rules/campaign-palettes.yaml
@@ -1,5 +1,6 @@
 ^Palettes:
 	-PlayerColorPalette:
+	-PlayerColorPalette@derricks:
 	IndexedPlayerPalette:
 		BasePalette: terrain
 		RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
@@ -15,6 +16,14 @@
 			GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
 			Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
 			Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
+	IndexedPlayerPalette@derricks:
+		BasePalette: terrain
+		BaseName: derrick
+		RemapIndex:  176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 171, 173, 144, 145
+		PlayerIndex:
+			GDI:     176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 179, 180, 188, 180
+			Nod:     127, 126, 125, 124, 122,  46, 120,  47, 125, 124, 123, 122,  42, 121, 120, 120, 124, 122,  42, 122
+			Neutral: 192, 164, 132, 155, 133, 197, 112,  12, 163, 132, 155, 133, 134, 197, 154, 198, 155, 133, 134, 133
 
 ^Vehicle:
 	RenderSprites:
diff --git a/mods/cnc/rules/palettes.yaml b/mods/cnc/rules/palettes.yaml
index 5677d92599..fde7e7aaaa 100644
--- a/mods/cnc/rules/palettes.yaml
+++ b/mods/cnc/rules/palettes.yaml
@@ -97,6 +97,10 @@
 	PlayerColorPalette:
 		BasePalette: terrain
 		RemapIndex: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
+	PlayerColorPalette@derricks:
+		BaseName: derrick
+		BasePalette: terrain
+		RemapIndex: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190, 171, 173, 144, 145
 	MenuPostProcessEffect:
 		MenuEffect: Desaturated
 	CloakPaletteEffect:
diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml
index ee2fc5093b..dd441cf9c1 100644
--- a/mods/cnc/rules/tech.yaml
+++ b/mods/cnc/rules/tech.yaml
@@ -29,6 +29,8 @@ V19:
 	UpdatesDerrickCount:
 	GrantConditionOnCombatantOwner:
 		Condition: enabled
+	RenderSprites:
+		PlayerPalette: derrick
 
 V19.Husk:
 	Inherits: ^CivBuildingHusk
@@ -43,6 +45,8 @@ V19.Husk:
 		Dimensions: 1,1
 	Tooltip:
 		Name: actor-v19-husk-name
+	RenderSprites:
+		PlayerPalette: derrick
 
 HOSP:
 	Inherits: ^TechBuilding