using typed ref instead of string ID

liplum · Dec 6, 2023 · 95ae354 · 95ae354
1 parent 1eb63c9
commit 95ae354
Show file tree

Hide file tree

Showing 7 changed files with 192 additions and 182 deletions.
diff --git a/main/src/net/liplum/welcome/Condition.kt b/main/src/net/liplum/welcome/Condition.kt
@@ -27,16 +27,16 @@ abstract class Condition(
         this.register()
     }
 
-    abstract fun canShow(tip: WelcomeTip): Boolean
-    abstract fun priority(tip: WelcomeTip): Int
+    abstract fun canShow(tip: WelcomeScene): Boolean
+    abstract fun priority(tip: WelcomeScene): Int
 
     companion object {
         val Default = object : Condition("Default") {
-            override fun canShow(tip: WelcomeTip): Boolean {
+            override fun canShow(tip: WelcomeScene): Boolean {
                 return false
             }
 
-            override fun priority(tip: WelcomeTip) = Int.MIN_VALUE
+            override fun priority(tip: WelcomeScene) = Int.MIN_VALUE
         }
     }
 }
diff --git a/main/src/net/liplum/welcome/Conditions.kt b/main/src/net/liplum/welcome/Conditions.kt
@@ -8,39 +8,39 @@ import opengal.experssion.ExpressionParser
 
 object Conditions {
     val ShowWelcome = object : Condition("ShowWelcome") {
-        override fun canShow(tip: WelcomeTip): Boolean {
+        override fun canShow(tip: WelcomeScene): Boolean {
             return Settings.ShouldShowWelcome
         }
 
-        override fun priority(tip: WelcomeTip) = 0
+        override fun priority(tip: WelcomeScene) = 0
     }
     val CheckUpdate = object : Condition("CheckUpdate") {
-        override fun canShow(tip: WelcomeTip): Boolean {
+        override fun canShow(tip: WelcomeScene): Boolean {
             return !Vars.steam && Settings.ShowUpdate &&
                     Updater.requireUpdate &&
                     !Updater.latestVersion.equalsString(Settings.LastSkippedUpdate) &&
                     Updater.matchMinGameVersion
         }
 
-        override fun priority(tip: WelcomeTip) = 10
+        override fun priority(tip: WelcomeScene) = 10
     }
     val SpecialDishes = object : Condition("SpecialDishes") {
-        override fun canShow(tip: WelcomeTip): Boolean {
+        override fun canShow(tip: WelcomeScene): Boolean {
             return Settings.ShouldShowWelcome
         }
 
-        override fun priority(tip: WelcomeTip) =
+        override fun priority(tip: WelcomeScene) =
             if (Settings.ClickWelcomeTimes == 0) 5 else 0
     }
     val SettingsReq = object : Condition("SettingsReq") {
-        override fun canShow(tip: WelcomeTip): Boolean {
+        override fun canShow(tip: WelcomeScene): Boolean {
             val data = tip.data
             val exprRaw = data["CExpression"] as? String ?: ""
             val expr = ExpressionParser.by(exprRaw).parse<Boolean>()
             return expr.calculate(ExprSettingsWrapper)
         }
 
-        override fun priority(tip: WelcomeTip) = 0
+        override fun priority(tip: WelcomeScene) = 0
     }
 
     object ExprSettingsWrapper : IExpressionReceiver {

diff --git a/main/src/net/liplum/welcome/Scenes.kt b/main/src/net/liplum/welcome/Scenes.kt
diff --git a/main/src/net/liplum/welcome/Welcome.kt b/main/src/net/liplum/welcome/Welcome.kt
@@ -28,7 +28,7 @@ import plumy.dsl.sprite
 @ClientOnly
 object Welcome {
     var bundle = ReferBundleWrapper.create()
-    private var version = Scenes.v5_1
+    private var version = WelcomeScenePacks.v5_1
     fun genEntity() = Entity(bundle, version)
     private var entity = genEntity()
     private var showWelcome = false
@@ -49,7 +49,7 @@ object Welcome {
 
     @JvmStatic
     fun judgeWelcome() {
-        val allTips = version.scenes.map { Welcomes[it] }.distinct().toList()
+        val allTips = version.scenes.distinct().toList()
         val tipsCanShow = allTips.filter { it.condition.canShow(it) }
         val allCandidates = tipsCanShow.allMaxBy { it.condition.priority(it) }
         if (allCandidates.isEmpty()) {
@@ -131,9 +131,9 @@ object Welcome {
 
     class Entity(
         val bundle: ReferBundleWrapper,
-        val info: WelcomeTipPack,
+        val info: WelcomeScenePack,
     ) {
-        var tip: WelcomeTip = WelcomeTip.Default
+        var tip: WelcomeScene = WelcomeScene.Default
         operator fun get(key: String) =
             bundle["$tip.$key"]
 

diff --git a/main/src/net/liplum/welcome/WelcomeTip.kt → main/src/net/liplum/welcome/WelcomeScene.kt b/main/src/net/liplum/welcome/WelcomeTip.kt → main/src/net/liplum/welcome/WelcomeScene.kt
@@ -1,6 +1,6 @@
 package net.liplum.welcome
 
-class WelcomeTip(
+class WelcomeScene(
     @JvmField var id: String = DefaultID,
     @JvmField var conditionID: String = DefaultCondition,
     @JvmField var templateID: String = DefaultTemplateID,
@@ -15,7 +15,7 @@ class WelcomeTip(
         get() = ConditionRegistry[conditionID]
 
     companion object {
-        val Default = WelcomeTip()
+        val Default = WelcomeScene()
         const val DefaultID = "Default"
         const val DefaultCondition = "ShowWelcome"
         const val DefaultTemplateID = "Story"
@@ -24,27 +24,24 @@ class WelcomeTip(
     }
 }
 
-class WelcomeTipPack(
-    var default: String = "Default",
-    var scenes: List<String> = emptyList(),
+class WelcomeScenePack(
+    var default: WelcomeScene,
+    var scenes: List<WelcomeScene> = emptyList(),
 ) {
-    operator fun get(index: Int) =
+    operator fun get(index: Int): WelcomeScene =
         if (index !in scenes.indices)
             default
         else
             scenes[index]
 
-    fun indexOf(tipID: String): Int =
+    fun indexOf(tipID: WelcomeScene): Int =
         scenes.indexOf(tipID)
 
-    val defaultIndex: Int
-        get() = indexOf(default)
-
     fun inherit(
-        default: String? = null,
-        scenes: List<String> = emptyList(),
-    ): WelcomeTipPack {
-        return WelcomeTipPack(
+        default: WelcomeScene? = null,
+        scenes: List<WelcomeScene> = emptyList(),
+    ): WelcomeScenePack {
+        return WelcomeScenePack(
             default = default ?: this.default,
             scenes = this.scenes + scenes,
         )

diff --git a/main/src/net/liplum/welcome/WelcomeScenePacks.kt b/main/src/net/liplum/welcome/WelcomeScenePacks.kt
@@ -0,0 +1,44 @@
+package net.liplum.welcome
+
+object WelcomeScenePacks {
+    val common = WelcomeScenePack(
+        default = Welcomes.default,
+        scenes = listOf(
+            Welcomes.updateECHO,
+            Welcomes.theShip,
+            Welcomes.echo,
+            Welcomes.newBrains,
+            Welcomes.discord,
+            Welcomes.adBlock,
+            Welcomes.`404NotFound`,
+            Welcomes.ohNo,
+            Welcomes.rateUs,
+        )
+    )
+    val v2 = WelcomeScenePack(
+        default = Welcomes.employmentVerification,
+        scenes = listOf(
+            Welcomes.employmentVerification,
+        )
+    )
+    val v3 = common.inherit(
+        default = Welcomes.researchProject,
+        scenes = listOf(
+            Welcomes.employmentVerification,
+        )
+    )
+    val v4 = common.inherit(
+        default = Welcomes.erekirDetected,
+        scenes = listOf(
+            Welcomes.erekirDetected,
+            Welcomes.setOutErekir,
+        )
+    )
+    val v4_1 = v4.inherit(
+        scenes = listOf(
+            Welcomes.cyberionForErekir,
+        )
+    )
+    val v5 = v4_1.inherit()
+    val v5_1 = v5.inherit()
+}