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

Nation "style" can define unit appearance (#3368)

Browse Source 
* added "style" in Nation.kt and checks in Tilegroups
allows pixel units to be displayed as a specific style if appropriate file exists

* Preserves "specificUnitIconLocation" in tilegroups.kt
This commit is contained in:
9kgsofrice 2020-12-02 17:12:05 +00:00 committed by GitHub
parent 0e39d47dab
commit 2aac9ea314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/models/ruleset/Nation.kt
View File

@ -24,6 +24,7 @@ class Nation : INamed {
fun getLeaderDisplayName() = if (isCityState()) name fun getLeaderDisplayName() = if (isCityState()) name
else "[$leaderName] of [$name]" else "[$leaderName] of [$name]"
val style = ""
var cityStateType: CityStateType? = null var cityStateType: CityStateType? = null
var preferredVictoryType: VictoryType = VictoryType.Neutral var preferredVictoryType: VictoryType = VictoryType.Neutral
var declaringWar = "" var declaringWar = ""

10
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View File

@ -614,7 +614,6 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
} }
} }
} }
fun updatePixelMilitaryUnit(showMilitaryUnit: Boolean) { fun updatePixelMilitaryUnit(showMilitaryUnit: Boolean) {
var newImageLocation = "" var newImageLocation = ""
@ -624,8 +623,11 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
val specificUnitIconLocation = tileSetStrings.unitsLocation + militaryUnit.name val specificUnitIconLocation = tileSetStrings.unitsLocation + militaryUnit.name
newImageLocation = when { newImageLocation = when {
!UncivGame.Current.settings.showPixelUnits -> "" !UncivGame.Current.settings.showPixelUnits -> ""
militaryUnit.civInfo.nation.style=="" &&
ImageGetter.imageExists(specificUnitIconLocation) -> specificUnitIconLocation
ImageGetter.imageExists(specificUnitIconLocation + "-" + militaryUnit.civInfo.nation.style) ->
specificUnitIconLocation + "-" + militaryUnit.civInfo.nation.style
ImageGetter.imageExists(specificUnitIconLocation) -> specificUnitIconLocation ImageGetter.imageExists(specificUnitIconLocation) -> specificUnitIconLocation
militaryUnit.baseUnit.replaces!=null && militaryUnit.baseUnit.replaces!=null &&
ImageGetter.imageExists(tileSetStrings.unitsLocation + militaryUnit.baseUnit.replaces) -> ImageGetter.imageExists(tileSetStrings.unitsLocation + militaryUnit.baseUnit.replaces) ->
tileSetStrings.unitsLocation + militaryUnit.baseUnit.replaces tileSetStrings.unitsLocation + militaryUnit.baseUnit.replaces
@ -664,6 +666,10 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
val specificUnitIconLocation = tileSetStrings.unitsLocation + civilianUnit.name val specificUnitIconLocation = tileSetStrings.unitsLocation + civilianUnit.name
newImageLocation = when { newImageLocation = when {
!UncivGame.Current.settings.showPixelUnits -> "" !UncivGame.Current.settings.showPixelUnits -> ""
civilianUnit.civInfo.nation.style=="" &&
ImageGetter.imageExists(specificUnitIconLocation) -> specificUnitIconLocation
ImageGetter.imageExists(specificUnitIconLocation + "-" + civilianUnit.civInfo.nation.style) ->
specificUnitIconLocation + "-" + civilianUnit.civInfo.nation.style
ImageGetter.imageExists(specificUnitIconLocation) -> specificUnitIconLocation ImageGetter.imageExists(specificUnitIconLocation) -> specificUnitIconLocation
else -> "" else -> ""
} }