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

Merge pull request #7513 from SimonCeder/automated-ruins

Browse Source 
workers will replace city ruins
This commit is contained in:
SimonCeder 2022-07-25 22:23:27 +02:00 committed by GitHub
commit 026ba380cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Civ V - Gods & Kings/TileImprovements.json
View File

@ -266,7 +266,7 @@
{
"name": "City ruins",
"terrainsCanBeBuiltOn": ["Land"],
"uniques": ["Unpillagable", "Unbuildable"],
"uniques": ["Unpillagable", "Unbuildable", "Will be replaced by automated workers"],
"civilopediaText": [{"text":"A bleak reminder of the destruction wreaked by War"}]
},
{

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

@ -256,7 +256,7 @@
{
"name": "City ruins",
"terrainsCanBeBuiltOn": ["Land"],
"uniques": ["Unpillagable", "Unbuildable"],
"uniques": ["Unpillagable", "Unbuildable", "Will be replaced by automated workers"],
"civilopediaText": [{"text":"A bleak reminder of the destruction wreaked by War"}]
},
{

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

@ -285,12 +285,13 @@ class WorkerAutomation(
val city = tile.getCity()
if (city == null || city.civInfo != civInfo)
return false
if (tile.improvement != null && !UncivGame.Current.settings.automatedWorkersReplaceImprovements) {
val junkImprovement = tile.getTileImprovement()?.hasUnique(UniqueType.AutomatedWorkersWillReplace)
if (tile.improvement != null && junkImprovement == false && !UncivGame.Current.settings.automatedWorkersReplaceImprovements) {
if (unit.civInfo.isPlayerCivilization())
return false
}
if (tile.improvement == null) {
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.canBuildImprovement(chosenImprovement, civInfo) && unit.canBuildImprovement(chosenImprovement, tile)) return true

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

@ -582,6 +582,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
PillageYieldRandom("Pillaging this improvement yields approximately [stats]", UniqueTarget.Improvement),
PillageYieldFixed("Pillaging this improvement yields [stats]", UniqueTarget.Improvement),
Irremovable("Irremovable", UniqueTarget.Improvement),
AutomatedWorkersWillReplace("Will be replaced by automated workers", UniqueTarget.Improvement),
//endregion
///////////////////////////////////////// region CONDITIONALS /////////////////////////////////////////

3
docs/Modders/uniques.md
View File

@ -1504,6 +1504,9 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
??? example "Irremovable"
Applicable to: Improvement
??? example "Automated workers will replace"
Applicable to: Improvement
## Resource uniques
??? example "Deposits in [tileFilter] tiles always provide [amount] resources"
Example: "Deposits in [Farm] tiles always provide [3] resources"