wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/yairm210/UnCiv

Browse source
This commit is contained in:
Yair Morgenstern 2019-03-08 15:44:27 +02:00
commit 40e2bb9323
2 changed files with 863 additions and 465 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1309
android/assets/jsons/Translations.json
View file

File diff suppressed because it is too large Load diff

19
core/src/com/unciv/logic/automation/Automation.kt
View file

@ -79,6 +79,8 @@ class Automation {
val wartimeBuildings = buildableNotWonders.filter { it.xpForNewUnits>0 || it.cityStrength>0 }.sortedBy { it.maintenance }
val zeroMaintenanceBuildings = buildableNotWonders.filter { it.maintenance == 0 && it !in wartimeBuildings }
val productionBuildings = buildableNotWonders.filter { it.production>0 }
val happinessBuildings = buildableNotWonders.filter { it.happiness>0 }
val cultureBuildings = buildableNotWonders.filter { it.culture>0 }
val isAtWar = cityInfo.civInfo.isAtWar()
when {
@ -89,17 +91,22 @@ class Automation {
currentConstruction!="" -> return
buildableNotWonders.any { it.name=="Monument"} -> currentConstruction = "Monument"
buildableNotWonders.any { it.name=="Granary"} -> currentConstruction = "Granary"
militaryUnits<cities -> trainCombatUnit(cityInfo)
workers==0 -> currentConstruction = CityConstructions.Worker
cityInfo.civInfo.happiness<0 && happinessBuildings.isNotEmpty() -> currentConstruction = happinessBuildings.minBy{ it.cost }!!.name
buildableNotWonders.any { it.name=="Library"} -> currentConstruction = "Library"
buildableNotWonders.any { it.name=="Market"} -> currentConstruction = "Market"
militaryUnits==0 -> trainCombatUnit(cityInfo)
workers==0 -> currentConstruction = CityConstructions.Worker
buildableNotWonders.any { it.name=="Forge"} -> currentConstruction = "Forge"
cityInfo.civInfo.happiness>cities && buildableNotWonders.any { it.name=="Aqueduct"} -> currentConstruction = "Aqueduct"
isAtWar && militaryUnits<cities * 2 + 3 -> trainCombatUnit(cityInfo)
isAtWar && wartimeBuildings.isNotEmpty() -> currentConstruction = wartimeBuildings.minBy { it.cost }!!.name
//build culture buildings before border expands to half of second ring
cityInfo.tiles.size < 13 && cultureBuildings.isNotEmpty() -> currentConstruction = cultureBuildings.minBy { it.cost }!!.name
productionBuildings.isNotEmpty() -> currentConstruction = productionBuildings.minBy { it.cost }!!.name
zeroMaintenanceBuildings.isNotEmpty() -> currentConstruction = zeroMaintenanceBuildings.minBy { it.cost }!!.name
isAtWar && militaryUnits<cities -> trainCombatUnit(cityInfo)
isAtWar && wartimeBuildings.isNotEmpty() -> currentConstruction = wartimeBuildings.minBy { it.cost }!!.name
needWorkboat -> currentConstruction = "Work Boats"
workers<cities/2 -> currentConstruction = CityConstructions.Worker
militaryUnits<cities -> trainCombatUnit(cityInfo)
militaryUnits<cities * 2 + 3 -> trainCombatUnit(cityInfo)
buildableNotWonders.isNotEmpty() -> currentConstruction = buildableNotWonders.minBy { it.maintenance }!!.name
buildableWonders.isNotEmpty() -> currentConstruction = buildableWonders.minBy { it.cost }!!.name
else -> trainCombatUnit(cityInfo)
@ -115,7 +122,7 @@ class Automation {
fun square(x:Int) = x*x
val unitStrength = civInfo.getCivUnits().map { square(max(it.baseUnit().strength, it.baseUnit().rangedStrength)) }.sum()
val cityStrength = civInfo.cities.map { square(CityCombatant(it).getCityStrength()) }.sum()
return (sqrt(unitStrength.toDouble()) /*+ sqrt(cityStrength.toDouble())*/).toInt()
return (sqrt(unitStrength.toDouble()) /*+ sqrt(cityStrength.toDouble())*/).toInt() + 1 //avoid 0
}
fun threatAssessment(assessor:CivilizationInfo, assessed: CivilizationInfo): ThreatLevel {