Simplify and polish D2k effects/palettes.

OpenRA.Mods.Common/UpdateRules/Rules/20231010/ReplacePaletteModifiers.cs

@@ -21,14 +21,18 @@ public class ReplacePaletteModifiers : UpdateRule
 			"MenuPaletteEffect is renamed to MenuPostProcessEffect\n" +
 			"ChronoshiftPaletteEffect is renamed to ChronoshiftPostProcessEffect\n" +
 			"FlashPaletteEffect is renamed to FlashPostProcessEffect\n" +
-			"GlobalLightingPaletteEffect is renamed to TintPostProcessEffect";
+			"GlobalLightingPaletteEffect is renamed to TintPostProcessEffect\n" +
+			"D2kFogPalette is removed\n" +
+			"PaletteFromScaledPalette is removed";
 
 		public override IEnumerable<string> UpdateActorNode(ModData modData, MiniYamlNodeBuilder actorNode)
 		{
 			actorNode.RenameChildrenMatching("MenuPaletteEffect", "MenuPostProcessEffect");
 			actorNode.RenameChildrenMatching("ChronoshiftPaletteEffect", "ChronoshiftPostProcessEffect");
 			actorNode.RenameChildrenMatching("FlashPaletteEffect", "FlashPostProcessEffect");
 			actorNode.RenameChildrenMatching("GlobalLightingPaletteEffect", "TintPostProcessEffect");
+			actorNode.RemoveNodes("D2kFogPalette");
+			actorNode.RemoveNodes("PaletteFromScaledPalette");
 
 			yield break;
 		}

mods/d2k/bits/fog.pal

@@ -0,0 +1 @@
+??????>>>===<<<;;;:::999888777666555333222111000///...---,,,+++***)))((('''&&&%%%$$$###"""!!!    ? ;! ?! ?$#?'&?*)?,,?//?21?54?774 %7 '; )? +?#-?&/?)1?,3$ $( (, ,0 /4 37 7; ;? ?? ??"??#??%??&??(??)??+??,??.??0??1??3??4??6??7?  $  (  ,  0  4  7  ;  ?##?&&?))?,,?//?11?44?77? (4 )7 *; ,?#.?&0?)2?,4? $$ (( ,, /0 34 77 ;; ?? ??"??#??%??&??(??)??+??,??.??0??1??3??4??6??7?? $! (# ,$ 0% 4& 7( ;) ?*#?,&?/)?1,?3/?51?74?97?: $  (  ,  0  4  7  ;  ? #?#&?&)?),?,/?/1?24?47?7$" %# '$ (% )& +' ,( -( /) 1+ 3, 4-!4."5.$5/%60&60(71)72*83+83,94-94.:5/:61;62;74<85<86<97=:8>;:????????????????????????::':6':1':,':'':',:'1:'69':4':.':)':'*:'0:'5:'::':4':/':)*:'/:'5:'::'   7??'.5?3)><6)3)>??& ?'?????7??7???????????5$4=%4??+7??7??7)5>(!,05?3)=$4 *5??+>??>??=?+121332:32?32?>5???=%4???

mods/d2k/rules/arrakis.yaml

@@ -4,10 +4,8 @@ spicebloom.spawnpoint:
 		Name: Spice Bloom spawnpoint
 	AlwaysVisible:
 	RenderSpritesEditorOnly:
-		Image: spicebloom
-		Palette: effect50alpha
+		Image: spicebloom.editor
 	WithSpriteBody:
-		Sequence: grow3
 	BodyOrientation:
 		QuantizedFacings: 1
 	GrantConditionOnTerrain:

mods/d2k/rules/campaign-palettes.yaml

@@ -1,6 +1,5 @@
 ^Palettes:
 	-PlayerColorPalette:
-	-PaletteFromPlayerPaletteWithAlpha@deviatorgas:
 	-PaletteFromPlayerPaletteWithAlpha@cloak:
 	IndexedPlayerPalette:
 		BasePalette: d2k
@@ -16,11 +15,6 @@
 			Mercenaries: 239, 238, 237, 236, 235, 234, 233, 232, 231, 230, 229, 228, 227, 226, 225, 224
 			Neutral: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
 			Creeps: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
-	PaletteFromPlayerPaletteWithAlpha@DeviatorGas:
-		BaseName: deviatorgas
-		BasePalette: player
-		Alpha: 0.68
-		Premultiply: false
 	PaletteFromPlayerPaletteWithAlpha@Cloak:
 		BaseName: cloak
 		BasePalette: player

mods/d2k/rules/palettes.yaml

@@ -22,29 +22,11 @@
 		BasePalette: d2k
 		RemapIndex: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
 		AllowModifiers: false
-	PaletteFromEmbeddedSpritePalette@moveflash-base:
-		Name: moveflash-base
+	PaletteFromEmbeddedSpritePalette@moveflash:
+		Name: moveflash
 		Filename: DATA.R8
 		Frame: 3874
-	PaletteFromScaledPalette@moveflash:
-		Name: moveflash
-		BasePalette: moveflash-base
-		Scale: -1
-		Offset: 255
-		AllowModifiers: false
-	PaletteFromPaletteWithAlpha@effect75alpha:
-		Name: effect75alpha
-		BasePalette: effect
-		Alpha: 0.75
-	PaletteFromPaletteWithAlpha@effect50alpha:
-		Name: effect50alpha
-		BasePalette: effect
-		Alpha: 0.5
-	PaletteFromScaledPalette@starportlights:
-		Name: starportlights
-		BasePalette: d2k
 		AllowModifiers: false
-		Offset: -64
 	PaletteFromEmbeddedSpritePalette@shroud:
 		Name: shroud
 		Filename: DATA.R8
@@ -53,17 +35,13 @@
 		Name: smoke3
 		Filename: DATA.R8
 		Frame: 3747
-	D2kFogPalette@fog:
+	PaletteFromFile@fog:
 		Name: fog
-		BasePalette: shroud
+		Filename: fog.pal
+		AllowModifiers: false
 	PlayerColorPalette:
 		BasePalette: d2k
 		RemapIndex: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
-	PaletteFromPlayerPaletteWithAlpha@deviatorgas:
-		BaseName: deviatorgas
-		BasePalette: player
-		Alpha: 0.68
-		Premultiply: false
 	MenuPostProcessEffect:
 	FlashPostProcessEffect:
 	PaletteFromPlayerPaletteWithAlpha@cloak:

mods/d2k/rules/structures.yaml

@@ -675,7 +675,6 @@ starport:
 			smuggler: starport.smuggler
 	WithDeliveryOverlay:
 		RequiresCondition: !build-incomplete
-		Palette: starportlights
 	ProductionBar:
 		ProductionType: Starport
 	PrimaryBuilding:
@@ -926,7 +925,6 @@ repair_pad:
 			corrino: repair_pad.harkonnen
 	WithRepairOverlay:
 		RequiresCondition: !build-incomplete
-		Palette: effect75alpha
 	Power:
 		Amount: -50
 	ProvidesPrerequisite@buildingname:

mods/d2k/rules/vehicles.yaml

@@ -100,7 +100,6 @@ harvester:
 		OwnerType: InternalName
 		EffectiveOwnerFromOwner: true
 	WithHarvestOverlay:
-		Palette: effect50alpha
 	WithDockingAnimation:
 	AttractsWorms:
 		Intensity: 700

mods/d2k/sequences/infantry.yaml

@@ -650,6 +650,7 @@ sandworm:
 		Start: 3818
 		Length: 20
 		Tick: 100
+		Alpha: 0.5
 	idle:
 		Filename: DATA.R8
 		Start: 39

mods/d2k/sequences/misc.yaml

@@ -7,6 +7,8 @@ explosion:
 		Filename: DATA.R8
 		Start: 3879
 		Length: 5
+		BlendMode: Alpha
+		Alpha: 0.5
 	piffs:
 		Filename: DATA.R8
 		Start: 3682
@@ -31,6 +33,7 @@ explosion:
 		Filename: DATA.R8
 		Start: 3686
 		Length: 15
+		BlendMode: Alpha
 	building:
 		Filename: DATA.R8
 		Start: 3701
@@ -57,6 +60,7 @@ explosion:
 		Filename: DATA.R8
 		Start: 3765
 		Length: 23
+		Alpha: 0.5
 		BlendMode: Alpha
 		Offset: 12, -10
 		Tick: 120
@@ -120,6 +124,7 @@ bazooka_trail2:
 		Length: 4
 		Tick: 80
 		ZOffset: 1023
+		Alpha: 0.5
 
 deviator_trail:
 	idle:
@@ -128,6 +133,7 @@ deviator_trail:
 		Length: 5
 		Tick: 80
 		ZOffset: 1023
+		Alpha: 0.5
 
 laserfire:
 	idle:
@@ -281,6 +287,7 @@ crate-effects:
 		Filename: DATA.R8
 		Start: 4200
 		Length: 18
+		Alpha: 0.5
 	hide-map:
 		Filename: DATA.R8
 		Frames: 4217, 4216, 4215, 4214, 4213, 4212, 4211, 4210, 4209, 4208, 4207, 4206, 4205, 4204, 4203, 4202, 4201, 4200
@@ -536,13 +543,22 @@ spicebloom:
 		ZOffset: 511
 		Offset: 0, -16
 
+spicebloom.editor:
+	idle:
+		Filename: DATA.R8
+		Start: 109
+		Length: 1
+		ZOffset: -1023
+		Offset: -16,-16
+		Alpha: 0.5
+
 moveflsh:
 	idle:
 		Filename: DATA.R8
 		Start: 3874
 		Length: 5
 		Tick: 80
-		BlendMode: Multiply
+		BlendMode: Subtractive
 		ZOffset: 2047
 
 resources: