[Sc2-cvs] SF.net SVN: sc2:[3658] trunk/sc2

[<av...@us...>]

Revision: 3658
          http://sc2.svn.sourceforge.net/sc2/?rev=3658&view=rev
Author:   avolkov
Date:     2011-07-20 18:17:42 +0000 (Wed, 20 Jul 2011)

Log Message:
-----------
Added the Ur-Quan to the Hayes' conversation options on the Hierarchy; the encompassing option changed to 'The Hierarchy and their battle thralls'; bug #865

Modified Paths:
--------------
    trunk/sc2/ChangeLog
    trunk/sc2/content/addons/3dovoice/starbase/starbase.txt
    trunk/sc2/content/base/comm/starbase/starbase.txt
    trunk/sc2/src/uqm/comm/starbas/starbas.c

Modified: trunk/sc2/ChangeLog
===================================================================
--- trunk/sc2/ChangeLog	2011-07-20 17:23:43 UTC (rev 3657)
+++ trunk/sc2/ChangeLog	2011-07-20 18:17:42 UTC (rev 3658)
@@ -1,4 +1,6 @@
 Changes towards version 0.8:
+- Added the Ur-Quan to the list of starfaring races on which Commander
+  Hayes provides info (bug #865) - Alex
 - Commander Hayes now advises the player correctly on the number of
   landers one needs (bug #1098) - Alex
 - All Sound Options are now preserved between visits to the setup menu.

Modified: trunk/sc2/content/addons/3dovoice/starbase/starbase.txt
===================================================================
--- trunk/sc2/content/addons/3dovoice/starbase/starbase.txt	2011-07-20 17:23:43 UTC (rev 3657)
+++ trunk/sc2/content/addons/3dovoice/starbase/starbase.txt	2011-07-20 18:17:42 UTC (rev 3658)
@@ -1324,7 +1324,7 @@
 The members of the old Alliance.
 
 #(what_about_hierarchy)
-The battle thralls in the Hierarchy.
+The Hierarchy and their battle thralls.
 
 #(what_about_other)
 Were there any alien races who weren't in the War?

Modified: trunk/sc2/content/base/comm/starbase/starbase.txt
===================================================================
--- trunk/sc2/content/base/comm/starbase/starbase.txt	2011-07-20 17:23:43 UTC (rev 3657)
+++ trunk/sc2/content/base/comm/starbase/starbase.txt	2011-07-20 18:17:42 UTC (rev 3658)
@@ -1324,7 +1324,7 @@
 The members of the old Alliance.
 
 #(what_about_hierarchy)
-The battle thralls in the Hierarchy.
+The Hierarchy and their battle thralls.
 
 #(what_about_other)
 Were there any alien races who weren't in the War?

Modified: trunk/sc2/src/uqm/comm/starbas/starbas.c
===================================================================
--- trunk/sc2/src/uqm/comm/starbas/starbas.c	2011-07-20 17:23:43 UTC (rev 3657)
+++ trunk/sc2/src/uqm/comm/starbas/starbas.c	2011-07-20 18:17:42 UTC (rev 3658)
@@ -302,6 +302,7 @@
 #define HIERARCHY_ANDROSYNTH (1 << 3)
 #define HIERARCHY_ILWRATH (1 << 4)
 #define HIERARCHY_VUX (1 << 5)
+#define HIERARCHY_URQUAN (1 << 6)
 	static BYTE HierarchyMask = 0;
 
 	if (PLAYER_SAID (R, what_about_hierarchy))
@@ -309,6 +310,11 @@
 		NPCPhrase (WHICH_HIERARCHY);
 		HierarchyMask = 0;
 	}
+	else if (PLAYER_SAID (R, urquan))
+	{
+		NPCPhrase (ABOUT_URQUAN);
+		HierarchyMask |= HIERARCHY_URQUAN;
+	}
 	else if (PLAYER_SAID (R, mycon))
 	{
 		NPCPhrase (ABOUT_MYCON);
@@ -340,6 +346,8 @@
 		HierarchyMask |= HIERARCHY_VUX;
 	}
 
+	if (!(HierarchyMask & HIERARCHY_URQUAN))
+		Response (urquan, HierarchyInfo);
 	if (!(HierarchyMask & HIERARCHY_MYCON))
 		Response (mycon, HierarchyInfo);
 	if (!(HierarchyMask & HIERARCHY_SPATHI))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.