From 9bb4d988a3f3635197f366654e9fd0236ee767dd Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 12 Apr 2019 15:11:39 +0300 Subject: [PATCH] Added Arabian unique - #563 --- android/assets/jsons/Nations.json | 1 + core/src/com/unciv/logic/city/CityInfo.kt | 4 +++- core/src/com/unciv/logic/city/CityStats.kt | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Nations.json index cbe7a0779a..487b76d9eb 100644 --- a/android/assets/jsons/Nations.json +++ b/android/assets/jsons/Nations.json @@ -303,6 +303,7 @@ mainColor:[ 41,83,42], secondaryColor:[146,221,9], + unique:"+1 Gold from each Trade Route, Oil resources provide double quantity" cities:["Mecca","Medina","Damascus","Baghdad","Najran","Kufah","Basra","Khurasan","Anjar","Fustat", "Aden","Yamama","Muscat","Mansura","Bukhara","Fez","Shiraz","Merw","Balkh","Mosul", "Aydab","Bayt","Suhar","Taif","Hama","Tabuk","Sana'a","Shihr","Tripoli","Tunis"] diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index c6d6451c2a..18b8f8656f 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -115,7 +115,9 @@ class CityInfo { if(civInfo.policies.isAdopted("Facism")) amountToAdd*=2 if(civInfo.getNation().unique=="Strategic Resources provide +1 Production, and Horses, Iron and Uranium Resources provide double quantity" && resource.name in listOf("Horses","Iron","Uranium")) - amountToAdd*=2 + amountToAdd *= 2 + if(resource.name=="Oil" && civInfo.getNation().unique=="+1 Gold from each Trade Route, Oil resources provide double quantity") + amountToAdd *= 2 } if(resource.resourceType == ResourceType.Luxury && getBuildingUniques().contains("Provides 1 extra copy of each improved luxury resource near this City")) diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 5d1e685036..7885b7b100 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -34,7 +34,8 @@ class CityStats { if (!cityInfo.isCapital() && isConnectedToCapital(RoadStatus.Road)) { val civInfo = cityInfo.civInfo var goldFromTradeRoute = civInfo.getCapital().population.population * 0.15 + cityInfo.population.population * 1.1 - 1 // Calculated by http://civilization.wikia.com/wiki/Trade_route_(Civ5) - if (civInfo.policies.isAdopted("Trade Unions")) goldFromTradeRoute += 2.0 + if(civInfo.getNation().unique=="+1 Gold from each Trade Route, Oil resources provide double quantity") goldFromTradeRoute += 1 + if (civInfo.policies.isAdopted("Trade Unions")) goldFromTradeRoute += 2 if (civInfo.getBuildingUniques().contains("Gold from all trade routes +25%")) goldFromTradeRoute *= 1.25 // Machu Pichu speciality stats.gold += goldFromTradeRoute.toFloat() }