From e94eddecea440b0aca2a99ca6af56dedc1ba5b33 Mon Sep 17 00:00:00 2001 From: Jens Ayton Date: Mon, 26 Jul 2010 19:37:31 +0000 Subject: [PATCH] Accumulated minor cleanup. git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3720 127b21dd-08f5-0310-b4b7-95ae10353056 --- Doc/CHECKLIST.TXT | 18 +++++++----------- Resources/Scripts/oolite-nova-mission.js | 8 +------- src/Core/Scripting/OOLegacyScriptWhitelist.h | 8 ++++---- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/Doc/CHECKLIST.TXT b/Doc/CHECKLIST.TXT index 1062af34..3dbced7b 100644 --- a/Doc/CHECKLIST.TXT +++ b/Doc/CHECKLIST.TXT @@ -52,14 +52,10 @@ asteroids and possibly ships launched by the station (e.g. a patrol Viper). NOTE: normally, you are expected to leave the nova system using a galactic jump. However, you'll want to go back to the system for testing purposes, so -award yourself some fule (PS.fuel = 7) when you arrive and use a normal jump. +award yourself some fuel (PS.fuel = 7) when you arrive and use a normal jump. There are now several outcomes: -* The coward: Leave the system with a galactic jump, or by giving youself fuel - through the console. (It's also possible to get this outcome by following - another ship through a wormhole - you're likely to come across some if you - hyperspeed straight towards the station - or by using OXP equipment to get - fuel.) +* The coward: Leave the system without docking. Confirm that missionVariables.nova is "NOVA_ESCAPE_OTHER". Dock at the main station, and you should get the following message (with solar.png as a @@ -88,10 +84,10 @@ There are now several outcomes: not to help the refugees!" (FIXME: this appears behind the station UI. Should it be removed, or deferred until launching?) Immediately leave the station. The station should explode behind you. - Initiate galactic hyperspace jump with alacrity. The sun should go nova nine - seconds after you selected [No, sorry]. (This is visible as a rising cabin - temperature, not to mention a growing sun. In full shader mode, your ship - should be glowing pink by the time you jump.) + Leave the system with alacrity. The sun should go nova nine seconds after + you selected [No, sorry]. (This is visible as a rising cabin temperature, + not to mention a growing sun. In full shader mode, your ship should be\ + glowing pink by the time you jump.) Verify that missionVariables.nova is "NOVA_ESCAPE_COWARD", then dock. You should get the following message (with solar.png as a background): @@ -141,7 +137,7 @@ witchbuoy, and you should be overheating. Trumbles: Sell 1t of food, then exit station and reenter (using -PS.mainStation.dockPlayer()) as many times as required for the Trumble to be +S.mainStation.dockPlayer()) as many times as required for the Trumble to be offered. diff --git a/Resources/Scripts/oolite-nova-mission.js b/Resources/Scripts/oolite-nova-mission.js index dca156c5..889adb13 100644 --- a/Resources/Scripts/oolite-nova-mission.js +++ b/Resources/Scripts/oolite-nova-mission.js @@ -36,7 +36,7 @@ this.copyright = "© 2008-2010 the Oolite team."; this.version = "1.75"; -this.missionOffers = function () +this.missionScreenOpportunity = function () { if (!player.ship.docked) { return; } @@ -233,12 +233,6 @@ this.shipLaunchedEscapePod = function () }; -this.missionScreenOpportunity = function () -{ - this.missionOffers(); -}; - - this.shipWillEnterWitchspace = function () { if (this.willGoNova) diff --git a/src/Core/Scripting/OOLegacyScriptWhitelist.h b/src/Core/Scripting/OOLegacyScriptWhitelist.h index e1157f12..5a061c69 100644 --- a/src/Core/Scripting/OOLegacyScriptWhitelist.h +++ b/src/Core/Scripting/OOLegacyScriptWhitelist.h @@ -10,10 +10,10 @@ A sanitized script is an array of zero or more sanitized statements. A sanitized statement is an array whose first element is a boolean indicating whether it's a conditional statement (true) or an action statement (false). -A conditinal statement has three additional elements. The first is a sanitized -condition (see below). The second is a sanitized script to execute if the -condition evaluates to true. The third is a sanitized script to execute if the -condition evaluates to false. +A conditional statement has three additional elements. The first is an array +of sanitized conditions (see below). The second is a sanitized script to +execute if the condition evaluates to true. The third is a sanitized script to +execute if the condition evaluates to false. An action statement has one or two additional elements, both strings. The first is a selector. If the selector ends with a colon (i.e., takes an