From e08d94bf6950e818156d4c1b45715344b6df89a6 Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Fri, 1 Nov 2024 12:10:01 +0200
Subject: [PATCH] chore: Deprecated old event fields

---
 core/src/com/unciv/models/ruleset/Event.kt         | 13 +------------
 .../models/ruleset/validation/RulesetValidator.kt  | 14 --------------
 .../unciv/ui/screens/worldscreen/RenderEvent.kt    |  3 ---
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/core/src/com/unciv/models/ruleset/Event.kt b/core/src/com/unciv/models/ruleset/Event.kt
index 5fd08d0328..a3c81ea7ba 100644
--- a/core/src/com/unciv/models/ruleset/Event.kt
+++ b/core/src/com/unciv/models/ruleset/Event.kt
@@ -41,19 +41,8 @@ class EventChoice : ICivilopediaText, RulesetObject() {
     /** Keyboard support - not user-rebindable, mod control only. Will be [parsed][KeyCharAndCode.parse], so Gdx key names will work. */
     val keyShortcut = ""
     
-    @Deprecated("as of 4.13.4", ReplaceWith("uniques"))
-    var triggeredUniques = ArrayList<String>()
-    @Deprecated("as of 4.13.4", ReplaceWith("uniqueObjects"))
-    val triggeredUniqueObjects by lazy { triggeredUniques.map { Unique(it) } }
-
-    @Deprecated("as of 4.13.4", ReplaceWith("uniques"))
-    var conditions = ArrayList<String>()
-    @Deprecated("as of 4.13.4", ReplaceWith("uniqueObjects"))
-    val conditionObjects by lazy { conditions.map { Unique(it) } }
 
     fun matchesConditions(stateForConditionals: StateForConditionals): Boolean {
-        if (conditionObjects.any { !Conditionals.conditionalApplies(null, it, stateForConditionals) })
-            return false
         if (hasUnique(UniqueType.Unavailable, stateForConditionals)) return false
         if (getMatchingUniques(UniqueType.OnlyAvailable, StateForConditionals.IgnoreConditionals)
                 .any { !it.conditionalsApply(stateForConditionals) })
@@ -64,7 +53,7 @@ class EventChoice : ICivilopediaText, RulesetObject() {
     fun triggerChoice(civ: Civilization, unit: MapUnit? = null): Boolean {
         var success = false
         val stateForConditionals = StateForConditionals(civ, unit = unit)
-        val triggerUniques = uniqueObjects.filter { it.isTriggerable } + triggeredUniqueObjects 
+        val triggerUniques = uniqueObjects.filter { it.isTriggerable }
         for (unique in triggerUniques.flatMap { it.getMultiplied(stateForConditionals) })
             if (UniqueTriggerActivation.triggerUnique(unique, civ, unit = unit)) success = true
         return success
diff --git a/core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt b/core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt
index 1ac16cf472..39357fccc5 100644
--- a/core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt
+++ b/core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt
@@ -239,20 +239,6 @@ class RulesetValidator(val ruleset: Ruleset) {
         // An Event is not a IHasUniques, so not suitable as sourceObject
         for (event in ruleset.events.values) {
             for (choice in event.choices) {
-                
-                for (unique in choice.conditionObjects + choice.triggeredUniqueObjects)
-                    lines += uniqueValidator.checkUnique(unique, tryFixUnknownUniques, null, true)
-                
-                if (choice.conditions.isNotEmpty())
-                    lines.add("Event choice 'conditions' field is deprecated, " +
-                            "please replace with 'Only available' or 'Not availble' uniques in 'uniques' field", 
-                        errorSeverityToReport = RulesetErrorSeverity.WarningOptionsOnly, choice)
-                
-                if (choice.triggeredUniques.isNotEmpty())
-                    lines.add("Event choice 'triggered uniques' field is deprecated, " +
-                            "please place the triggers in the 'uniques' field",
-                        errorSeverityToReport = RulesetErrorSeverity.WarningOptionsOnly, choice)
-                
                 uniqueValidator.checkUniques(choice, lines, true, tryFixUnknownUniques)
             }
             uniqueValidator.checkUniques(event, lines, true, tryFixUnknownUniques)
diff --git a/core/src/com/unciv/ui/screens/worldscreen/RenderEvent.kt b/core/src/com/unciv/ui/screens/worldscreen/RenderEvent.kt
index be7191fa49..4c5f7ee25b 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/RenderEvent.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/RenderEvent.kt
@@ -69,9 +69,6 @@ class RenderEvent(
 
         val lines = (
             choice.civilopediaText.asSequence()
-                + choice.triggeredUniqueObjects.asSequence()
-                    .filterNot { it.isHiddenToUsers() }
-                    .map { FormattedLine(it) }
                 + choice.uniqueObjects.filter { it.isTriggerable }
                     .filterNot { it.isHiddenToUsers() }
                     .map { FormattedLine(it) }