Oolite Bulletins

Code: Select all

var p = player.ship;
var sp = Math.round(p.velocity.magnitude()/10)*10; //stable but can not show FTL drive nor Torus multiplier
var t = worldScripts.torustosun;
if( t && t.$TorusToSunBonus > 1 ) {
        sp = Math.round(t.$TorusToSunBonus * 3.2 * p.maxSpeed)*10;
        if( t.$TimeFw > 1 ) { //time forwarding active
                sp *= t.$TimeFw;
        }
} else {
        if(sp > 31 * p.maxSpeed ) { //support for FarPlanets and any other position changer drives
                var psp = Math.round(0.1*p.position.distanceTo(this.$PlayerPrevPos))*10;
                if( psp > 1.1*sp ) sp = psp;//instable but needed to follow position changes
        }
}
this.$PlayerPrevPos = p.position;
//now sp contain the approximated player speed

Code: Select all

--- a/Scripts/torustosun.js
+++ b/Scripts/torustosun.js
@@ -74,6 +74,11 @@ this._FCB = function( delta ) { //masslockcheck in this framecallback
                var s = ps.maxSpeed * 32;
                var t = this.$TimeFw - 1; //torus speed with time forwarding
                ps.position = ps.position.add( f.multiply( delta * s * ( t + b - 1 ) ) ); //apply speed bonus
+       } else
+       {
+               var ws = worldScripts.torustosun;
+               if( isValidFrameCallback( ws.$FCB ) )
+                       removeFrameCallback( ws.$FCB );
        }
 }
 
@@ -112,8 +117,6 @@ this._StartTimer = function() {
        ws.$PrevEnergy = player.ship.maxEnergy;
        ws.$FwSec = 0; //part of a second during forwarding
        ws.$Timer = new Timer(ws, ws._Timed.bind(ws), 1, 0.25);
-       if( !isValidFrameCallback( ws.$FCB ) )
-               ws.$FCB = addFrameCallback( ws._FCB.bind(ws) );
 }
 
 this._StopTimer = function() {
@@ -132,6 +135,9 @@ this._Timed = function() {
        if( !ps || !ps.isValid ) return; //player died
        if( player.alertCondition == 1 && ps.speed > ps.maxSpeed * 31.9 ) {//Green Alert and Torus maxed
                this._TorusSpeedUp();
+               var ws = worldScripts.torustosun;
+               if( !isValidFrameCallback( ws.$FCB ) )
+                       ws.$FCB = addFrameCallback( ws._FCB.bind(ws) );
        }
 }

Code: Select all

--- a/Scripts/torustosun.js
+++ b/Scripts/torustosun.js
@@ -51,11 +51,24 @@ this.shipWillEnterWitchspace = function() {
 }
 
 this.shipWillExitWitchspace = function() {
-       this._StartTimer(); //must start before Telescope FCBs!
+       this.alertConditionChanged(player.alertCondition, -1); //must start before Telescope FCBs!
 }
 
 this.shipWillLaunchFromStation = function() {
-       this._StartTimer(); //must start before Telescope FCBs!
+       this.alertConditionChanged(player.alertCondition, -1);
+}
+
+this.alertConditionChanged = function(newCondition, oldCondition)
+{
+       log("alertConditionChanged", newCondition  + "::" + oldCondition)
+       if (newCondition == 1)
+       {
+               this._StartTimer();
+       }
+       else
+       {
+               this._StopTimer();
+       }
 }
 
 //TorusToSun functions
@@ -133,7 +146,7 @@ this._StopTimer = function() {
 this._Timed = function() {
        var ps = player.ship;
        if( !ps || !ps.isValid ) return; //player died
-       if( player.alertCondition == 1 && ps.speed > ps.maxSpeed * 31.9 ) {//Green Alert and Torus maxed
+       if( ps.speed > ps.maxSpeed * 31.9 ) {//Green Alert and Torus maxed
                this._TorusSpeedUp();
                var ws = worldScripts.torustosun;
                if( !isValidFrameCallback( ws.$FCB ) )

Code: Select all

@@ -37,10 +37,13 @@ this.$WFP = null; //store worldScripts.farplanets
 //world script events
 this.startUp = function() {
 	this.$WED = worldScripts.escortdeck;
 	this.$WFP = worldScripts.farplanets;
 	var n = worldScripts.numerichudv3;
+	var ws = worldScripts.torustosun;
+	ws.$Timer = new Timer(ws, ws._Timed.bind(ws), 1, 0.25);
+	ws.$Timer.stop();
 //	if( n && n.version * 1 >= 3.24 ) this.$Messages = false;
 }
 
 this.shipWillDockWithStation = function() {
 	this._StopTimer();
@@ -112,30 +128,30 @@ this._Proximity = function(ws) { //there is a similar function in TimeControl ox
 	return(false);
 }
 
 this._StartTimer = function() {
 	var ws = worldScripts.torustosun;
+	if( ws.$Timer.start() ) {
+		log("t","was started before")
+		return
+	}
 	ws.$PrevEnergy = player.ship.maxEnergy;
 	ws.$FwSec = 0; //part of a second during forwarding
-	ws.$Timer = new Timer(ws, ws._Timed.bind(ws), 1, 0.25);
 }
 
 this._StopTimer = function() {
 	var ws = worldScripts.torustosun;
-	if( ws.$Timer ) {
 	ws.$Timer.stop();
-		delete ws.$Timer;
-	}
 	if( isValidFrameCallback( ws.$FCB ) )
 		removeFrameCallback( ws.$FCB );
 	this._TorusSlowDown(); //set bonus to 1
 }