From 5b1f5dd2c16dce52485d9e55e914aedebe6a61f0 Mon Sep 17 00:00:00 2001 From: leper Date: Wed, 5 Jun 2013 21:35:31 +0000 Subject: [PATCH] Display expected trading gain (GainMultiplier = 1) for market foundations when setting rally points. Fixes #1963. This was SVN commit r13452. --- binaries/data/mods/public/gui/session/input.js | 6 +++++- binaries/data/mods/public/simulation/helpers/TraderGain.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/binaries/data/mods/public/gui/session/input.js b/binaries/data/mods/public/gui/session/input.js index ff5ef5b9d4..6b4518f48d 100644 --- a/binaries/data/mods/public/gui/session/input.js +++ b/binaries/data/mods/public/gui/session/input.js @@ -277,7 +277,11 @@ function getActionInfo(action, target) data.target = traderData.secondMarket; data.source = traderData.firstMarket; cursor = "action-setup-trade-route"; - tooltip = "Click to establish a default route for new traders. Gain: " + gain + " metal."; + tooltip = "Click to establish a default route for new traders."; + if (trader) + tooltip += " Gain: " + gain + " metal."; + else // Foundation or cannot produce traders + tooltip += " Expected gain: " + gain + " metal."; } } diff --git a/binaries/data/mods/public/simulation/helpers/TraderGain.js b/binaries/data/mods/public/simulation/helpers/TraderGain.js index dcb6f614a1..2406d7d670 100644 --- a/binaries/data/mods/public/simulation/helpers/TraderGain.js +++ b/binaries/data/mods/public/simulation/helpers/TraderGain.js @@ -25,7 +25,7 @@ function CalculateTraderGain(firstMarket, secondMarket, template) if (cmpFirstMarketOwnership.GetOwner() != cmpSecondMarketOwnership.GetOwner()) gain *= 1 + INTERNATIONAL_TRADING_ADDITION / 100; - if (template.GainMultiplier) + if (template && template.GainMultiplier) gain *= template.GainMultiplier; gain = Math.round(gain); return gain;