AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-30 15:30:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed all renamed units being called 'instanceName' (#5140)

Browse Source 
* Fixed all renamed units being called 'instanceName'

* Removed extreneous square brackets resulting in incorrect translations

* Fixed translation problems
This commit is contained in:
Xander Lenstra 2021-09-08 19:42:27 +02:00 committed by GitHub
parent 69e2828a0e
commit 9a29ce8422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/automation/UnitAutomation.kt
View File

@ -495,7 +495,7 @@ object UnitAutomation {
if (unit.isDestroyed) return // Opening ruins _might_ have upgraded us to another unit if (unit.isDestroyed) return // Opening ruins _might_ have upgraded us to another unit
if (unit.health < 80 && tryHealUnit(unit)) return if (unit.health < 80 && tryHealUnit(unit)) return
if (tryExplore(unit)) return if (tryExplore(unit)) return
unit.civInfo.addNotification("[${unit.displayName()}] finished exploring.", unit.currentTile.position, unit.name, "OtherIcons/Sleep") unit.civInfo.addNotification("${unit.shortDisplayName()} finished exploring.", unit.currentTile.position, unit.name, "OtherIcons/Sleep")
unit.action = null unit.action = null
} }

2
core/src/com/unciv/logic/automation/WorkerAutomation.kt
View File

@ -170,7 +170,7 @@ class WorkerAutomation(
if (WorkerAutomationConst.consoleOutput) if (WorkerAutomationConst.consoleOutput)
println("WorkerAutomation: ${unit.label()} -> nothing to do") println("WorkerAutomation: ${unit.label()} -> nothing to do")
unit.civInfo.addNotification("[${unit.displayName()}] has no work to do.", currentTile.position, unit.name, "OtherIcons/Sleep") unit.civInfo.addNotification("${unit.shortDisplayName()} has no work to do.", currentTile.position, unit.name, "OtherIcons/Sleep")
} }
/** /**

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

@ -644,8 +644,8 @@ class CivilizationInfo {
val unitToDisband = civMilitaryUnits.first() val unitToDisband = civMilitaryUnits.first()
unitToDisband.disband() unitToDisband.disband()
civMilitaryUnits -= unitToDisband civMilitaryUnits -= unitToDisband
val unitName = unitToDisband.displayName() val unitName = unitToDisband.shortDisplayName()
addNotification("Cannot provide unit upkeep for [$unitName] - unit has been disbanded!", unitName, NotificationIcon.Death) addNotification("Cannot provide unit upkeep for $unitName - unit has been disbanded!", unitName, NotificationIcon.Death)
} }
} }
} }

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

@ -111,12 +111,17 @@ class MapUnit {
fun displayName(): String { fun displayName(): String {
val baseName = val baseName =
if (instanceName == null) "[$name]" if (instanceName == null) "[$name]"
else "instanceName ([$name])" else "$instanceName ([$name])"
return if (religion == null) baseName return if (religion == null) baseName
else "$baseName ([${getReligionDisplayName()}])" else "$baseName ([${getReligionDisplayName()}])"
} }
fun shortDisplayName(): String {
return if (instanceName != null) "[$instanceName]"!!
else "[$name]"
}
var currentMovement: Float = 0f var currentMovement: Float = 0f
var health: Int = 100 var health: Int = 100