mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-01 10:25:57 +07:00
Code Issues Packages Projects Releases Wiki Activity

Implement production overflow (#4081)

Browse Source 
As discussed on yairm210#4058, production (or hammer) overflow in Civ 5
is a thing and goes according to rules described on
https://forums.civfanatics.com/threads/hammer-overflow.419352/
This has been added to the game. There are no visual indicators for the
user yet. This will probably be added later.
This commit is contained in:
Aron de Jong 2021-06-08 20:16:06 +02:00 committed by GitHub
parent b2691eed70
commit 7cad6dcfe5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/com/unciv/logic/city/CityConstructions.kt
View File

@ -49,6 +49,7 @@ class CityConstructions {
} }
var currentConstructionIsUserSet = false var currentConstructionIsUserSet = false
var constructionQueue = mutableListOf<String>() var constructionQueue = mutableListOf<String>()
var productionOverflow = 0
val queueMaxSize = 10 val queueMaxSize = 10
//region pure functions //region pure functions
@ -58,6 +59,7 @@ class CityConstructions {
toReturn.inProgressConstructions.putAll(inProgressConstructions) toReturn.inProgressConstructions.putAll(inProgressConstructions)
toReturn.currentConstructionIsUserSet = currentConstructionIsUserSet toReturn.currentConstructionIsUserSet = currentConstructionIsUserSet
toReturn.constructionQueue.addAll(constructionQueue) toReturn.constructionQueue.addAll(constructionQueue)
toReturn.productionOverflow = productionOverflow
return toReturn return toReturn
} }
@ -250,7 +252,7 @@ class CityConstructions {
val production = cityStatsForConstruction.production.roundToInt() val production = cityStatsForConstruction.production.roundToInt()
return ceil(workLeft / production.toDouble()).toInt() return ceil((workLeft-productionOverflow) / production.toDouble()).toInt()
} }
//endregion //endregion
@ -281,6 +283,12 @@ class CityConstructions {
val productionCost = construction.getProductionCost(cityInfo.civInfo) val productionCost = construction.getProductionCost(cityInfo.civInfo)
if (inProgressConstructions.containsKey(currentConstructionFromQueue) if (inProgressConstructions.containsKey(currentConstructionFromQueue)
&& inProgressConstructions[currentConstructionFromQueue]!! >= productionCost) { && inProgressConstructions[currentConstructionFromQueue]!! >= productionCost) {
productionOverflow = inProgressConstructions[currentConstructionFromQueue]!! - productionCost
// See the URL below for explanation for this cap
// https://forums.civfanatics.com/threads/hammer-overflow.419352/
val maxOverflow = maxOf(productionCost, cityInfo.cityStats.currentCityStats.production.roundToInt())
if (productionOverflow > maxOverflow)
productionOverflow = maxOverflow
constructionComplete(construction) constructionComplete(construction)
} }
} }
@ -290,8 +298,10 @@ class CityConstructions {
validateConstructionQueue() validateConstructionQueue()
validateInProgressConstructions() validateInProgressConstructions()
if (getConstruction(currentConstructionFromQueue) !is PerpetualConstruction) if (getConstruction(currentConstructionFromQueue) !is PerpetualConstruction) {
addProductionPoints(cityStats.production.roundToInt()) addProductionPoints(cityStats.production.roundToInt() + productionOverflow)
productionOverflow = 0
}
} }