From 50071c4ddc5e790cfc9737713aa5126d130cb9a4 Mon Sep 17 00:00:00 2001 From: avolkov Date: Wed, 20 Jul 2011 18:17:42 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3658 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 2 ++ sc2/content/addons/3dovoice/starbase/starbase.txt | 2 +- sc2/content/base/comm/starbase/starbase.txt | 2 +- sc2/src/uqm/comm/starbas/starbas.c | 8 ++++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index a0fc2137c..a853cf00e 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -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. diff --git a/sc2/content/addons/3dovoice/starbase/starbase.txt b/sc2/content/addons/3dovoice/starbase/starbase.txt index f3af882af..d89908f26 100644 --- a/sc2/content/addons/3dovoice/starbase/starbase.txt +++ b/sc2/content/addons/3dovoice/starbase/starbase.txt @@ -1324,7 +1324,7 @@ No more history, thank you. 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? diff --git a/sc2/content/base/comm/starbase/starbase.txt b/sc2/content/base/comm/starbase/starbase.txt index 7081b25e6..76840df2c 100644 --- a/sc2/content/base/comm/starbase/starbase.txt +++ b/sc2/content/base/comm/starbase/starbase.txt @@ -1324,7 +1324,7 @@ No more history, thank you. 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? diff --git a/sc2/src/uqm/comm/starbas/starbas.c b/sc2/src/uqm/comm/starbas/starbas.c index a7455b326..48accf8ba 100644 --- a/sc2/src/uqm/comm/starbas/starbas.c +++ b/sc2/src/uqm/comm/starbas/starbas.c @@ -302,6 +302,7 @@ HierarchyInfo (RESPONSE_REF R) #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 @@ HierarchyInfo (RESPONSE_REF R) 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 @@ HierarchyInfo (RESPONSE_REF R) HierarchyMask |= HIERARCHY_VUX; } + if (!(HierarchyMask & HIERARCHY_URQUAN)) + Response (urquan, HierarchyInfo); if (!(HierarchyMask & HIERARCHY_MYCON)) Response (mycon, HierarchyInfo); if (!(HierarchyMask & HIERARCHY_SPATHI))