Yet another forgotten string moved to descriptions.plist. Fixed bug in escortAI, where escorts would fall to a state of idleness after returning from intercept, due to lack of UPDATE actions in the BEGIN_BUSINESS state (thanks go to Eric Walch for the fix).

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1413 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2008-02-24 10:04:01 +00:00
parent 77afca6f3a
commit a88d505c40
3 changed files with 4 additions and 3 deletions

View File

@ -18,9 +18,9 @@
ATTACKED = (setTargetToPrimaryAggressor, "setAITo: interceptAI.plist"); ATTACKED = (setTargetToPrimaryAggressor, "setAITo: interceptAI.plist");
ENTER = (escortCheckMother); ENTER = (escortCheckMother);
EXIT = (); EXIT = ();
ESCORTING = ("setDesiredRangeTo: 0.0", performEscort); ESCORTING = ("setDesiredRangeTo: 0.0", "setStateTo: FLYING_ESCORT");
"NOT_ESCORTING" = ("setStateTo: LOOK_FOR_BUSINESS"); "NOT_ESCORTING" = ("setStateTo: LOOK_FOR_BUSINESS");
UPDATE = (); UPDATE = (escortCheckMother, "pauseAI: 7.5");
}; };
"ENTER_WORMHOLE" = { "ENTER_WORMHOLE" = {
ENTER = (setDestinationToTarget, "setDesiredRangeTo: 1.0", "setSpeedFactorTo: 1.0", performFlyToRangeFromDestination); ENTER = (setDestinationToTarget, "setDesiredRangeTo: 1.0", "setSpeedFactorTo: 1.0", performFlyToRangeFromDestination);

View File

@ -953,6 +953,7 @@
"human-colonial-description-plural" = "Human Colonials"; "human-colonial-description-plural" = "Human Colonials";
"clock-format" = "%07d:%02d:%02d:%02d"; "clock-format" = "%07d:%02d:%02d:%02d";
"clock-format-adjusting" = "%07d:%02d:%02d:%02d (adjusting)"; "clock-format-adjusting" = "%07d:%02d:%02d:%02d (adjusting)";
"danger-fuel-leak" = "Danger! Fuel leak!";
// delivery reports // delivery reports

View File

@ -1915,7 +1915,7 @@ static int scriptRandomSeed = -1; // ensure proper random function
{ {
if (![UNIVERSE playCustomSound:@"[fuel-leak]"]) if (![UNIVERSE playCustomSound:@"[fuel-leak]"])
[self warnAboutHostiles]; [self warnAboutHostiles];
[UNIVERSE addMessage:@"Danger! Fuel leak!" forCount:6]; [UNIVERSE addMessage:DESC(@"danger-fuel-leak") forCount:6];
OOLog(kOOLogNoteFuelLeak, @"FUEL LEAK activated!"); OOLog(kOOLogNoteFuelLeak, @"FUEL LEAK activated!");
} }
} }