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

Fixed default escort function (first four ships no longer try to fly inside mother).

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4119 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2011-01-22 20:38:44 +00:00
parent eafb5ffe2f
commit 399e369606
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Resources/Scripts/oolite-global-prefix.js
View File

@ -261,29 +261,30 @@ defineMethod(SoundSource.prototype, "playSound", function playSound(sound, count
const escortPositions = const escortPositions =
[ [
// V-shape escort pattern // V-shape escort pattern
new Vector3D(-6, 0, -3), new Vector3D(-2, 0, -1),
new Vector3D( 6, 0, -3), new Vector3D( 2, 0, -1),
new Vector3D(-9, 0, -9), new Vector3D(-3, 0, -3),
new Vector3D( 9, 0, -9) new Vector3D( 3, 0, -3)
/* /*
// X-shape escort pattern // X-shape escort pattern
new Vector3D(-6, 0, 6), new Vector3D(-2, 0, 2),
new Vector3D( 6, 0, 6), new Vector3D( 2, 0, 2),
new Vector3D(-9, 0, -9), new Vector3D(-3, 0, -3),
new Vector3D( 9, 0, -9) new Vector3D( 3, 0, -3)
*/ */
]; ];
const escortPositionCount = escortPositions.length; const escortPositionCount = escortPositions.length;
const escortSpacingFactor = 3;
Script.prototype.coordinatesForEscortPosition = function default_coordinatesFromEscortPosition(index) Script.prototype.coordinatesForEscortPosition = function default_coordinatesFromEscortPosition(index)
{ {
var highPart = Math.floor(index / escortPositionCount); var highPart = Math.floor(index / escortPositionCount) + 1;
var lowPart = index % escortPositionCount; var lowPart = index % escortPositionCount;
var spacing = this.ship.collisionRadius * highPart; var spacing = this.ship.collisionRadius * escortSpacingFactor * highPart;
return escortPositions[lowPart].multiply(spacing); return escortPositions[lowPart].multiply(spacing);
}; };