diff --git a/changelog.md b/changelog.md index 6b62a47eee..d92fd4b9ce 100644 --- a/changelog.md +++ b/changelog.md @@ -1,23 +1,20 @@ ## 4.4.14 -Offers we receive for more resources than we have are invalid - -Resolved - fixed Guruship belief - -Was unable to upload previous version to Google Play, re-attempting +Fixed Guruship belief By vegeta1k95: -- Mod sizes are updated to proper values upon selection -- Fix UI bugs -- Fix centering of unit HP bar -- Improvements to construction table +- Mod sizes are updated to proper values upon selection +- Fix UI bugs +- Fix centering of unit HP bar +- Improvements to construction table -AbsoluteUnits - Berserker, Samurai, Longswordsman_v2 - By letstalkaboutdune +AbsoluteUnits - Berserker, Samurai, Longswordsman v2 - By letstalkaboutdune By Gualdimar: -- Fixed selecting an improvement switched to another unit even if the setting is disabled -- Fixed missing unimproved resources in the overview table -- Research agreement cost display +- Selecting an improvement switches to another unit only if enabled +- Fixed missing unimproved resources in the overview table +- Research agreement cost display +- Offers we receive for more resources than we have are invalid ## 4.4.13 diff --git a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt index fd76cb5b6f..8ec53f9171 100644 --- a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt @@ -679,7 +679,7 @@ object UnitAutomation { return false } - fun runAway(unit: MapUnit) { + private fun runAway(unit: MapUnit) { val reachableTiles = unit.movement.getDistanceToTiles() val enterableCity = reachableTiles.keys .firstOrNull { it.isCityCenter() && unit.movement.canMoveTo(it) } diff --git a/core/src/com/unciv/logic/trade/TradeEvaluation.kt b/core/src/com/unciv/logic/trade/TradeEvaluation.kt index f7e842f5e1..dac6d7a8f1 100644 --- a/core/src/com/unciv/logic/trade/TradeEvaluation.kt +++ b/core/src/com/unciv/logic/trade/TradeEvaluation.kt @@ -64,7 +64,7 @@ class TradeEvaluation { .filter { it.type != TradeType.Treaty } // since treaties should only be evaluated once for 2 sides .map { evaluateBuyCost(it, evaluator, tradePartner) }.sum() - var sumOfOurOffers = trade.ourOffers.map { evaluateSellCost(it, evaluator, tradePartner) }.sum() + var sumOfOurOffers = trade.ourOffers.sumOf { evaluateSellCost(it, evaluator, tradePartner) } // If we're making a peace treaty, don't try to up the bargain for people you don't like. // Leads to spartan behaviour where you demand more, the more you hate the enemy...unhelpful @@ -270,7 +270,7 @@ class TradeEvaluation { } } - fun distanceCityTradeModifier(civInfo: Civilization, capitalcity: City, city: City): Int{ + private fun distanceCityTradeModifier(civInfo: Civilization, capitalcity: City, city: City): Int{ val distanceBetweenCities = capitalcity.getCenterTile().aerialDistanceTo(city.getCenterTile()) if (distanceBetweenCities < 500) return 0