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

Added new experimental tile layering - see #3716

Browse Source
This commit is contained in:
Yair Morgenstern 2021-04-01 22:08:29 +03:00
parent 2da49da716
commit 8c7c0a0f91
6 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/Civ V - Vanilla/TileImprovements.json
View File

@ -211,5 +211,6 @@
{ "name": "Ancient ruins" },
{ "name": "City ruins" },
{ "name": "City center" },
{ "name": "Barbarian encampment" }
]

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

@ -585,6 +585,7 @@ class CivilizationInfo {
fun addCity(location: Vector2) {
val newCity = CityInfo(this, location)
newCity.cityConstructions.chooseNextConstruction()
}

1
core/src/com/unciv/models/metadata/GameSettings.kt
View File

@ -40,6 +40,7 @@ class GameSettings {
var visualMods = HashSet<String>()
var showExperimentalWorldWrap = false
var showExperimentalTileLayering = false
init {
// 26 = Android Oreo. Versions below may display permanent icon in notification bar.

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

@ -169,6 +169,38 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
crosshairImage.isVisible = true
}
fun getTileBaseImageLocationsNew(viewingCiv: CivilizationInfo?): List<String> {
if (viewingCiv == null && !showEntireMap) return listOf(tileSetStrings.hexagon)
val shouldShowImprovement = tileInfo.improvement != null && UncivGame.Current.settings.showPixelImprovements
val shouldShowResource = UncivGame.Current.settings.showPixelImprovements
&& tileInfo.resource != null &&
(showEntireMap || viewingCiv == null || tileInfo.hasViewableResource(viewingCiv))
var resourceAndImprovementSequence = sequenceOf<String?>()
if (shouldShowResource) resourceAndImprovementSequence += sequenceOf(tileInfo.resource)
if (shouldShowImprovement) resourceAndImprovementSequence += sequenceOf(tileInfo.improvement)
resourceAndImprovementSequence = resourceAndImprovementSequence.filterNotNull()
val allTogether = (sequenceOf(tileInfo.baseTerrain) + tileInfo.terrainFeatures.asSequence() + resourceAndImprovementSequence)
.filterNotNull().joinToString("+").let { tileSetStrings.getTile(it) }
if (ImageGetter.imageExists(allTogether)) return listOf(allTogether)
else return getTerrainImageLocations() + getImprovementAndResourceImages(resourceAndImprovementSequence)
}
fun getTerrainImageLocations(): List<String> {
val terrainSequence = sequenceOf(tileInfo.baseTerrain) + tileInfo.terrainFeatures.asSequence()
val allTerrains = terrainSequence.joinToString("+").let { tileSetStrings.getTile(it) }
if (ImageGetter.imageExists(allTerrains)) return listOf(allTerrains)
else return terrainSequence.toList()
}
fun getImprovementAndResourceImages(resourceAndImprovementSequence: Sequence<String>): List<String> {
val altogether = resourceAndImprovementSequence.joinToString("+").let { tileSetStrings.getTile(it) }
if (ImageGetter.imageExists(altogether)) return listOf(altogether)
else return resourceAndImprovementSequence.toList()
}
fun getTileBaseImageLocations(viewingCiv: CivilizationInfo?): List<String> {
if (viewingCiv == null && !showEntireMap) return listOf(tileSetStrings.hexagon)
@ -298,9 +330,10 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
}
private fun updateTileImage(viewingCiv: CivilizationInfo?) {
val tileBaseImageLocations = getTileBaseImageLocations(viewingCiv)
val tileBaseImageLocations = if (UncivGame.Current.settings.showExperimentalTileLayering) getTileBaseImageLocationsNew(viewingCiv)
else getTileBaseImageLocations(viewingCiv)
if(tileBaseImageLocations.size == tileImageIdentifiers.size) {
if (tileBaseImageLocations.size == tileImageIdentifiers.size) {
if (tileBaseImageLocations.withIndex().all { (i, imageLocation) -> tileImageIdentifiers[i] == imageLocation })
return // All image identifiers are the same as the current ones, no need to change anything
}
@ -311,6 +344,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
for (location in tileBaseImageLocations.reversed()) { // reversed because we send each one to back
// Here we check what actual tiles exist, and pick one - not at random, but based on the tile location,
// so it stays consistent throughout the game
if (!ImageGetter.imageExists(location)) continue
val existingImages = ArrayList<String>()
existingImages.add(location)
var i = 2

4
core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt
View File

@ -132,6 +132,10 @@ class OptionsPopup(val previousScreen:CameraStageBaseScreen) : Popup(previousScr
settings.showExperimentalWorldWrap)
{ settings.showExperimentalWorldWrap = it }
addYesNoRow("Show experimental tile layering\nHIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED!",
settings.showExperimentalTileLayering)
{ settings.showExperimentalTileLayering = it }
addSoundEffectsVolumeSlider()
addMusicVolumeSlider()
addTranslationGeneration()

1
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -125,6 +125,7 @@ object UnitActions {
action = {
UncivGame.Current.settings.addCompletedTutorialTask("Found city")
unit.civInfo.addCity(tile.position)
tile.improvement = "City center"
unit.destroy()
}.takeIf { unit.currentMovement > 0 && !tile.getTilesInDistance(3).any { it.isCityCenter() } })
}