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

Fix "Connect road" going through Mountains (#11428)

Browse Source 
* Cache Road/Railroad improvement objects

* Fix connect roads planning paths through mountains
This commit is contained in:
SomeTroglodyte 2024-04-09 22:12:07 +02:00 committed by GitHub
parent ecbbad45e2
commit 35c3f7b191
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/city/City.kt
View File

@ -373,11 +373,11 @@ class City : IsPartOfGameInfoSerialization {
internal fun tryUpdateRoadStatus() {
if (getCenterTile().roadStatus == RoadStatus.None) {
val roadImprovement = RoadStatus.Road.improvement(getRuleset())
val roadImprovement = getRuleset().roadImprovement
if (roadImprovement != null && roadImprovement.techRequired in civ.tech.techsResearched)
getCenterTile().roadStatus = RoadStatus.Road
} else if (getCenterTile().roadStatus != RoadStatus.Railroad) {
val railroadImprovement = RoadStatus.Railroad.improvement(getRuleset())
val railroadImprovement = getRuleset().railroadImprovement
if (railroadImprovement != null && railroadImprovement.techRequired in civ.tech.techsResearched)
getCenterTile().roadStatus = RoadStatus.Railroad
}

2
core/src/com/unciv/logic/city/CityStats.kt
View File

@ -131,7 +131,7 @@ class CityStats(val city: City) {
private fun getStatPercentBonusesFromRailroad(): Stats {
val stats = Stats()
val railroadImprovement = RoadStatus.Railroad.improvement(city.getRuleset())
val railroadImprovement = city.getRuleset().railroadImprovement
?: return stats // for mods
val techEnablingRailroad = railroadImprovement.techRequired
// If we conquered enemy cities connected by railroad, but we don't yet have that tech,

8
core/src/com/unciv/logic/civilization/managers/TechManager.kt
View File

@ -525,12 +525,12 @@ class TechManager : IsPartOfGameInfoSerialization {
}
fun getBestRoadAvailable(): RoadStatus {
val railroadImprovement = RoadStatus.Railroad.improvement(getRuleset()) // May not exist in mods
if (railroadImprovement != null && (railroadImprovement.techRequired==null || isResearched(railroadImprovement.techRequired!!)))
val railroadImprovement = getRuleset().railroadImprovement // May not exist in mods
if (railroadImprovement != null && (railroadImprovement.techRequired == null || isResearched(railroadImprovement.techRequired!!)))
return RoadStatus.Railroad
val roadImprovement = RoadStatus.Road.improvement(getRuleset())
if (roadImprovement != null && (roadImprovement.techRequired==null || isResearched(roadImprovement.techRequired!!)))
val roadImprovement = getRuleset().roadImprovement
if (roadImprovement != null && (roadImprovement.techRequired == null || isResearched(roadImprovement.techRequired!!)))
return RoadStatus.Road
return RoadStatus.None

11
core/src/com/unciv/logic/map/MapPathing.kt
View File

@ -3,7 +3,6 @@ package com.unciv.logic.map
import com.unciv.logic.map.mapunit.MapUnit
import com.unciv.logic.map.tile.RoadStatus
import com.unciv.logic.map.tile.Tile
import com.unciv.models.ruleset.tile.TileImprovement
import com.unciv.utils.Log
//TODO: Eventually, all path generation in the game should be moved into here.
@ -34,12 +33,13 @@ object MapPathing {
return 1f
}
fun isValidRoadPathTile(unit: MapUnit, tile: Tile, roadImprovement: TileImprovement): Boolean {
fun isValidRoadPathTile(unit: MapUnit, tile: Tile): Boolean {
val roadImprovement = tile.ruleset.roadImprovement ?: return false
return tile.isLand
&& !tile.isImpassible()
&& unit.civ.hasExplored(tile)
&& tile.canCivPassThrough(unit.civ)
&& tile.hasRoadConnection(unit.civ, true) || tile.improvementFunctions.canBuildImprovement(roadImprovement, unit.civ)
&& (tile.hasRoadConnection(unit.civ, true) || tile.improvementFunctions.canBuildImprovement(roadImprovement, unit.civ))
}
/**
@ -53,11 +53,10 @@ object MapPathing {
* @return A sequence of tiles representing the path from startTile to endTile, or null if no valid path is found.
*/
fun getRoadPath(unit: MapUnit, startTile: Tile, endTile: Tile): List<Tile>?{
val roadImprovement = RoadStatus.Road.improvement(startTile.ruleset) ?: return null
return getPath(unit,
startTile,
endTile,
{ unit, tile -> isValidRoadPathTile(unit, tile, roadImprovement) },
::isValidRoadPathTile,
::roadPreferredMovementCost,
{_, _, _ -> 0f}
)
@ -106,5 +105,3 @@ object MapPathing {
}
}

13
core/src/com/unciv/models/ruleset/Ruleset.kt
View File

@ -5,6 +5,7 @@ import com.unciv.Constants
import com.unciv.json.fromJsonFile
import com.unciv.json.json
import com.unciv.logic.BackwardCompatibility.updateDeprecations
import com.unciv.logic.map.tile.RoadStatus
import com.unciv.models.metadata.BaseRuleset
import com.unciv.models.ruleset.nation.CityStateType
import com.unciv.models.ruleset.nation.Difficulty
@ -48,6 +49,10 @@ class Ruleset {
*/
var name = ""
/** The list of mods that made up this Ruleset, including the base ruleset. */
val mods = LinkedHashSet<String>()
//region Json fields
val beliefs = LinkedHashMap<String, Belief>()
val buildings = LinkedHashMap<String, Building>()
val difficulties = LinkedHashMap<String, Difficulty>()
@ -73,7 +78,10 @@ class Ruleset {
var cityStateTypes = LinkedHashMap<String, CityStateType>()
val personalities = LinkedHashMap<String, Personality>()
val events = LinkedHashMap<String, Event>()
var modOptions = ModOptions()
//endregion
//region cache fields
val greatGeneralUnits by lazy {
units.values.filter { it.hasUnique(UniqueType.GreatPersonFromCombat, StateForConditionals.IgnoreConditionals) }
}
@ -97,8 +105,9 @@ class Ruleset {
}.toSet()
}
val mods = LinkedHashSet<String>()
var modOptions = ModOptions()
val roadImprovement by lazy { RoadStatus.Road.improvement(this) }
val railroadImprovement by lazy { RoadStatus.Railroad.improvement(this) }
//endregion
fun clone(): Ruleset {
val newRuleset = Ruleset()

8
core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt
View File

@ -26,7 +26,6 @@ import com.unciv.logic.map.MapPathing
import com.unciv.logic.map.TileMap
import com.unciv.logic.map.mapunit.MapUnit
import com.unciv.logic.map.mapunit.movement.UnitMovement
import com.unciv.logic.map.tile.RoadStatus
import com.unciv.logic.map.tile.Tile
import com.unciv.models.UncivSound
import com.unciv.models.UnitActionType
@ -731,10 +730,9 @@ class WorldMapHolder(
// Z-Layer: 0
// Highlight suitable tiles in road connecting mode
if (worldScreen.bottomUnitTable.selectedUnitIsConnectingRoad) {
val roadImprovement = RoadStatus.Road.improvement(unit.currentTile.ruleset)
val validTiles = if (roadImprovement==null) listOf()
else unit.civ.gameInfo.tileMap.tileList.filter {
MapPathing.isValidRoadPathTile(unit, it, roadImprovement)
if (unit.currentTile.ruleset.roadImprovement == null) return
val validTiles = unit.civ.gameInfo.tileMap.tileList.filter {
MapPathing.isValidRoadPathTile(unit, it)
}
val connectRoadTileOverlayColor = Color.RED
for (tile in validTiles) {