From 96fb179e4bfe9b9660add0cfcf1542538a2fc64d Mon Sep 17 00:00:00 2001
From: ADAM David Alan Martin <adam@recursive.engineer>
Date: Wed, 24 Apr 2024 15:51:54 -0400
Subject: [PATCH] Make slave-shields be blue... just a bit of a tweak.

A bit hacky for now...
---
 sc2/content/base/nav/orbitbackground-022.png | Bin 0 -> 5120 bytes
 sc2/content/base/nav/orbitbackground.ani     |   1 +
 sc2/src/uqm/planets/plangen.c                |   6 +++---
 sc2/src/uqm/planets/solarsys.c               |   3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 sc2/content/base/nav/orbitbackground-022.png

diff --git a/sc2/content/base/nav/orbitbackground-022.png b/sc2/content/base/nav/orbitbackground-022.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c320f466ac3748bdf6351dce4492711bd8068a9
GIT binary patch
literal 5120
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
U(`TNq!4#pXq1m{zZb|Qd0J@#Y@c;k-

literal 0
HcmV?d00001

diff --git a/sc2/content/base/nav/orbitbackground.ani b/sc2/content/base/nav/orbitbackground.ani
index 4f967cce1..67f2756ed 100644
--- a/sc2/content/base/nav/orbitbackground.ani
+++ b/sc2/content/base/nav/orbitbackground.ani
@@ -20,3 +20,4 @@ orbitbackground-018.png 0 57 0 0
 orbitbackground-019.png 0 57 9 6
 orbitbackground-020.png 0 57 2 -15
 orbitbackground-021.png 0 57 0 0
+orbitbackground-022.png 0 57 11 10
diff --git a/sc2/src/uqm/planets/plangen.c b/sc2/src/uqm/planets/plangen.c
index 005a968c9..1f6449325 100644
--- a/sc2/src/uqm/planets/plangen.c
+++ b/sc2/src/uqm/planets/plangen.c
@@ -565,7 +565,7 @@ CreateShieldMask (void)
 					red = 0;
 			}
 			
-			*pix = BUILD_COLOR_RGBA (red, 0, 0, alpha);
+			*pix = BUILD_COLOR_RGBA (0, 0, red, alpha);
 		}
 	}
 	
@@ -653,7 +653,7 @@ ApplyShieldTint (void)
 	SetContextClipRect (NULL);
 	GetContextClipRect (&r);
 
-	tint = BUILD_COLOR_RGBA (0xff, 0x00, 0x00, 0xff);
+	tint = BUILD_COLOR_RGBA (0x00, 0x00, 0xff, 0xff);
 #ifdef USE_ALPHA_SHIELD
 	mode = MAKE_DRAW_MODE (DRAW_ALPHA, 150);
 #else
@@ -794,7 +794,7 @@ RenderPlanetSphere (FRAME MaskFrame, int offset, BOOLEAN doThrob)
 				r += c.r;
 				if (r > 255)
 					r = 255;
-				c.r = r;
+				c.b = r;
 			} 
 			else
 			{
diff --git a/sc2/src/uqm/planets/solarsys.c b/sc2/src/uqm/planets/solarsys.c
index 11bd4c0bf..930492d74 100644
--- a/sc2/src/uqm/planets/solarsys.c
+++ b/sc2/src/uqm/planets/solarsys.c
@@ -1532,7 +1532,8 @@ DrawInnerPlanets (PLANET_DESC *planet)
 	if (i < NUMBER_OF_PLANET_TYPES
 			&& (planet->data_index & PLANET_SHIELDED))
 	{	// Shielded world looks "shielded" in inner view
-		s.frame = SetAbsFrameIndex (SpaceJunkFrame, 17);
+		//s.frame = SetAbsFrameIndex (SpaceJunkFrame, 17);
+		s.frame = SetAbsFrameIndex (SpaceJunkFrame, 22);
 	}
 	DrawStamp (&s);