mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-13 17:28:57 +07:00
Code Issues Packages Projects Releases Wiki Activity

Removed 'please' from Civ demands to make them more demand-y

Browse Source
This commit is contained in:
yairm210
2024-12-02 14:39:30 +02:00
parent bda9524f2c
commit 0150076f18
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/assets/jsons/translations/template.properties
View File

@ -212,12 +212,16 @@ Current leader(s): [leaders], you: [yourScore] =
[civInfo] with [value] [valueType] = [civInfo] with [value] [valueType] =
Demands = Demands =
# Will be deprecated in a few versions
Please don't settle new cities near us. = 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. = Very well, we shall look for new lands to settle. =
We shall do as we please. = We shall do as we please. =
We noticed your new city near our borders, despite your promise. This will have....implications. = 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. = Please don't spread your religion to us. =
Don't spread your religion to us. =
Very well, we shall spread our faith elsewhere. = Very well, we shall spread our faith elsewhere. =
We noticed you have continued spreading your faith, despite your promise. This will have...consequences. = We noticed you have continued spreading your faith, despite your promise. This will have...consequences. =

10
core/src/com/unciv/logic/civilization/transients/CapitalConnectionsFinder.kt
View File

@ -79,11 +79,11 @@ class CapitalConnectionsFinder(private val civInfo: Civilization) {
private fun checkHarbor(cityToConnectFrom: City) { private fun checkHarbor(cityToConnectFrom: City) {
check( check(
cityToConnectFrom, cityToConnectFrom,
transportType = if(cityToConnectFrom.wasPreviouslyReached(railroad,null)) harborFromRailroad else harborFromRoad, transportType = if(cityToConnectFrom.wasPreviouslyReached(railroad,null)) harborFromRailroad else harborFromRoad,
overridingTransportType = harborFromRailroad, overridingTransportType = harborFromRailroad,
tileFilter = { tile -> tile.isWater }, tileFilter = { tile -> tile.isWater },
cityFilter = { city -> city.civ == civInfo && city.containsHarbor() && !city.isBlockaded() } // use only own harbors cityFilter = { city -> city.civ == civInfo && city.containsHarbor() && !city.isBlockaded() } // use only own harbors
) )
} }