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

Comments.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2210 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2006-01-20 05:52:39 +00:00
parent e23427e560
commit 8dc56b570f
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/gameev.c
+3
View File
@@ -726,6 +726,7 @@ mycon_mission (void)
{ {
if (MyconPtr->ShipInfo.energy_level) if (MyconPtr->ShipInfo.energy_level)
{ {
// Head back.
SET_GAME_STATE (MYCON_KNOW_AMBUSH, 1); SET_GAME_STATE (MYCON_KNOW_AMBUSH, 1);
SetRaceDest (MYCON_SHIP, 6392, 2200, 30, (BYTE)~0); SetRaceDest (MYCON_SHIP, 6392, 2200, 30, (BYTE)~0);
@@ -735,8 +736,10 @@ mycon_mission (void)
else if (MyconPtr->ShipInfo.loc.x != 6858 else if (MyconPtr->ShipInfo.loc.x != 6858
|| MyconPtr->ShipInfo.loc.y != 577) || MyconPtr->ShipInfo.loc.y != 577)
SetRaceDest (MYCON_SHIP, 6858, 577, 30, ADVANCE_MYCON_MISSION); SetRaceDest (MYCON_SHIP, 6858, 577, 30, ADVANCE_MYCON_MISSION);
// To Organon.
else else
{ {
// Endure losses at Organon.
SIZE strength_loss; SIZE strength_loss;
AddEvent (RELATIVE_EVENT, 0, 14, 0, ADVANCE_MYCON_MISSION); AddEvent (RELATIVE_EVENT, 0, 14, 0, ADVANCE_MYCON_MISSION);
sc2/src/sc2code/globdata.h
+6
View File
@@ -441,6 +441,9 @@ START_GAME_STATE
ADD_GAME_STATE (MYCON_HOME_VISITS, 3) ADD_GAME_STATE (MYCON_HOME_VISITS, 3)
ADD_GAME_STATE (MYCON_AMBUSH, 1) ADD_GAME_STATE (MYCON_AMBUSH, 1)
ADD_GAME_STATE (MYCON_FELL_FOR_AMBUSH, 1) ADD_GAME_STATE (MYCON_FELL_FOR_AMBUSH, 1)
/* Set to 1 when the Mycon have been told about Organon
* and are moving towards it.
*/
ADD_GAME_STATE (GLOBAL_FLAGS_AND_DATA, 8) ADD_GAME_STATE (GLOBAL_FLAGS_AND_DATA, 8)
/* This state seems to be used to distinguish between different /* This state seems to be used to distinguish between different
@@ -681,6 +684,9 @@ START_GAME_STATE
*/ */
ADD_GAME_STATE (MYCON_INSULTS, 3) ADD_GAME_STATE (MYCON_INSULTS, 3)
ADD_GAME_STATE (MYCON_KNOW_AMBUSH, 1) ADD_GAME_STATE (MYCON_KNOW_AMBUSH, 1)
/* Set to 1 when the Mycon have been butchered at Organon,
* just before the remaining Mycon head back home.
*/
ADD_GAME_STATE (SYREEN_INFO, 2) ADD_GAME_STATE (SYREEN_INFO, 2)
ADD_GAME_STATE (KNOW_SYREEN_WORLD_SHATTERED, 1) ADD_GAME_STATE (KNOW_SYREEN_WORLD_SHATTERED, 1)