mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-20 12:48:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

City state permutations normalized to "City-State"

Browse Source 
#5963
This commit is contained in:
yairm210
2022-01-14 12:16:16 +02:00
parent 4dcb45408d
commit e7042d24ea
40 changed files with 230 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/civilization/CityStateFunctions.kt
View File

@ -522,7 +522,7 @@ class CityStateFunctions(val civInfo: CivilizationInfo) {
// Set a diplomatic flag so we remember for future quests (and not to give them any)
civInfo.getDiplomacyManager(bully).setFlag(DiplomacyFlags.Bullied, 20)
// Notify all city states that we were bullied (for quests)
// Notify all City-States that we were bullied (for quests)
civInfo.gameInfo.getAliveCityStates()
.forEach { it.questManager.cityStateBullied(civInfo, bully) }
}
@ -627,7 +627,7 @@ class CityStateFunctions(val civInfo: CivilizationInfo) {
NotificationIcon.Death, civInfo.civName)
}
// Notify all city states that we were killed (for quest completion)
// Notify all City-States that we were killed (for quest completion)
civInfo.gameInfo.getAliveCityStates()
.forEach { it.questManager.cityStateConquered(civInfo, attacker) }
}

2
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -751,7 +751,7 @@ class DiplomacyManager() {
// Our ally city states make peace with us
if (thirdCiv.getAllyCiv() == civInfo.civName && thirdCiv.isAtWarWith(otherCiv))
thirdCiv.getDiplomacyManager(otherCiv).makePeace()
// Other city states that are not our ally don't like the fact that we made peace with their enemy
// Other City-States that are not our ally don't like the fact that we made peace with their enemy
if (thirdCiv.getAllyCiv() != civInfo.civName && thirdCiv.isAtWarWith(otherCiv))
thirdCiv.getDiplomacyManager(civInfo).addInfluence(-10f)
}

2
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -899,7 +899,7 @@ class MapUnit {
private fun clearEncampment(tile: TileInfo) {
tile.improvement = null
// Notify city states that this unit cleared a Barbarian Encampment, required for quests
// Notify City-States that this unit cleared a Barbarian Encampment, required for quests
civInfo.gameInfo.getAliveCityStates()
.forEach { it.questManager.barbarianCampCleared(civInfo, tile.position) }

8
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -779,10 +779,10 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo): BaseScreen() {
UsedNuclearWeapons -> "Your use of nuclear weapons is disgusting!"
StealingTerritory -> "You have stolen our lands!"
GaveUsUnits -> "You gave us units!"
DestroyedProtectedMinor -> "You destroyed City States that were under our protection!"
AttackedProtectedMinor -> "You attacked City States that were under our protection!"
BulliedProtectedMinor -> "You demanded tribute from City States that were under our protection!"
SidedWithProtectedMinor -> "You sided with a City State over us"
DestroyedProtectedMinor -> "You destroyed City-States that were under our protection!"
AttackedProtectedMinor -> "You attacked City-States that were under our protection!"
BulliedProtectedMinor -> "You demanded tribute from City-States that were under our protection!"
SidedWithProtectedMinor -> "You sided with a City-State over us"
ReturnedCapturedUnits -> "You returned captured units to us"
}
text = text.tr() + " "