From 92b94a6104e3282b2ffb6ede04fbe79eee4015cd Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sat, 7 May 2011 17:40:45 +0000
Subject: [PATCH] Added an alternate Umgah Caster lander report for when Spathi
 do not slave-shield selves; bug #1122

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3598 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/content/base/lander/energy/umgahcaster.txt | 15 +++++++++++++++
 sc2/src/uqm/planets/generate/genspa.c          |  8 ++++++++
 2 files changed, 23 insertions(+)

diff --git a/sc2/content/base/lander/energy/umgahcaster.txt b/sc2/content/base/lander/energy/umgahcaster.txt
index f8bee1b03..4fcafe215 100644
--- a/sc2/content/base/lander/energy/umgahcaster.txt
+++ b/sc2/content/base/lander/energy/umgahcaster.txt
@@ -44,4 +44,19 @@ CAPTAIN. THIS IS LIEUTENANT ROBINSON, SIR. WE HAVE LOCATED AN ALIEN ARTIFACT DOW
     TO DESTROY SPATHIWA. WE THOUGHT
     MAYBE YOU'D LIKE TO HAVE IT.
 
+     ---- END OF TRANSMISSION ----
+#(UMGTRANS 2)
+     ---- REPORT FROM SURFACE ----
+
+CAPTAIN. THIS IS LIEUTENANT ROBINSON, SIR. WE HAVE LOCATED AN ALIEN ARTIFACT DOWN HERE. WE WERE INVESTIGATING THIS LARGE BLUE MACHINE WHEN OFFICER TALBOT DISCOVERED A NOTE GLUED TO THE SIDE OF THE DEVICE. I'LL READ IT TO YOU...
+
+    THIS MACHINE IS THE SUPER-
+    POWERFUL HYPERWAVE CASTER THAT
+    THE UMGAH USED TO TRICK US INTO
+    BELIEVING THAT THE `GRAND MASTER
+    PLANET EATERS' WERE COMING TO
+    DESTROY SPATHIWA. WE THOUGHT
+    MAYBE SOMEONE WOULD LIKE TO HAVE
+    IT.
+
      ---- END OF TRANSMISSION ----
diff --git a/sc2/src/uqm/planets/generate/genspa.c b/sc2/src/uqm/planets/generate/genspa.c
index 12ddf49fd..c80e1342e 100644
--- a/sc2/src/uqm/planets/generate/genspa.c
+++ b/sc2/src/uqm/planets/generate/genspa.c
@@ -166,6 +166,14 @@ GenerateSpathi_generateOrbital (SOLARSYS_STATE *solarSys, PLANET_DESC *world)
 					CaptureDrawable (LoadGraphic (UMGAH_BCS_MASK_PMAP_ANIM));
 			solarSys->SysInfo.PlanetInfo.DiscoveryString =
 					CaptureStringTable (LoadStringTable (UMGAH_BCS_STRTAB));
+			if (!GET_GAME_STATE (SPATHI_SHIELDED_SELVES))
+			{	// The first report talks extensively about Spathi
+				// slave-shielding selves. If they never did so, the report
+				// makes no sense, so use an alternate.
+				solarSys->SysInfo.PlanetInfo.DiscoveryString =	
+						SetAbsStringTableIndex (
+						solarSys->SysInfo.PlanetInfo.DiscoveryString, 1);
+			}
 		}
 		LoadPlanet (NULL);
 		return true;