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

Fix bug worker will not replace improvement to enable strategy resour… (#9449)

Browse Source 
* Fix bug worker will not replace improvement to enable strategy resources #9328

* Make test logic more clear and add some comments
This commit is contained in:
janarvid
2023-05-28 16:52:37 +02:00
committed by GitHub
parent 73aeabec2c
commit ff9d5ff9c1
2 changed files with 114 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,9 +312,11 @@ class WorkerAutomation(
private fun tileCanBeImproved(unit: MapUnit, tile: Tile): Boolean {
if (!tile.isLand || tile.isImpassible() || tile.isCityCenter())
return false
val city = tile.getCity()
if (city == null || city.civ != civInfo)
return false
if (!city.tilesInRange.contains(tile)
&& !tile.hasViewableResource(civInfo)
&& civInfo.cities.none { it.getCenterTile().aerialDistanceTo(tile) <= 3 })
@ -326,17 +328,16 @@ class WorkerAutomation(
&& unit.civ.isHuman())
return false
if (tile.improvement == null || junkImprovement == true) {
if (tile.improvementInProgress != null && unit.canBuildImprovement(tile.getTileImprovementInProgress()!!, tile)) return true
val chosenImprovement = chooseImprovement(unit, tile)
if (chosenImprovement != null && tile.improvementFunctions.canBuildImprovement(chosenImprovement, civInfo) && unit.canBuildImprovement(chosenImprovement, tile)) return true
} else if (!tile.containsGreatImprovement() && tile.hasViewableResource(civInfo)
&& tile.tileResource.isImprovedBy(tile.improvement!!)
&& !tile.tileResource.isImprovedBy(tile.improvement!!)
&& (chooseImprovement(unit, tile) // if the chosen improvement is not null and buildable
.let { it != null && tile.improvementFunctions.canBuildImprovement(it, civInfo) && unit.canBuildImprovement(it, tile)}))
return true
return false // couldn't find anything to construct here
}

110
tests/src/com/unciv/logic/automation/unit/WorkerAutomationTest.kt Normal file
View File

@ -0,0 +1,110 @@
package com.unciv.logic.automation.unit
import com.badlogic.gdx.math.Vector2
import com.unciv.UncivGame
import com.unciv.logic.GameInfo
import com.unciv.logic.city.City
import com.unciv.logic.civilization.Civilization
import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.map.TileMap
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.metadata.GameSettings
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.RulesetCache
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.testing.GdxTestRunner
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
@RunWith(GdxTestRunner::class)
internal class WorkerAutomationTest {
private val testCivilizationNames = arrayListOf("America", "Germany", "Greece","Hanoi", "Genoa")
private lateinit var workerAutomation: WorkerAutomation
private lateinit var civInfo: Civilization
private lateinit var gameInfo: GameInfo
private lateinit var ruleset: Ruleset
private lateinit var uncivGame: UncivGame
@Before
fun setUp() {
// RuleSet
RulesetCache.loadRulesets(noMods = true)
ruleset = RulesetCache.getVanillaRuleset()
// GameInfo
gameInfo = GameInfo()
gameInfo.ruleset = ruleset
// UncivGame
uncivGame = UncivGame(true)
uncivGame.settings = GameSettings()
UncivGame.Current = uncivGame
for (civName in testCivilizationNames)
gameInfo.civilizations.add(Civilization(civName).apply { playerType= PlayerType.Human })
gameInfo.tileMap = TileMap(7, ruleset)
// Initialize test civilizations
for (ci in gameInfo.civilizations) {
ci.gameInfo = gameInfo
ci.nation = Nation()
ci.nation.name = ci.civName
}
gameInfo.setTransients()
civInfo = gameInfo.civilizations.first()
workerAutomation = WorkerAutomation(civInfo, 3)
}
@Test
fun `should replace already existing improvement to enable resource`() {
// Add the needed tech to construct the improvements below
for (improvement in listOf(RoadStatus.Road.name, "Farm", "Mine")) {
civInfo.tech.techsResearched.add(ruleset.tileImprovements[improvement]!!.techRequired!!)
}
civInfo.tech.techsResearched.add(ruleset.tileResources["Iron"]!!.revealedBy!!)
civInfo.cities = listOf(createCity(civInfo, Vector2(0f, 0f), "Capital", true))
val currentTile = gameInfo.tileMap[1,1]
currentTile.setOwningCity(civInfo.cities.first())
currentTile.improvement = "Farm" // Set existing improvement
currentTile.resource = "Iron" // This tile also has a resource needs to be enabled by a building a Mine
val mapUnit = addUnit("Worker", civInfo, currentTile)
// Act
workerAutomation.automateWorkerAction(mapUnit, setOf())
// Assert
assertEquals("Worker should have replaced already existing improvement 'Farm' with 'Mine' to enable 'Iron' resource",
"Mine", currentTile.improvementInProgress)
assertTrue(currentTile.turnsToImprovement > 0)
}
private fun createCity(civInfo: Civilization, position: Vector2, name: String,
capital: Boolean = false
): City {
return City().apply {
location = position
if (capital)
cityConstructions.builtBuildings.add(ruleset.buildings.values.first { it.hasUnique(
UniqueType.IndicatesCapital) }.name)
this.name = name
setTransients(civInfo)
gameInfo.tileMap[location].setOwningCity(this)
}
}
private fun addUnit(name: String, civInfo: Civilization, tile: Tile): MapUnit {
val baseUnit = ruleset.units[name]!!
baseUnit.ruleset = ruleset
val mapUnit = baseUnit.getMapUnit(civInfo)
mapUnit.putInTile(tile)
return mapUnit
}
}