From 19be96335d77bb687c0aa77bfd4a34a9188089f7 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 11 May 2024 21:44:30 +0300 Subject: [PATCH] Removed dead "Start golden age" unit action - #11576 --- android/assets/jsons/translations/template.properties | 1 - .../com/unciv/logic/automation/unit/CivilianUnitAutomation.kt | 3 --- core/src/com/unciv/models/UnitAction.kt | 2 -- 3 files changed, 6 deletions(-) diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 03e9be912d..92a5d4c21a 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -1161,7 +1161,6 @@ We have looted [amount] from a [improvement] = We have looted [amount] from a [improvement] which has been sent to [cityName] = An enemy [unitName] has pillaged our [improvement] = Create [improvement] = -Start Golden Age = Trigger unique = Show more = Yes = diff --git a/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt index dc859fc745..e40df99a46 100644 --- a/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt @@ -9,7 +9,6 @@ import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.ruleset.unique.UniqueType import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionModifiers import com.unciv.ui.screens.worldscreen.unit.actions.UnitActions -import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsFromUniques object CivilianUnitAutomation { @@ -119,8 +118,6 @@ object CivilianUnitAutomation { // includes great people plus moddable units val improvementCanBePlacedEventually = SpecificUnitAutomation.automateImprovementPlacer(unit) - if (!improvementCanBePlacedEventually) - UnitActions.invokeUnitAction(unit, UnitActionType.StartGoldenAge) } if (unit.hasUnique(UniqueType.GainFreeBuildings)) { diff --git a/core/src/com/unciv/models/UnitAction.kt b/core/src/com/unciv/models/UnitAction.kt index 9408f83e3a..559180c685 100644 --- a/core/src/com/unciv/models/UnitAction.kt +++ b/core/src/com/unciv/models/UnitAction.kt @@ -156,8 +156,6 @@ enum class UnitActionType( { ImageGetter.getUnitActionPortrait("HurryResearch") }, UncivSound.Chimes), HurryPolicy("{Hurry Policy} (${Fonts.death})", { ImageGetter.getUnitActionPortrait("HurryPolicy") }, UncivSound.Chimes), - StartGoldenAge("Start Golden Age", - { ImageGetter.getUnitActionPortrait("StartGoldenAge") }, UncivSound.Chimes), HurryWonder("{Hurry Wonder} (${Fonts.death})", { ImageGetter.getUnitActionPortrait("HurryConstruction") }, UncivSound.Chimes), HurryBuilding("{Hurry Construction} (${Fonts.death})",