AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

City states adjustments (#4597)

Browse Source 
* city-state AI

* City-state spawns

* City-state border expansion

* City-state border expansion adjustment

* Food and production multipliers for city states

* 6 CS as default
This commit is contained in:
SimonCeder 2021-07-22 23:20:20 +02:00 committed by GitHub
parent e41ba0da91
commit f41d30e0cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/logic/GameStarter.kt
View File

@ -290,11 +290,11 @@ object GameStarter {
if (civ.isCityState()) {
// City states should spawn with one settler only irregardless of era and difficulty
val startingSettlers = startingUnits.filter { settlerLikeUnits.contains(it) }
if (startingSettlers.count() > 1) {
startingUnits = startingUnits.filter { !settlerLikeUnits.contains(it) }.toMutableList()
startingUnits.add(startingSettlers.random())
}
startingUnits.clear()
startingUnits.add( startingSettlers.random() )
}
for (unit in startingUnits) {

3
core/src/com/unciv/logic/automation/SpecificUnitAutomation.kt
View File

@ -154,7 +154,8 @@ object SpecificUnitAutomation {
}
}
if (unit.getTile().militaryUnit == null) return // Don't move until you're accompanied by a military unit
if (unit.getTile().militaryUnit == null // Don't move until you're accompanied by a military unit
&& !unit.civInfo.isCityState()) return // ..unless you're a city state that was unable to settle its city on turn 1
val tilesNearCities = unit.civInfo.gameInfo.getCities().asSequence()
.flatMap {

1
core/src/com/unciv/logic/automation/UnitAutomation.kt
View File

@ -19,6 +19,7 @@ object UnitAutomation {
&& (tile.getOwner() == null || !tile.getOwner()!!.isCityState())
&& tile.neighbors.any { it.position !in unit.civInfo.exploredTiles }
&& unit.movement.canReach(tile)
&& (!unit.civInfo.isCityState() || tile.neighbors.any { it.getOwner() == unit.civInfo }) // Don't want city-states exploring far outside their borders
}
internal fun tryExplore(unit: MapUnit): Boolean {

5
core/src/com/unciv/logic/city/CityExpansionManager.kt
View File

@ -8,6 +8,7 @@ import com.unciv.logic.map.TileInfo
import com.unciv.ui.utils.withItem
import com.unciv.ui.utils.withoutItem
import kotlin.math.max
import kotlin.math.min
import kotlin.math.pow
import kotlin.math.roundToInt
@ -35,6 +36,10 @@ class CityExpansionManager {
// The second seems to be more based, so I'll go with that
fun getCultureToNextTile(): Int {
var cultureToNextTile = 6 * (max(0, tilesClaimed()) + 1.4813).pow(1.3)
if (cityInfo.civInfo.isCityState())
cultureToNextTile *= 1.5f // City states grow slower, perhaps 150% cost?
for (unique in cityInfo.civInfo.getMatchingUniques("-[]% Culture cost of acquiring tiles []")) {
if (cityInfo.matchesFilter(unique.params[1]))
cultureToNextTile *= (100 - unique.params[0].toFloat()) / 100

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

@ -42,6 +42,8 @@ class PopulationManager {
fun getFoodToNextPopulation(): Int {
// civ v math, civilization.wikia
var foodRequired = 15 + 6 * (population - 1) + floor((population - 1).toDouble().pow(1.8))
if (cityInfo.civInfo.isCityState())
foodRequired *= 1.5f
if (!cityInfo.civInfo.isPlayerCivilization())
foodRequired *= cityInfo.civInfo.gameInfo.getDifficulty().aiCityGrowthModifier
return foodRequired.toInt()

2
core/src/com/unciv/models/metadata/GameParameters.kt
View File

@ -15,7 +15,7 @@ class GameParameters { // Default values are the default new game
add(Player().apply { playerType = PlayerType.Human })
for (i in 1..3) add(Player())
}
var numberOfCityStates = 2
var numberOfCityStates = 6
var noBarbarians = false
var oneCityChallenge = false

2
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -338,6 +338,8 @@ class Building : NamedStats(), IConstruction, ICivilopediaText {
for (unique in uniqueObjects.filter { it.placeholderText == "Cost increases by [] per owned city" })
productionCost += civInfo.cities.count() * unique.params[0].toInt()
if (civInfo.isCityState())
productionCost *= 1.5f
if (civInfo.isPlayerCivilization()) {
if (!isWonder)
productionCost *= civInfo.getDifficulty().buildingCostModifier

2
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -172,6 +172,8 @@ class BaseUnit : INamed, IConstruction, CivilopediaText() {
override fun getProductionCost(civInfo: CivilizationInfo): Int {
var productionCost = cost.toFloat()
if (civInfo.isCityState())
productionCost *= 1.5f
if (civInfo.isPlayerCivilization())
productionCost *= civInfo.getDifficulty().unitCostModifier
else