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

Adjust messages, check distance from buoy more frequently

Browse Source
This commit is contained in:
cim 2013-12-14 17:05:51 +00:00
parent 51ee5f94cb
commit 2f248c3186
2 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Config/missiontext.plist
View File

@ -284,13 +284,13 @@
"oolite-tutorial-3-3-win" = "That's enough practice for now"; "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.\nTip: use the '[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, 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-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, press '[oolite_key_activate_equipment]'. Otherwise, press '[oolite_key_mode_equipment]' to go to the next stage of the course.";
"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.\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-4-0" = "Lesson 4: ???"; "oolite-tutorial-end-mfd" = "You have completed the course. Press '[oolite_key_activate_equipment]' to view your test scores.";
"oolite-tutorial-end-title" = "Course Complete"; "oolite-tutorial-end-title" = "Course Complete";
"oolite-tutorial-end-message" = "You have now completed the Pilot's Training Course. Your scores:\n\nDeaths: [mission_oolite_tutorial_deaths]\n\nAsteroid navigation: [mission_oolite_tutorial_asteroids_result] ([mission_oolite_tutorial_asteroids] seconds)\n"; "oolite-tutorial-end-message" = "You have now completed the Pilot's Training Course. Your scores:\n\nDeaths: [mission_oolite_tutorial_deaths]\n\nAsteroid navigation: [mission_oolite_tutorial_asteroids_result] ([mission_oolite_tutorial_asteroids] seconds)\n";

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

@ -688,6 +688,49 @@ this.startUp = function()
this._nextItem(); this._nextItem();
} }
} }
else if (Math.random() < delta)
{
var boulders = system.shipsWithPrimaryRole("boulder",player.ship,10000);
if (boulders.length > 1)
{
boulders[0].explode();
if (boulders.length > 5)
{
boulders[2].explode();
boulders[1].explode();
}
}
var splinters = system.shipsWithPrimaryRole("splinter",player.ship,10000);
if (splinters.length > 1)
{
splinters[0].explode();
if (splinters.length > 5)
{
splinters[2].explode();
splinters[1].explode();
}
}
if (buoy.position.distanceTo(player.ship) > 5000)
{
player.consoleMessage(expandMissionText("oolite-tutorial-3-3-toofar"),5);
missionVariables.oolite_tutorial_asteroids = Math.floor(time);
this._nextItem();
}
}
if (time > 150)
{
player.consoleMessage(expandMissionText("oolite-tutorial-3-3-win"),5);
missionVariables.oolite_tutorial_asteroids = Math.floor(time);
this._nextItem();
}
});
}
this.__stage3sub4 = function()
{
this._setFrameCallback(function(delta)
{
if (Math.random() < delta) if (Math.random() < delta)
{ {
var boulders = system.shipsWithPrimaryRole("boulder",player.ship,10000); var boulders = system.shipsWithPrimaryRole("boulder",player.ship,10000);
@ -711,19 +754,7 @@ this.startUp = function()
} }
} }
} }
if (time > 150)
{
player.consoleMessage(expandMissionText("oolite-tutorial-3-3-win"),5);
missionVariables.oolite_tutorial_asteroids = Math.floor(time);
this._nextItem();
}
}); });
}
this.__stage3sub4 = function()
{
this._setFrameCallback("");
if (missionVariables.oolite_tutorial_asteroids >= 150) if (missionVariables.oolite_tutorial_asteroids >= 150)
{ {
if (missionVariables.oolite_tutorial_asteroids_win >= 1) if (missionVariables.oolite_tutorial_asteroids_win >= 1)
@ -745,6 +776,7 @@ this.startUp = function()
this.__stage3sub5 = function() this.__stage3sub5 = function()
{ {
this._setFrameCallback("");
this.$tutorialStage--; this.$tutorialStage--;
this._nextSection(); this._nextSection();
} }
@ -774,7 +806,9 @@ this.startUp = function()
{ {
rocks[i].remove(); rocks[i].remove();
} }
//... //... move this line to later when there are more sections
this._setInstructions("oolite-tutorial-end-mfd");
} }
this._endTutorial = function() this._endTutorial = function()