Performance Optimizations (nuclear-unicorn#137)

* perf: Prefer static time source

This skips creating two new `Date` instances each tick. Minor performance bump.

* style: Clean up code around tick handler

* refactor: Move policy effect calculation into passive path

`calculateTradeBonusFromPolicies` seems generally like the ideal location for the calculation. The existing approach causes heavy computation after every trade, due incurred to meta cache refreshes.

Author: oliversalzburg

game.js

@@ -4594,63 +4594,59 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 
 
 	tick: function(){
-		/**
-		 * Even if the game is paused, scheduler should still be able to obtain a focus to handle cases like save/load/reset
-		 */
+		// Even if the game is paused, scheduler should still be able to obtain a focus
+		// to handle cases like save/load/reset
 		this.timer.updateScheduledEvents();
-        var fpsElement;
 
-		if (this.undoChange){
-			//"Undo button" countdown should still tick while pawsed
+		if (this.undoChange) {
+			// "Undo button" countdown should still tick while pawsed
 			this.undoChange.ttl--;
-			if (this.undoChange.ttl <= 0){
+			if (this.undoChange.ttl <= 0) {
 				this.undoChange = null;
 				this._publish("server/undoStateChanged");
 			}
 		}
-		if (this.isPaused){
-			this.ui.update(); //Still update UI if the player gathers catnip while pawsed or something
+		if (this.isPaused) {
+			// Still update UI if the player gathers catnip while pawsed or something
+			this.ui.update();
 			return;
 		}
 
-
-
-		var timestampStart = new Date().getTime();
+		var timestampStart = Date.now;
 
 		this.update();
 		this.calendar.tick();
 		this.ticks++;
 
-		var timestampEnd = new Date().getTime();
-		//if (this.isLocalhost) {	//always collect fps metrics
-			this.totalUpdateTimeTicks++;
-
-			var tsDiff = timestampEnd - timestampStart;
-			this.totalUpdateTime[this.totalUpdateTimeCurrent] += tsDiff;
-			this.totalUpdateTimeCurrent = this.totalUpdateTimeCurrent == 4 ? 0 : this.totalUpdateTimeCurrent + 1;
-
-			var avg = (this.totalUpdateTime[0] + this.totalUpdateTime[1] + this.totalUpdateTime[2] + this.totalUpdateTime[3] + this.totalUpdateTime[4]) / this.totalUpdateTimeTicks;
-			var avg0 = this.totalUpdateTime[0] / Math.floor((this.totalUpdateTimeTicks - 1) / 5);
-			var avg1 = this.totalUpdateTime[1] / Math.floor((this.totalUpdateTimeTicks - 2) / 5);
-			var avg2 = this.totalUpdateTime[2] / Math.floor((this.totalUpdateTimeTicks - 3) / 5);
-			var avg3 = this.totalUpdateTime[3] / Math.floor((this.totalUpdateTimeTicks - 4) / 5);
-			var avg4 = this.totalUpdateTime[4] / Math.floor((this.totalUpdateTimeTicks - 5) / 5);
-
-			if (tsDiff < 10) {
-				tsDiff = 10;
-			}
-			this.fps = {
-				ms: tsDiff,
-				avg: avg,
-				avg0: avg0,
-				avg1: avg1,
-				avg2: avg2,
-				avg3: avg3,
-				avg4: avg4
-			};
-		//}
+		var timestampEnd = Date.now;
+
+		this.totalUpdateTimeTicks++;
+
+		var tsDiff = timestampEnd - timestampStart;
+		this.totalUpdateTime[this.totalUpdateTimeCurrent] += tsDiff;
+		this.totalUpdateTimeCurrent = this.totalUpdateTimeCurrent == 4 ? 0 : this.totalUpdateTimeCurrent + 1;
+
+		var avg = (this.totalUpdateTime[0] + this.totalUpdateTime[1] + this.totalUpdateTime[2] + this.totalUpdateTime[3] + this.totalUpdateTime[4]) / this.totalUpdateTimeTicks;
+		var avg0 = this.totalUpdateTime[0] / Math.floor((this.totalUpdateTimeTicks - 1) / 5);
+		var avg1 = this.totalUpdateTime[1] / Math.floor((this.totalUpdateTimeTicks - 2) / 5);
+		var avg2 = this.totalUpdateTime[2] / Math.floor((this.totalUpdateTimeTicks - 3) / 5);
+		var avg3 = this.totalUpdateTime[3] / Math.floor((this.totalUpdateTimeTicks - 4) / 5);
+		var avg4 = this.totalUpdateTime[4] / Math.floor((this.totalUpdateTimeTicks - 5) / 5);
+
+		if (tsDiff < 10) {
+			tsDiff = 10;
+		}
+		this.fps = {
+			ms: tsDiff,
+			avg: avg,
+			avg0: avg0,
+			avg1: avg1,
+			avg2: avg2,
+			avg3: avg3,
+			avg4: avg4
+		};
 
-		//collect fps info every minute or so
+		// Collect fps info every minute or so
 		if (this.ticks % (this.ticksPerSecond * 60) == 0 && this.telemetry) {
 			var memory = null;
 			if (window.performance && window.performance.memory) {

js/diplomacy.js

@@ -543,7 +543,6 @@ dojo.declare("classes.managers.DiplomacyManager", null, {
 		//Update Trade Stats
 		this.game.stats.getStat("totalTrades").val = Math.min(this.game.stats.getStat("totalTrades").val + successfullTradeAmount, Number.MAX_VALUE);
 		this.game.stats.getStatCurrent("totalTrades").val += successfullTradeAmount;
-		this.game.upgrade({policies : ["sharkRelationsMerchants"]});
 
 		return boughtResources;
 	},
@@ -769,7 +768,12 @@ dojo.declare("classes.managers.DiplomacyManager", null, {
 	calculateTradeBonusFromPolicies: function(raceName, game){
 		var tradepostsTradeRatio = game.bld.getBuildingExt("tradepost").meta.effects["tradeRatio"];
 		var phantomTradeposts = game.diplomacy.calculatePhantomTradeposts(raceName, game);
-		return phantomTradeposts * tradepostsTradeRatio;
+
+		// Apply effects from sharkRelationsMerchants policy.
+		var trades = game.stats.getStatCurrent("totalTrades").val;
+		var sharkRelationsMerchantsRatio = Math.min(Math.round((Math.log10(Math.max(trades, 100)) - 1) * 3) / 100, 0.3);
+
+		return phantomTradeposts * tradepostsTradeRatio * sharkRelationsMerchantsRatio;
 	}
 });
 

js/science.js

@@ -1451,26 +1451,22 @@ dojo.declare("classes.managers.ScienceManager", com.nuclearunicorn.core.TabManag
 		}
 	}, {
 		name: "sharkRelationsMerchants",
-        label: $I("policy.sharkRelationsMerchants.label"),
-        description: $I("policy.sharkRelationsMerchants.desc"),
-        prices: [
-            {name : "culture", val: 2200}
-        ],
-        effects:{
-            "tradeRatio" : 0
-        },
-        unlocked: false,
-        blocked: false,
-		isRelation: true,
-        blocks:["sharkRelationsScribes", "sharkRelationsBotanists"],
-		calculateEffects: function(self, game) {
-			var trades = game.stats.getStatCurrent("totalTrades").val;
-			self.effects["tradeRatio"] = Math.min(Math.round((Math.log10(Math.max(trades, 100)) - 1) * 3) / 100, 0.3);			
+		label: $I("policy.sharkRelationsMerchants.label"),
+		description: $I("policy.sharkRelationsMerchants.desc"),
+		prices: [
+			{name : "culture", val: 2200}
+		],
+		effects: {
+			"tradeRatio" : 0
 		},
-		evaluateLocks: function(game){
+		unlocked: false,
+		blocked: false,
+		isRelation: true,
+		blocks: ["sharkRelationsScribes", "sharkRelationsBotanists"],
+		evaluateLocks: function(game) {
 			return game.science.checkRelation("sharks", 20);
 		}
-	},{
+	}, {
 		name: "sharkRelationsBotanists",
         label: $I("policy.sharkRelationsBotanists.label"),
         description: $I("policy.sharkRelationsBotanists.desc"),