mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-04 23:40:01 +07:00
Disabled buggy counteroffer mechanic to release a stable version
This commit is contained in:
@ -87,12 +87,16 @@ object NextTurnAutomation {
|
||||
tradeLogic.acceptTrade()
|
||||
otherCiv.addNotification("[${civInfo.civName}] has accepted your trade request", NotificationIcon.Trade, civInfo.civName)
|
||||
} else {
|
||||
/* Currently disabled until we solve the problems in https://github.com/yairm210/Unciv/issues/5728
|
||||
|
||||
val counteroffer = getCounteroffer(civInfo, tradeRequest)
|
||||
if (counteroffer != null) {
|
||||
otherCiv.addNotification("[${civInfo.civName}] has made a counteroffer to your trade request", NotificationIcon.Trade, civInfo.civName)
|
||||
otherCiv.tradeRequests.add(counteroffer)
|
||||
} else
|
||||
otherCiv.addNotification("[${civInfo.civName}] has denied your trade request", NotificationIcon.Trade, civInfo.civName)
|
||||
|
||||
*/
|
||||
}
|
||||
}
|
||||
civInfo.tradeRequests.clear()
|
||||
|
@ -58,7 +58,6 @@ class CityInfoConquestFunctions(val city: CityInfo){
|
||||
}
|
||||
|
||||
// Remove all buildings provided for free from here to other cities (e.g. CN Tower)
|
||||
println("Removing buildings: ${cityConstructions.freeBuildingsProvidedFromThisCity}")
|
||||
for ((cityId, buildings) in cityConstructions.freeBuildingsProvidedFromThisCity) {
|
||||
val city = oldCiv.cities.firstOrNull { it.id == cityId } ?: continue
|
||||
println("Removing buildings $buildings from city ${city.name}")
|
||||
|
@ -45,7 +45,7 @@ class CivInfoStats(val civInfo: CivilizationInfo) {
|
||||
}
|
||||
// Apply global discounts
|
||||
for (unique in civInfo.getMatchingUniques(UniqueType.UnitMaintenanceDiscountGlobal, StateForConditionals(civInfo))) {
|
||||
for (unit in unitsToPayFor.filter{it.matchesFilter(unique.params[1])}){
|
||||
for (unit in unitsToPayFor.filter { it.matchesFilter(unique.params[1]) }) {
|
||||
unit.maintenance *= unique.params[0].toPercent()
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user