Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust functionality to allow restarting of current lesson

Browse Source 
Also other minor adjustments to lesson texts
This commit is contained in:
cim 2013-12-20 18:27:25 +00:00
parent dae8593131
commit 3c38cf2732
3 changed files with 80 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Resources/Config/missiontext.plist
View File

@ -193,11 +193,15 @@
"oolite-tutorial-no-advance" = "Advancing with '[oolite_key_activate_equipment]' is not currently available.";
"oolite-tutorial-controls-mode0" = "Mode: next stage in lesson";
"oolite-tutorial-controls-mode1" = "Mode: next lesson";
"oolite-tutorial-controls-mode2" = "Mode: restart lesson";
"oolite-tutorial-0-0-title" = "Flight Training Course";
"oolite-tutorial-0-0-message" = "Welcome to the Cooperative Flight Training Course, pilot. This course will demonstrate the basic functionality of Cooperative ships to you, in a specially-prepared simulator.\n\nThe course is in multiple sections. While in the simulator, you can use the '[oolite_key_activate_equipment]' key to advance to the next entry in the current lesson, and the '[oolite_key_mode_equipment]' key to go to the next lesson, if you wish to skip sections you have previously completed.\n\nOnce the simulation begins, a panel on your screen will display instructions, which you should follow to progress through the course. If you wish to temporarily hide the panel, press the '[oolite_key_cycle_mfd]' key. You can bring it back with the same key, or it will automatically reappear when there are new instructions.\n\nWhere an instruction asks you to press a letter key, press the letter key alone if it is lower case (e.g. 'i'), and press shift and the key together if it is upper case (e.g. 'K').\n\nWhen you are ready, press the Enter key to begin the simulation with the first lesson.";
"oolite-tutorial-0-0-message" = "Welcome to the Cooperative Flight Training Course, pilot. This course will demonstrate the basic functionality of Cooperative ships to you, in a specially-prepared simulator.\n\nThe course is in multiple lessons. While in the simulator, you can use the '[oolite_key_activate_equipment]' key to advance to the next entry in the current lesson. Using the '[oolite_key_mode_equipment]' key will temporarily change the functionality of the '[oolite_key_activate_equipment]' key, and allow you to skip lessons you have previously completed, or restart the current lessons.\n\nOnce the simulation begins, a panel on your screen will display instructions, which you should follow to progress through the course. If you wish to temporarily hide the panel, press the '[oolite_key_cycle_mfd]' key. You can bring it back with the same key, or it will automatically reappear when there are new instructions.\n\nWhere an instruction asks you to press a letter key, press the letter key alone if it is lower case (e.g. 'i'), and press shift and the key together if it is upper case (e.g. 'K').\n\nWhen you are ready, press the Enter key to begin the simulation with the first lesson.";
"oolite-tutorial-0-0-choices" = { "1" = "Begin Course"; };
"oolite-tutorial-0-2" = "Welcome to the pilot's training course. The lesson information will be displayed on this panel.\n\nYou will often need to press '[oolite_key_activate_equipment]' to go to the next step - do this now to start the first lesson.\n\nRemember, you can also press '[oolite_key_mode_equipment]' to skip to the next lesson.";
"oolite-tutorial-0-2" = "Welcome to the pilot's training course. The lesson information will be displayed on this panel.\n\nYou will often need to press '[oolite_key_activate_equipment]' to go to the next step - do this now to start the first lesson.\n\nRemember, you can also press '[oolite_key_mode_equipment]' to skip or restart lessons.";
"oolite-tutorial-1-0" = "Lesson 1: the HUD\nThis lesson introduces the HUD components in turn.\nWhen you start, the HUD components will all be hidden. As you go through this lesson, they will be made visible and introduced.";
@ -213,7 +217,7 @@
"oolite-tutorial-1-6" = "Primary Shields: 3/3\nThe shields will slowly recharge from the energy banks if they are drained, and the bars will change colour to highlight a drained state. As with the energy banks, a full recharge will take some time.";
"oolite-tutorial-1-7" = "Fuel: 1/2\nThis bar shows the amount of witchspace fuel currently available. The full capacity is sufficient for a seven light-year witchspace jump. With the correct equipment, fuel can also be used to significantly boost your speed in normal space.";
"oolite-tutorial-1-7" = "Fuel: 1/2\nThis bar shows the amount of witchspace fuel currently available. The full capacity is sufficient for a seven light-year witchspace jump. With the optional Fuel Injectors upgrade fitted, fuel can also be used to significantly boost your speed in normal space.";
"oolite-tutorial-1-8" = "Fuel: 2/2\nThe vertical line shows the amount of fuel needed to reach the currently selected witchspace destination. If the fuel is insufficient, this will change colour.";
@ -253,31 +257,33 @@
"oolite-tutorial-2-1-error" = "First bring your ship to a complete stop using the '[oolite_key_decrease_speed]' key.";
"oolite-tutorial-2-1" = "Scanner use: 1/8\nWe have added several asteroids around you, which appear on your scanner as a white marker.\nThe circle of the scanner represents the horizontal plane around your ship, with the lines forward approximately indicating your field of view.";
"oolite-tutorial-2-1" = "Scanner use: 1/9\nWe have added several asteroids around you, which appear on your scanner as a white marker.\nThe circle of the scanner represents the horizontal plane around your ship, with the diagonal lines approximately indicating your field of view. Maximum range is just over 25km.";
"oolite-tutorial-2-2" = "Scanner use: 2/8\nThe position of an object above or below the plane is then marked with a stick. The further the object is from the plane, the longer the stick will be.";
"oolite-tutorial-2-2" = "Scanner use: 2/9\nThe position of an object above or below the plane is then marked with a stick. The further the object is from the plane, the longer the stick will be.";
"oolite-tutorial-2-3" = "Scanner use: 3/8\nTo bring an object on the scanner into your forward view, first roll your ship with the '[oolite_key_roll_left]' and '[oolite_key_roll_right]' keys until the object is on the forward/back line of the scanner. Then, use the '[oolite_key_pitch_forward]' and '[oolite_key_pitch_back]' keys to turn your ship so that it is in front of you.";
"oolite-tutorial-2-3" = "Scanner use: 3/9\nTo bring an object on the scanner into your forward view, first roll your ship with the '[oolite_key_roll_left]' and '[oolite_key_roll_right]' keys until the object is on the forward/back line of the scanner. Then, use the '[oolite_key_pitch_forward]' and '[oolite_key_pitch_back]' keys to turn your ship so that it is in front of you.";
"oolite-tutorial-2-4" = "Scanner use: 4/8\nThe scanner can detect objects up to a substantial distance. Pick one of the asteroids and fly towards it. Accelerate with the '[oolite_key_increase_speed]' key, and decelerate again when nearby with the '[oolite_key_decrease_speed]' key.\nBe careful not to collide with it!";
"oolite-tutorial-2-4" = "Scanner use: 4/9\nThe scanner can detect objects up to a substantial distance. Pick one of the asteroids and fly towards it. Accelerate with the '[oolite_key_increase_speed]' key, and decelerate again when nearby with the '[oolite_key_decrease_speed]' key.\nBe careful not to collide with it!";
"oolite-tutorial-2-5" = "Scanner use: 5/8\nWhen concentrating on close-up objects, it may be useful to zoom the scanner, sacrificing range for detail. Press the '[oolite_key_scanner_zoom]' key to zoom in, up to 5x zoom.\nYou can reset the zoom to maximum range using the '[oolite_key_scanner_unzoom]' key. Note the zoom level indicator by the scanner.";
"oolite-tutorial-2-5" = "Scanner use: 5/9\nWhen concentrating on close-up objects, it may be useful to zoom the scanner, sacrificing range for detail. Press the '[oolite_key_scanner_zoom]' key to zoom in, up to 5x zoom.\nYou can reset the zoom to maximum range using the '[oolite_key_scanner_unzoom]' key. Note the zoom level indicator by the scanner.";
"oolite-tutorial-2-6" = "Scanner use: 6/8\nThe colour of the marker is used to indicate something about its nature. Asteroids are unpowered objects and appear white. Other objects which will appear white include debris, cargo containers, and escape capsules";
"oolite-tutorial-2-6" = "Scanner use: 6/9\nThe horizontal lines on the scanner mark out range. The major lines are 5km apart, and as you zoom the scanner in, minor lines 1km apart will also be added.";
"oolite-tutorial-2-7" = "Scanner use: 7/8\nPowered ships usually appear yellow on the scanner, unless they are attacking, when they appear red. Don't worry - this one isn't actually attacking!\nPolice and other official ships are indicated with a purple marker - be careful not to accidentally hit them as this is an illegal act.";
"oolite-tutorial-2-7" = "Scanner use: 7/9\nThe colour of the marker is used to indicate something about its nature. Asteroids are unpowered objects and appear white. Other objects which will appear white include debris, cargo containers, and escape capsules";
"oolite-tutorial-2-8" = "Scanner use: 8/9\nPowered ships usually appear yellow on the scanner, unless they are attacking, when they appear red. Don't worry - this one isn't actually attacking!\nPolice and other official ships are indicated with a purple marker - be careful not to accidentally hit them as this is an illegal act.";
"oolite-tutorial-2-8" = "Scanner use: 8/8\nOther common colours include yellow/green flashing for navigation buoys, light blue for missiles, and red/yellow flashing for mines. Again, don't worry, these are all disarmed!";
"oolite-tutorial-2-9" = "Scanner use: 9/9\nOther common colours include yellow/green flashing for navigation buoys, light blue for missiles, and red/yellow flashing for mines. Again, don't worry, these are all disarmed!";
"oolite-tutorial-2-9" = "View controls: 1/2\nYour ship is fitted with four view cameras. Use the '[oolite_key_view_forward]', '[oolite_key_view_aft]', '[oolite_key_view_port]' and '[oolite_key_view_starboard]' keys to switch between them. The view lines on the scanner will move as you do. Notice that the crosshair is replaced on the other views, as you have no other weapons mounted.";
"oolite-tutorial-2-10" = "View controls: 1/2\nYour ship is fitted with four view cameras. Use the '[oolite_key_view_forward]', '[oolite_key_view_aft]', '[oolite_key_view_port]' and '[oolite_key_view_starboard]' keys to switch between them. The view lines on the scanner will move as you do. Notice that the crosshair is replaced on the other views, as you have no other weapons mounted.";
"oolite-tutorial-2-10" = "View controls: 2/2\nYour ship can also simulate an external view for you. Press '[oolite_key_custom_view]' to switch to external view mode and to cycle through the available external views. Any of the internal view keys will return you to internal viewing.";
"oolite-tutorial-2-11" = "View controls: 2/2\nYour ship can also simulate an external view for you. Press '[oolite_key_custom_view]' to switch to external view mode and to cycle through the available external views. Any of the internal view keys will return you to internal viewing.";
"oolite-tutorial-3-0" = "Lesson 3: Flight Training\nThis lesson gives you opportunity to practice basic piloting skills. Your ship has been disarmed temporarily to focus on movement over weapon use.";
"oolite-tutorial-3-1" = "To refresh your memory, the basic flight controls are:\n[oolite_key_roll_left]: roll left\n[oolite_key_roll_right]: roll right\n[oolite_key_pitch_forward]: pitch forward\n[oolite_key_pitch_back]: pitch back\n[oolite_key_increase_speed]: increase speed\n[oolite_key_decrease_speed]: decrease speed";
"oolite-tutorial-3-2" = "We have added a dense asteroid cluster nearby. Use your scanner to locate the buoy within it, then fly within 500m of the buoy and come to a complete stop.";
"oolite-tutorial-3-2" = "We have added a dense asteroid cluster nearby. Use your scanner to locate the buoy within it, then fly within 500m of the buoy and come to a complete stop.\n\nTip: use the range lines on the scanner to judge distance.";
"oolite-tutorial-3-3-error" = "To continue, come to a stop near the buoy. Use your '[oolite_key_scanner_unzoom]' key to maximise scan range if you are having trouble finding it.";
@ -287,11 +293,11 @@
"oolite-tutorial-3-3-win" = "That's enough practice for now";
"oolite-tutorial-3-4" = "You survived [mission_oolite_tutorial_asteroids] seconds.\n\nIf you would like to try this challenge again, press '[oolite_key_activate_equipment]'. Otherwise, press '[oolite_key_mode_equipment]' to go to the next stage of the course.\n\nTip: use the '[oolite_key_scanner_zoom]' key to magnify your scanner.";
"oolite-tutorial-3-4" = "You survived [mission_oolite_tutorial_asteroids] seconds.\n\nIf you would like to try this challenge again, come to a complete stop before pressing '[oolite_key_activate_equipment]'. Otherwise, press '[oolite_key_activate_equipment]' while moving to finish the lesson.\n\nTip: use the '[oolite_key_scanner_zoom]' key to magnify your scanner.";
"oolite-tutorial-3-4a" = "You survived [mission_oolite_tutorial_asteroids] seconds.\n\nIf you would like to try this challenge again, this time without the scanner highlighting, press '[oolite_key_activate_equipment]'. Otherwise, press '[oolite_key_mode_equipment]' to go to the next stage of the course.";
"oolite-tutorial-3-4a" = "You survived [mission_oolite_tutorial_asteroids] seconds.\n\nIf you would like to try this challenge again, this time without the scanner highlighting, come to a complete stop and press '[oolite_key_activate_equipment]'. Otherwise, press '[oolite_key_activate_equipment]' while moving to go to the next lesson.";
"oolite-tutorial-3-4b" = "You survived [mission_oolite_tutorial_asteroids] seconds without scanner assistance.\nIt's probably time to press '[oolite_key_mode_equipment]' to go to the next stage of the course, but you can have another go with '[oolite_key_activate_equipment]' if you want.";
"oolite-tutorial-3-4b" = "You survived [mission_oolite_tutorial_asteroids] seconds without scanner assistance.\nThat's as much as this lesson can teach you, so press '[oolite_key_activate_equipment]' to go to the next lesson.";
"oolite-tutorial-4-0" = "Lesson 4: Weapons systems\nThis lesson will give you the chance to practice basic targeting and laser usage skills.";
@ -343,13 +349,13 @@
"oolite-tutorial-6-4" = "Good work. Here's two more to take on. While fighting one, don't lose track of what the other is up to.\n\nTip: Zoom your scanner in so that you can see where the one you're firing at is going and keep on it. If you split your fire between both, you won't do enough damage.";
"oolite-tutorial-6-5" = "Excellent. That's the basics done. You can either end the lesson now by pressing '[oolite_key_mode_equipment]' or shooting the buoy, or you can continue to face harder targets by pressing '[oolite_key_activate_equipment]'.\nIf you want to wait a little for your shields to recharge, that's okay.";
"oolite-tutorial-6-5" = "Excellent. That's the basics done. You can either end the lesson now by shooting the buoy, or you can continue to face harder targets by pressing '[oolite_key_activate_equipment]'.\nIf you want to wait a little for your shields to recharge, that's okay.";
"oolite-tutorial-6-6" = "This Krait has been upgraded to carry a beam laser. It'll tear up your shields in no time if you let it. Move!\n\nTip: Your weapon is weaker, so dodge and close the range rather than getting into a long-range shooting match.";
"oolite-tutorial-6-7" = "So far, so good. See if you can handle two at once.\n\nTip: when outnumbered like this, use a missile to distract one while you fight the other.";
"oolite-tutorial-6-8" = "You did it! We do have a third stage available if you're feeling up to it - press '[oolite_key_activate_equipment]' to start it. If that last fight was any trouble, though, maybe you'd be better stopping now. Pressing '[oolite_key_mode_equipment]' or shoot the buoy to complete the lesson.";
"oolite-tutorial-6-8" = "You did it! We do have a third stage available if you're feeling up to it - press '[oolite_key_activate_equipment]' to start it. If that last fight was any trouble, though, maybe you'd be better stopping now by shooting the buoy to complete the lesson.";
"oolite-tutorial-6-9" = "As you wish. This Krait is well-armed, well-equipped, and we've got a local escort pilot in the next simulator booth to fly it for us. Your Cobra might still be a superior ship, but you'll have to make every shot count.";

22
Resources/Scripts/oolite-tutorial-equipment.js
View File

@ -37,14 +37,32 @@ this.author = "cim";
this.copyright = "© 2008-2013 the Oolite team.";
this.version = "1.79";
this.$mode = 0;
this.activated = function()
{
worldScripts["oolite-tutorial"]._nextItemEquip();
if (this.$mode == 0)
{
worldScripts["oolite-tutorial"]._nextItemEquip();
}
else if (this.$mode == 1)
{
worldScripts["oolite-tutorial"]._nextSection();
this.$mode = 0;
player.consoleMessage(expandMissionText("oolite-tutorial-controls-mode0"));
}
else if (this.$mode == 2)
{
worldScripts["oolite-tutorial"]._restartSection();
this.$mode = 0;
player.consoleMessage(expandMissionText("oolite-tutorial-controls-mode0"));
}
}
this.mode = function()
{
worldScripts["oolite-tutorial"]._nextSection();
this.$mode = (this.$mode + 1) % 3;
player.consoleMessage(expandMissionText("oolite-tutorial-controls-mode"+this.$mode));
}

52
Resources/Scripts/oolite-tutorial.js
View File

@ -60,7 +60,7 @@ this.startUp = function()
this.$tutorialStages = [
3, // stage 0: mission screen, post-launch cleanup, intro message
25, // stage 1: HUD displays
11, // stage 2: scanner and views
12, // stage 2: scanner and views
6, // stage 3: basic flight challenge
8, // stage 4: targeting + lasers
12, // stage 5: missiles + avoidance
@ -170,9 +170,12 @@ this.startUp = function()
station.remove(true);
if (this.$tutorialSubstage != 14)
{
this.$tutorialStage--;
this._restartSection();
}
else
{
this._nextSection();
}
this._nextSection();
}
}
@ -182,13 +185,11 @@ this.startUp = function()
if (amount >= player.ship.energy)
{
player.ship.position = system.locationFromCode("OUTER_SYSTEM_OFFPLANE");
--this.$tutorialStage;
this.$tutorialSubstage = 9999;
player.ship.dealEnergyDamage(1,10000,0);
this._playSound("bigbang.ogg");
player.consoleMessage(expandMissionText("oolite-tutorial-no-death"));
missionVariables.oolite_tutorial_deaths++;
this._nextItem(); // will call nextSection, which will reset energy
this._restartSection(); // will reset energy
}
}
@ -267,6 +268,13 @@ this.startUp = function()
}
// restart this section of the tutorial
this._restartSection = function()
{
this.$tutorialStage--;
this._nextSection();
}
// move to the next section of the tutorial
this._nextSection = function()
{
@ -681,6 +689,11 @@ this.startUp = function()
this.__stage2sub7 = function()
{
this._setInstructions("oolite-tutorial-2-7");
}
this.__stage2sub8 = function()
{
this._setInstructions("oolite-tutorial-2-8");
var yellow = this._addShips("[adder]",1,player.ship.position,5E3)[0];
yellow.setAI("nullAI.plist");
var red = this._addShips("[adder]",1,player.ship.position,5E3)[0];
@ -690,12 +703,12 @@ this.startUp = function()
red.performFlee();
var purple = this._addShips("police",1,player.ship.position,5E3)[0];
purple.setAI("nullAI.plist");
}
this.__stage2sub8 = function()
this.__stage2sub9 = function()
{
this._setInstructions("oolite-tutorial-2-8");
this._setInstructions("oolite-tutorial-2-9");
this._addShips("oolite-tutorial-buoy",1,player.ship.position,10E3);
var miss = this._addShips("missile",1,player.ship.position,10E3)[0];
miss.setAI("nullAI.plist");
@ -703,17 +716,16 @@ this.startUp = function()
mine.setAI("nullAI.plist");
}
this.__stage2sub9 = function()
{
this._setInstructions("oolite-tutorial-2-9");
}
this.__stage2sub10 = function()
{
this._setInstructions("oolite-tutorial-2-10");
}
this.__stage2sub11 = function()
{
this._setInstructions("oolite-tutorial-2-11");
}
this.__stage3sub0 = function()
{
// restart;
@ -902,8 +914,14 @@ this.startUp = function()
this.__stage3sub5 = function()
{
this._setFrameCallback("");
this.$tutorialStage--;
this._nextSection();
if (missionVariables.oolite_tutorial_asteroids_win == 2 || player.ship.speed > 1)
{
this._nextSection();
}
else
{
this._restartSection();
}
}