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

Separate 'ask for fuel' player responses for Mercury and Luna (bug #716)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1633 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-04-13 05:38:40 +00:00
parent 39d5360f43
commit a5c5feea10
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/content/comm/comandr/comandr.ts
+3 -2
View File
@@ -1,5 +1,5 @@
#(GLAD_WHEN_YOU_COME_BACK)
#(GIVE_FUEL) 4587,3204
#(GIVE_FUEL) 4643
#(GIVE_FUEL_AGAIN) 3304,3255
#(ARE_YOU_SUPPLY_SHIP) 2463,3445,3485,3866,3144,2894,3225
#(DO_YOU_HAVE_RADIO_THIS_TIME)
@@ -88,7 +88,8 @@
#(name_41)
#(i_lost_my_lander)
#(i_lost_another_lander)
#(need_fuel)
#(need_fuel_mercury)
#(need_fuel_luna)
#(need_fuel_again)
#(what_was_red_thing)
#(it_went_away)
sc2/content/comm/comandr/comandr.txt
+4 -1
View File
@@ -392,9 +392,12 @@ Due to circumstances beyond our control, our only landing vehicle was destroyed.
#(i_lost_another_lander)
Um... er... well... We lost another lander.
#(need_fuel)
#(need_fuel_mercury)
We are unable to land on Mercury and retrieve radioactives due to an unforeseen fuel shortage.
#(need_fuel_luna)
We are unable to land on the moon and neutralize the base due to an unforeseen fuel shortage.
#(need_fuel_again)
Boy, mileage sure does vary. Could you spare us some more fuel?
sc2/src/sc2code/comm/comandr/comandr.c
+9 -6
View File
@@ -231,7 +231,8 @@ NoRadioactives (RESPONSE_REF R)
DeltaSISGauges (4, 0, 0);
UnlockMutex (GraphicsLock);
}
else if (PLAYER_SAID (R, need_fuel))
else if (PLAYER_SAID (R, need_fuel_mercury) ||
PLAYER_SAID (R, need_fuel_luna))
{
NPCPhrase (GIVE_FUEL);
LockMutex (GraphicsLock);
@@ -265,7 +266,7 @@ NoRadioactives (RESPONSE_REF R)
if (GET_GAME_STATE (GIVEN_FUEL_BEFORE))
Response (need_fuel_again, NoRadioactives);
else
Response (need_fuel, NoRadioactives);
Response (need_fuel_mercury, NoRadioactives);
}
Response (ok_i_will_get_radios, ByeBye);
@@ -300,7 +301,8 @@ AskAfterRadios (RESPONSE_REF R)
DeltaSISGauges (4, 0, 0);
UnlockMutex (GraphicsLock);
}
else if (PLAYER_SAID (R, need_fuel))
else if (PLAYER_SAID (R, need_fuel_mercury) ||
PLAYER_SAID (R, need_fuel_luna))
{
NPCPhrase (GIVE_FUEL);
LockMutex (GraphicsLock);
@@ -337,7 +339,7 @@ AskAfterRadios (RESPONSE_REF R)
if (GET_GAME_STATE (GIVEN_FUEL_BEFORE))
Response (need_fuel_again, AskAfterRadios);
else
Response (need_fuel, AskAfterRadios);
Response (need_fuel_mercury, AskAfterRadios);
}
Response (well_go_get_them_now, ByeBye);
if (PHRASE_ENABLED (where_get_radios))
@@ -401,7 +403,8 @@ TellMoonBase (RESPONSE_REF R)
DeltaSISGauges (4, 0, 0);
UnlockMutex (GraphicsLock);
}
else if (PLAYER_SAID (R, need_fuel))
else if (PLAYER_SAID (R, need_fuel_mercury) ||
PLAYER_SAID (R, need_fuel_luna))
{
NPCPhrase (GIVE_FUEL);
LockMutex (GraphicsLock);
@@ -445,7 +448,7 @@ TellMoonBase (RESPONSE_REF R)
if (GET_GAME_STATE (GIVEN_FUEL_BEFORE))
Response (need_fuel_again, TellMoonBase);
else
Response (need_fuel, TellMoonBase);
Response (need_fuel_luna, TellMoonBase);
}
if (GET_GAME_STATE (WILL_DESTROY_BASE) == 0)
Response (we_will_take_care_of_base, ByeBye);
sc2/src/sc2code/comm/comandr/strings.h
+2 -1
View File
@@ -113,7 +113,8 @@ enum
name_41,
i_lost_my_lander,
i_lost_another_lander,
need_fuel,
need_fuel_mercury,
need_fuel_luna,
need_fuel_again,
what_was_red_thing,
it_went_away,