Merge pull request nuclear-unicorn#141 from PeterCheney/fix/policy

Brent-Call · web-flow · commit 5e0794bca2a4 · 2025-06-09T07:19:35.000-04:00
fix: Add missing check for shark relation bonus
diff --git a/js/diplomacy.js b/js/diplomacy.js
@@ -775,7 +775,7 @@ dojo.declare("classes.managers.DiplomacyManager", null, {
 
 		// Apply effects from sharkRelationsMerchants policy.
 		var trades = game.stats.getStatCurrent("totalTrades").val;
-		var sharkRelationsMerchantsBonus = Math.min(Math.round((Math.log10(Math.max(trades, 100)) - 1) * 3) / 100, 0.3);
+		var sharkRelationsMerchantsBonus = this.game.science.getPolicy("sharkRelationsMerchants").researched ?  Math.min(Math.round((Math.log10(Math.max(trades, 100)) - 1) * 3) / 100, 0.3) : 0;
 
 		return sharkRelationsMerchantsBonus + phantomTradeposts * tradepostsTradeRatio;
 	}

Original file line number	Diff line number	Diff line change
`@@ -775,7 +775,7 @@ dojo.declare("classes.managers.DiplomacyManager", null, {`
`775`	`775`
`776`	`776`	`// Apply effects from sharkRelationsMerchants policy.`
`777`	`777`	`var trades = game.stats.getStatCurrent("totalTrades").val;`
`778`		`- var sharkRelationsMerchantsBonus = Math.min(Math.round((Math.log10(Math.max(trades, 100)) - 1) * 3) / 100, 0.3);`
	`778`	`+ var sharkRelationsMerchantsBonus = this.game.science.getPolicy("sharkRelationsMerchants").researched ? Math.min(Math.round((Math.log10(Math.max(trades, 100)) - 1) * 3) / 100, 0.3) : 0;`
`779`	`779`
`780`	`780`	`return sharkRelationsMerchantsBonus + phantomTradeposts * tradepostsTradeRatio;`
`781`	`781`	`}`