diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 5138041978..bef6917861 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -105,6 +105,16 @@ class CityStats { return stats } + private fun getStatsFromNationUnique(): Stats { + val stats = Stats() + + val civUnique = cityInfo.civInfo.getNation().unique + if(civUnique == "+2 Culture per turn from cities before discovering Steam Power") + stats.culture += 2 + + return stats + } + private fun getStatPercentBonusesFromNationUnique(): Stats { val stats = Stats() @@ -120,9 +130,6 @@ class CityStats { && currentConstruction is Building && currentConstruction.isWonder) stats.production+=20 - if(civUnique == "+2 Culture per turn from cities before discovering Steam Power") - stats.culture += 2 - return stats } @@ -306,6 +313,7 @@ class CityStats { newBaseStatList["Trade routes"] = getStatsFromTradeRoute() newBaseStatList["Buildings"] = cityInfo.cityConstructions.getStats() newBaseStatList["Policies"] = getStatsFromPolicies(civInfo.policies.adoptedPolicies) + newBaseStatList["National ability"] = getStatsFromNationUnique() val newStatPercentBonusList = LinkedHashMap() newStatPercentBonusList["Golden Age"]=getStatPercentBonusesFromGoldenAge(cityInfo.civInfo.goldenAges.isGoldenAge()) diff --git a/core/src/com/unciv/ui/saves/LoadScreen.kt b/core/src/com/unciv/ui/saves/LoadScreen.kt index 61702627ee..8e1c15e729 100644 --- a/core/src/com/unciv/ui/saves/LoadScreen.kt +++ b/core/src/com/unciv/ui/saves/LoadScreen.kt @@ -63,7 +63,7 @@ class LoadScreen : PickerScreen() { val errorLabel = "".toLabel().setFontColor(Color.RED) loadFromClipboardButton.onClick { try{ - val clipboardContentsString = Gdx.app.clipboard.contents + val clipboardContentsString = Gdx.app.clipboard.contents.trim() val decoded = Gzip.unzip(clipboardContentsString) val loadedGame = Json().fromJson(GameInfo::class.java, decoded) loadedGame.setTransients()