adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3658 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2011-07-20 18:17:42 +00:00
parent fcb60bcbff
commit 50071c4ddc
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.8: 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 - Commander Hayes now advises the player correctly on the number of
landers one needs (bug #1098) - Alex landers one needs (bug #1098) - Alex
- All Sound Options are now preserved between visits to the setup menu. - All Sound Options are now preserved between visits to the setup menu.
sc2/content/addons/3dovoice/starbase/starbase.txt
+1 -1
View File
@@ -1324,7 +1324,7 @@ No more history, thank you.
The members of the old Alliance. The members of the old Alliance.
#(what_about_hierarchy) #(what_about_hierarchy)
The battle thralls in the Hierarchy. The Hierarchy and their battle thralls.
#(what_about_other) #(what_about_other)
Were there any alien races who weren't in the War? Were there any alien races who weren't in the War?
sc2/content/base/comm/starbase/starbase.txt
+1 -1
View File
@@ -1324,7 +1324,7 @@ No more history, thank you.
The members of the old Alliance. The members of the old Alliance.
#(what_about_hierarchy) #(what_about_hierarchy)
The battle thralls in the Hierarchy. The Hierarchy and their battle thralls.
#(what_about_other) #(what_about_other)
Were there any alien races who weren't in the War? Were there any alien races who weren't in the War?
sc2/src/uqm/comm/starbas/starbas.c
+8
View File
@@ -302,6 +302,7 @@ HierarchyInfo (RESPONSE_REF R)
#define HIERARCHY_ANDROSYNTH (1 << 3) #define HIERARCHY_ANDROSYNTH (1 << 3)
#define HIERARCHY_ILWRATH (1 << 4) #define HIERARCHY_ILWRATH (1 << 4)
#define HIERARCHY_VUX (1 << 5) #define HIERARCHY_VUX (1 << 5)
#define HIERARCHY_URQUAN (1 << 6)
static BYTE HierarchyMask = 0; static BYTE HierarchyMask = 0;
if (PLAYER_SAID (R, what_about_hierarchy)) if (PLAYER_SAID (R, what_about_hierarchy))
@@ -309,6 +310,11 @@ HierarchyInfo (RESPONSE_REF R)
NPCPhrase (WHICH_HIERARCHY); NPCPhrase (WHICH_HIERARCHY);
HierarchyMask = 0; HierarchyMask = 0;
} }
else if (PLAYER_SAID (R, urquan))
{
NPCPhrase (ABOUT_URQUAN);
HierarchyMask |= HIERARCHY_URQUAN;
}
else if (PLAYER_SAID (R, mycon)) else if (PLAYER_SAID (R, mycon))
{ {
NPCPhrase (ABOUT_MYCON); NPCPhrase (ABOUT_MYCON);
@@ -340,6 +346,8 @@ HierarchyInfo (RESPONSE_REF R)
HierarchyMask |= HIERARCHY_VUX; HierarchyMask |= HIERARCHY_VUX;
} }
if (!(HierarchyMask & HIERARCHY_URQUAN))
Response (urquan, HierarchyInfo);
if (!(HierarchyMask & HIERARCHY_MYCON)) if (!(HierarchyMask & HIERARCHY_MYCON))
Response (mycon, HierarchyInfo); Response (mycon, HierarchyInfo);
if (!(HierarchyMask & HIERARCHY_SPATHI)) if (!(HierarchyMask & HIERARCHY_SPATHI))