Behemoth carrier update for OSE

[pmw57]

The behemoth carrier script has been updated to protect it from crashing Oolite.
scripts/behemoth-carrier.js

The code has been updated so that it is easier to consistently maintain and is formatted in a more stable manner.

Timer events have been updated so that they will fail elegantly, rather than crashing the system.

Code: Select all

	if (this.cloakingTimer) {
		this.cloakingTimer.start();
	} else {
		this.cloakingTimer = new Timer(this, this.statusCheck, 1, 1);
	}

The end of the code has had added to it the following cleanup code:

Code: Select all

this.playerWillEnterWitchspace = function () {
	if (this.cloakingTimer) {
		this.cloakingTimer.stop();
		delete this.cloakingTimer;
	}
};

[pmw57]

A significant change has occurred to the statusCheck method.

Here is how the original statusCheck code was structured

Code: Select all

this.statusCheck = function () {
	if (!this.cloakedTarget) {
		if (this.cloakingTimer) {
			this.cloakingTimer.stop();
			delete this.cloakingTimer;
		}
	} else {
		if (!this.cloakedTarget.isCloaked) {
			this.ship.target = this.cloakedTarget;
			this.ship.reactToAIMessage("TARGET_DECLOAKED");
			if (this.cloakingTimer) {
				this.cloakingTimer.stop();
				delete this.cloakingTimer;
			}
		}
	}
};

Notice that the timer is being stopped in two different places.

If we chart the two conditions, cloakedTarget and isCloaked, we will see that the timer is allowed to continue only when there is a currently cloaked target.
Likewise, the decloaked message occurs only when the ship is not cloaked.

That led to this update in the code:

Code: Select all

this.statusCheck = function () {
	if (this.cloakedTarget) {
		if (this.cloakedTarget.isCloaked) {
			return;
		} else {
			this.ship.target = this.cloakedTarget;
			this.ship.reactToAIMessage("TARGET_DECLOAKED");
		}
	}
	if (this.cloakingTimer) {
		this.cloakingTimer.stop();
		delete this.cloakingTimer;
	}
};