Merge pull request #8996 from Mailaender/alpha-cloak

Added pre-multiplied alpha palettes for cloak effects
2015-09-13 18:53:17 +02:00
parent 47f07a47bd 4b1bedd7dd
commit 48ecc717b2
11 changed files with 32 additions and 18 deletions
--- a/mods/d2k/rules/infantry.yaml
+++ b/mods/d2k/rules/infantry.yaml
@@ -135,6 +135,7 @@ fremen:
 		CloakDelay: 250
 		CloakSound: STEALTH1.WAV
 		UncloakSound: STEALTH2.WAV
+		IsPlayerPalette: true
 	-MustBeDestroyed:
 	Voiced:
 		VoiceSet: FremenVoice
--- a/mods/d2k/rules/palettes.yaml
+++ b/mods/d2k/rules/palettes.yaml
@@ -26,12 +26,6 @@
 		G: 0
 		B: 0
 		A: 140
-	PaletteFromRGBA@cloak:
-		Name: cloak
-		R: 0
-		G: 0
-		B: 0
-		A: 140
 	PaletteFromRGBA@highlight:
 		Name: highlight
 		R: 255
@@ -87,4 +81,8 @@
 		Premultiply: false
 	PlayerHighlightPalette:
 	FlashPaletteEffect:
+	PaletteFromPlayerPaletteWithAlpha@cloak:
+		BaseName: cloak
+		BasePalette: player
+		Alpha: 0.55

--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -355,6 +355,7 @@ stealth_raider:
 		CloakDelay: 90
 		CloakSound: STEALTH1.WAV
 		UncloakSound: STEALTH2.WAV
+		IsPlayerPalette: true
 	AutoTarget:
 		InitialStance: HoldFire
 	-MustBeDestroyed: