From 0150076f18baf68f6fd3b4362f8acb0ff3f88832 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Mon, 2 Dec 2024 14:39:30 +0200 Subject: [PATCH] Removed 'please' from Civ demands to make them more demand-y --- android/assets/jsons/translations/template.properties | 4 ++++ .../transients/CapitalConnectionsFinder.kt | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index d1e2d8f99e..f609e83a78 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -212,12 +212,16 @@ Current leader(s): [leaders], you: [yourScore] = [civInfo] with [value] [valueType] = Demands = +# Will be deprecated in a few versions Please don't settle new cities near us. = +Don't settle new cities near us. = Very well, we shall look for new lands to settle. = We shall do as we please. = We noticed your new city near our borders, despite your promise. This will have....implications. = +# Will be deprecated in a few versions Please don't spread your religion to us. = +Don't spread your religion to us. = Very well, we shall spread our faith elsewhere. = We noticed you have continued spreading your faith, despite your promise. This will have...consequences. = diff --git a/core/src/com/unciv/logic/civilization/transients/CapitalConnectionsFinder.kt b/core/src/com/unciv/logic/civilization/transients/CapitalConnectionsFinder.kt index 49f879df9e..e61e6296a6 100644 --- a/core/src/com/unciv/logic/civilization/transients/CapitalConnectionsFinder.kt +++ b/core/src/com/unciv/logic/civilization/transients/CapitalConnectionsFinder.kt @@ -79,11 +79,11 @@ class CapitalConnectionsFinder(private val civInfo: Civilization) { private fun checkHarbor(cityToConnectFrom: City) { check( - cityToConnectFrom, - transportType = if(cityToConnectFrom.wasPreviouslyReached(railroad,null)) harborFromRailroad else harborFromRoad, - overridingTransportType = harborFromRailroad, - tileFilter = { tile -> tile.isWater }, - cityFilter = { city -> city.civ == civInfo && city.containsHarbor() && !city.isBlockaded() } // use only own harbors + cityToConnectFrom, + transportType = if(cityToConnectFrom.wasPreviouslyReached(railroad,null)) harborFromRailroad else harborFromRoad, + overridingTransportType = harborFromRailroad, + tileFilter = { tile -> tile.isWater }, + cityFilter = { city -> city.civ == civInfo && city.containsHarbor() && !city.isBlockaded() } // use only own harbors ) }