Update types and trigger names to match the latest decompiler output

Author: waleedyaseen

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Add breadcrumbs and sticky lines support
 - Add support for IntelliJ 2025.
 - Add support for optional boolean argument in cc_create
+- Update types and trigger names to match the latest decompiler output
 
 ## [1.7.1] - 2025-01-12
 

src/main/kotlin/io/runescript/plugin/ide/config/RsConfig.kt

@@ -56,11 +56,12 @@ object RsConfig {
         "player_uid",
         "stringvector",
         "stylesheet",
-        "shiftopnpc",
-        "shiftoploc",
-        "shiftopobj",
-        "shiftopplayer",
-        "shiftoptile",
+        "bugtemplate",
+        "clientopnpc",
+        "clientoploc",
+        "clientopobj",
+        "clientopplayer",
+        "clientoptile",
         // Types only for the .op file
         "hook",
         "varphook",

src/main/kotlin/io/runescript/plugin/lang/psi/refs/RsDynamicExpressionReference.kt

@@ -88,11 +88,11 @@ class RsDynamicExpressionReference(element: RsDynamicExpression) :
 
         private fun getScriptTriggerForType(type: RsType): RsTriggerType? {
             return when (type) {
-                RsPrimitiveType.SHIFTOPNPC -> RsTriggerType.SHIFTOPNPC
-                RsPrimitiveType.SHIFTOPLOC -> RsTriggerType.SHIFTOPLOC
-                RsPrimitiveType.SHIFTOPOBJ -> RsTriggerType.SHIFTOPOBJ
-                RsPrimitiveType.SHIFTOPPLAYER -> RsTriggerType.SHIFTOPPLAYER
-                RsPrimitiveType.SHIFTOPTILE -> RsTriggerType.SHIFTOPTILE
+                RsPrimitiveType.CLIENTOPNPC -> RsTriggerType.CLIENTOPNPC
+                RsPrimitiveType.CLIENTOPLOC -> RsTriggerType.CLIENTOPLOC
+                RsPrimitiveType.CLIENTOPOBJ -> RsTriggerType.CLIENTOPOBJ
+                RsPrimitiveType.CLIENTOPPLAYER -> RsTriggerType.CLIENTOPPLAYER
+                RsPrimitiveType.CLIENTOPTILE -> RsTriggerType.CLIENTOPTILE
                 else -> null
             }
         }

src/main/kotlin/io/runescript/plugin/lang/psi/type/RsPrimitiveType.kt

@@ -45,11 +45,12 @@ enum class RsPrimitiveType(val literal: String, val referencable: Boolean = true
     PLAYER_UID("player_uid"),
     STRINGVECTOR("stringvector"),
     STYLESHEET("stylesheet"),
-    SHIFTOPNPC("shiftopnpc"),
-    SHIFTOPLOC("shiftoploc"),
-    SHIFTOPOBJ("shiftopobj"),
-    SHIFTOPPLAYER("shiftopplayer"),
-    SHIFTOPTILE("shiftoptile"),
+    BUGTEMPLATE("bugtemplate"),
+    CLIENTOPNPC("clientopnpc"),
+    CLIENTOPLOC("clientoploc"),
+    CLIENTOPOBJ("clientopobj"),
+    CLIENTOPPLAYER("clientopplayer"),
+    CLIENTOPTILE("clientoptile"),
     // Non-Referencable types
     PARAM("param", referencable = false),
     FLO("flo", referencable = false),

src/main/kotlin/io/runescript/plugin/lang/psi/type/inference/RsTypeInferenceVisitor.kt

@@ -494,9 +494,9 @@ class RsTypeInferenceVisitor(private val myInferenceData: RsTypeInference) : RsV
                         ?: emptyList()
                     o.type = RsTupleType(returnTypes.flatten())
                 } else {
-                    check(type == RsPrimitiveType.SHIFTOPNPC || type == RsPrimitiveType.SHIFTOPLOC
-                            || type == RsPrimitiveType.SHIFTOPOBJ || type == RsPrimitiveType.SHIFTOPPLAYER
-                            || type == RsPrimitiveType.SHIFTOPTILE) {
+                    check(type == RsPrimitiveType.CLIENTOPNPC || type == RsPrimitiveType.CLIENTOPLOC
+                            || type == RsPrimitiveType.CLIENTOPOBJ || type == RsPrimitiveType.CLIENTOPPLAYER
+                            || type == RsPrimitiveType.CLIENTOPTILE) {
                         "Invalid type for dynamic expression: ${type.representation}"
                     }
                     o.type = type

src/main/kotlin/io/runescript/plugin/lang/psi/type/trigger/RsTriggerType.kt

@@ -20,39 +20,45 @@ enum class RsTriggerType(
         "worldmapelementmouseover",
         subjectType = MAPELEMENT,
         allowParameters = true,
-        arrayOf(INT, INT)
+        arrayOf(INT, INT),
     ),
     WORLDMAPELEMENTMOUSELEAVE(
         "worldmapelementmouseleave",
         subjectType = MAPELEMENT,
         allowParameters = true,
-        arrayOf(INT, INT)
+        arrayOf(INT, INT),
     ),
     WORLDMAPELEMENTMOUSEREPEAT(
         "worldmapelementmouserepeat",
         subjectType = MAPELEMENT,
         allowParameters = true,
-        arrayOf(INT, INT)
+        arrayOf(INT, INT),
     ),
+    CLIENTOPNPC("clientopnpc"),
+    CLIENTOPLOC("clientoploc"),
+    CLIENTOPOBJ("clientopobj"),
+    CLIENTOPPLAYER("clientopplayer"),
+    CLIENTOPTILE("clientoptile"),
     LOADNPC("loadnpc", subjectType = NPC),
+    UNLOADNPC("unloadnpc", subjectType = NPC),
     LOADLOC("loadloc", subjectType = LOC),
+    UNLOADLOC("unloadloc", subjectType = LOC),
+    LOADOBJ("loadobj", subjectType = NAMEDOBJ),
+    UNLOADOBJ("unloadobj", subjectType = NAMEDOBJ),
+    LOADPLAYER("loadplayer"),
+    UNLOADPLAYER("unloadplayer"),
     UPDATEOBJSTACK("updateobjstack"),
     UPDATEOBJCOUNT("updateobjcount", subjectType = NAMEDOBJ),
-    TRIGGER_47("trigger_47"),
-    TRIGGER_48("trigger_48"),
-    TRIGGER_49("trigger_49"),
-    CLIENTSCRIPT("clientscript", allowParameters = true),
+    PLAYER_DESTINATION("player_destination"),
+    PLAYER_HOVER("player_hover"),
+    PLAYER_MOVE("player_move"),
     PROC("proc", allowParameters = true, allowReturns = true),
+    CLIENTSCRIPT("clientscript", allowParameters = true),
     ONCLICKLOC("onclickloc"),
     ONCLICKOBJ("onclickobj"),
     ONCLICKNPC("onclicknpc"),
     ONCLICKPLAYER("onclickplayer"),
-    TRIGGER82("trigger_82"),
-    SHIFTOPNPC("shiftopnpc"),
-    SHIFTOPLOC("shiftoploc"),
-    SHIFTOPOBJ("shiftopobj"),
-    SHIFTOPPLAYER("shiftopplayer"),
-    SHIFTOPTILE("shiftoptile"),
+    MINIMENU_OPENED("minimenu_opened"),
     ;
 
     companion object {