[PATCH] Return proportional amount of resources when deleting foundations

[elexis]

Currently 100% of the resources are returned when a building foundation is deleted or destroyed.

The source code actually says that a proportional amount should be returned. Only because of a programming mistake or bug 100% are returned.

See function Foundation.prototype.OnDestroy in file trunk/binaries/data/mods/public/simulation/components/Foundation.js

Foundation.prototype.OnDestroy = function()
{
	// Refund a portion of the construction cost, proportional to the amount of build progress remaining
        // ...

	for (var r in this.costs)
	{
		var scaled = Math.floor(this.costs[r] * (1.0 - this.GetBuildProgress()));
                // ...
	}
};


/**
 * Returns the current build progress in a [0,1] range.
 */
Foundation.prototype.GetBuildProgress = function()
{
	var cmpHealth = Engine.QueryInterface(this.entity, IID_Health)
	var hitpoints = cmpHealth.GetHitpoints();
	var maxHitpoints = cmpHealth.GetMaxHitpoints();
	return (hitpoints / maxHitpoints);
};

​http://svn.wildfiregames.com/public/ps/trunk/binaries/data/mods/public/simulation/components/Foundation.js

The GetBuildProgress() function always returns 0 because the hitpoint count in this function equates to 0.

[mimo]

In 16470:

fix computation of foundation refund when destroyed, fixes #3132

[elexis]

With the patch above, it will refund 100% of the resources when a completely unbuilt building will be deleted. Currently it returns only 99%, which is a bit annoying when playing nomad and you misplaced your CC. In that case you will not be able to place it somewhere else without gathering 1 unit of each resource.

[mimo]

In 16574:

fix rounding when returning resources from aborted foundation, patch by elexis, fixes #3132

[mimo]

thanks for the patch

[elexis]

r16622 not only fixed a oos that was caused by the original patch - it also changes the behaviour of the refund. The original patch refunded resources just by the current build progress, while the new behaviour is to return resources according to the highest build progress.

This way another 'bug' is fixed. If you would build a CC 90% and then the enemy destroys it, you would get returned 100% of the resources. With the newer version you get only those 10% back. Thanks for that fix.

[mimo]

Replying to elexis:

r16622 not only fixed a oos that was caused by the original patch - it also changes the behaviour of the refund. The original patch refunded resources just by the current build progress, while the new behaviour is to return resources according to the highest build progress.

hummm, did you read or used the original patch before posting this comment ? the highest build progress was there since the first patch.

[elexis]

Replying to mimo:

hummm, did you read or used the original patch before posting this comment ? the highest build progress was there since the first patch.

Ah, true. Sorry for not crediting you.

Before mimos patch (r16470) it had the wrong behaviour (returning always 100% when a structure is destroyed by enemies).

​http://trac.wildfiregames.com/browser/ps/trunk/binaries/data/mods/public/simulation/components/Foundation.js?rev=16469