AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 05:14:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved error where missionary cost was determined by Capital, and not by cities it could actually be constructed in

Browse Source
This commit is contained in:
Yair Morgenstern 2022-08-01 19:42:59 +03:00
parent 6054b32f92
commit e510bf4929
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/BuildConfig.kt
View File

@ -4,7 +4,7 @@ object BuildConfig {
const val kotlinVersion = "1.7.0" const val kotlinVersion = "1.7.0"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 743 const val appCodeNumber = 743
const val appVersion = "4.1.22" const val appVersion = "4.2.0"
const val gdxVersion = "1.11.0" const val gdxVersion = "1.11.0"
const val roboVMVersion = "2.3.1" const val roboVMVersion = "2.3.1"

13
core/src/com/unciv/logic/automation/civilization/ReligionAutomation.kt
View File

@ -105,12 +105,15 @@ object ReligionAutomation {
if (civInfo.religionManager.religionState < ReligionState.Religion) return if (civInfo.religionManager.religionState < ReligionState.Religion) return
var missionaries = civInfo.gameInfo.ruleSet.units.values.filter { unit -> var missionaries = civInfo.gameInfo.ruleSet.units.values.filter { unit ->
unit.getMatchingUniques(UniqueType.CanActionSeveralTimes).filter { it.params[0] == Constants.spreadReligion }.any() unit.getMatchingUniques(UniqueType.CanActionSeveralTimes).filter { it.params[0] == Constants.spreadReligion }.any()
}.map { it.name } }
missionaries = missionaries.map { civInfo.getEquivalentUnit(it).name } missionaries = missionaries.map { civInfo.getEquivalentUnit(it) }
val missionaryConstruction = missionaries val missionaryConstruction = missionaries
.map { civInfo.cities.first().cityConstructions.getConstruction(it) as INonPerpetualConstruction } // Get list of cities it can be built in
.filter { unit -> civInfo.cities.any { unit.isPurchasable(it.cityConstructions) && unit.canBePurchasedWithStat(it, Stat.Faith) } } .associateBy({unit -> unit}) { unit -> civInfo.cities.filter { unit.isPurchasable(it.cityConstructions) && unit.canBePurchasedWithStat(it, Stat.Faith) } }
.minByOrNull { it.getStatBuyCost(civInfo.getCapital()!!, Stat.Faith)!! } .filter { it.value.isNotEmpty() }
// And from that list determine the cheapest price
.minByOrNull { it.value.minOf { city -> it.key.getStatBuyCost(city, Stat.Faith)!! }}?.key
?: return ?: return