mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-13 19:39:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Disabled buggy counteroffer mechanic to release a stable version

Browse Source
This commit is contained in:
yairm210 2021-11-29 19:47:42 +02:00
parent f86b765d38
commit e43e23b9a8
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,8 +3,8 @@ package com.unciv.build
object BuildConfig {
const val kotlinVersion = "1.5.30"
const val appName = "Unciv"
const val appCodeNumber = 649
const val appVersion = "3.18.5"
const val appCodeNumber = 650
const val appVersion = "3.18.5-patch1"
const val gdxVersion = "1.10.0"
const val roboVMVersion = "2.3.1"

4
core/src/com/unciv/logic/automation/NextTurnAutomation.kt
View File

@ -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()

1
core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
View File

@ -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}")

2
core/src/com/unciv/logic/civilization/CivInfoStats.kt
View File

@ -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()
}
}