From c2f6637a910d3fd7c46633866d1ef554fd8279c5 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Sun, 27 Jan 2019 16:19:48 +0800 Subject: [PATCH] Fix construction cost. --- core/src/com/unciv/models/gamebasics/Building.kt | 3 ++- core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/models/gamebasics/Building.kt b/core/src/com/unciv/models/gamebasics/Building.kt index 891196b78b..edb582f7d9 100644 --- a/core/src/com/unciv/models/gamebasics/Building.kt +++ b/core/src/com/unciv/models/gamebasics/Building.kt @@ -162,7 +162,8 @@ class Building : NamedStats(), IConstruction{ // https://forums.civfanatics.com/threads/rush-buying-formula.393892/ var cost = Math.pow((30 * getProductionCost(adoptedPolicies)).toDouble(), 0.75) * (1 + hurryCostModifier / 100) if (adoptedPolicies.contains("Mercantilism")) cost *= 0.75 - if (adoptedPolicies.contains("Patronage")) cost *= 0.5 + if (adoptedPolicies.contains("Patronage") + && listOf("Monument", "Temple", "Opera House", "Museum").contains(name) ) cost *= 0.5 return (cost / 10).toInt() * 10 } diff --git a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt index e49c31514d..8e9609b0b4 100644 --- a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt @@ -91,6 +91,7 @@ class BaseUnit : INamed, IConstruction, ICivilopedia { override fun getGoldCost(adoptedPolicies: HashSet): Int { var cost = getBaseGoldCost() + if(adoptedPolicies.contains("Mercantilism")) cost *= 0.75 if(adoptedPolicies.contains("Militarism")) cost *= 0.66f return (cost / 10).toInt() * 10 // rounded down o nearest ten }