From ab8976889405dbc794571b741e7edde48ec9a188 Mon Sep 17 00:00:00 2001 From: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com> Date: Mon, 12 Jul 2021 00:11:50 +0800 Subject: [PATCH] Fix worldSizeModifier in TechManager (#4473) --- core/src/com/unciv/logic/civilization/TechManager.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/TechManager.kt b/core/src/com/unciv/logic/civilization/TechManager.kt index f1252a438c..301f824b0b 100644 --- a/core/src/com/unciv/logic/civilization/TechManager.kt +++ b/core/src/com/unciv/logic/civilization/TechManager.kt @@ -1,6 +1,5 @@ package com.unciv.logic.civilization -import com.unciv.logic.civilization.LocationAction import com.unciv.logic.city.CityInfo import com.unciv.logic.map.MapSize import com.unciv.logic.map.RoadStatus @@ -86,12 +85,12 @@ class TechManager { .count { it.isMajorCiv() && !it.isDefeated() } // https://forums.civfanatics.com/threads/the-mechanics-of-overflow-inflation.517970/ techCost /= 1 + techsResearchedKnownCivs / undefeatedCivs.toFloat() * 0.3f - // http://web.archive.org/web/20201204043641/http://www.civclub.net/bbs/forum.php?mod=viewthread&tid=123976 + // http://www.civclub.net/bbs/forum.php?mod=viewthread&tid=123976 val worldSizeModifier = with (civInfo.gameInfo.tileMap.mapParameters.mapSize) { when { - radius >= MapSize.Medium.radius -> floatArrayOf(1.1f, 0.05f) - radius >= MapSize.Large.radius -> floatArrayOf(1.2f, 0.03f) radius >= MapSize.Huge.radius -> floatArrayOf(1.3f, 0.02f) + radius >= MapSize.Large.radius -> floatArrayOf(1.2f, 0.03f) + radius >= MapSize.Medium.radius -> floatArrayOf(1.1f, 0.05f) else -> floatArrayOf(1f, 0.05f) } } @@ -251,7 +250,7 @@ class TechManager { } updateTransientBooleans() - civInfo.addNotification("Research of [$techName] has completed!", TechAction(techName), NotificationIcon.Science, techName ) + civInfo.addNotification("Research of [$techName] has completed!", TechAction(techName), NotificationIcon.Science, techName) civInfo.popupAlerts.add(PopupAlert(AlertType.TechResearched, techName)) val currentEra = civInfo.getEra() @@ -354,7 +353,7 @@ class TechManager { civInfo.addNotification( text, LocationAction(positions), - "ResourceIcons/" + revealedName + "ResourceIcons/$revealedName" ) } }