fix: log npc teleport/telejump correctly

blurite · Dec 23, 2024 · 9873961 · 9873961
1 parent 34b2d90
commit 9873961
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 2 deletions.
diff --git a/...rc/main/kotlin/net/rsprox/protocol/v223/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/...rc/main/kotlin/net/rsprox/protocol/v223/game/outgoing/model/info/npcinfo/NpcInfoClient.kt
@@ -115,6 +115,7 @@ internal class NpcInfoClient(
                             npc.steps,
                             npc.moveSpeed,
                             extendedInfo,
+                            npc.jump,
                         )
                 }
             }

diff --git a/...rc/main/kotlin/net/rsprox/protocol/v224/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/...rc/main/kotlin/net/rsprox/protocol/v224/game/outgoing/model/info/npcinfo/NpcInfoClient.kt
@@ -115,6 +115,7 @@ internal class NpcInfoClient(
                             npc.steps,
                             npc.moveSpeed,
                             extendedInfo,
+                            npc.jump,
                         )
                 }
             }

diff --git a/...rc/main/kotlin/net/rsprox/protocol/v225/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/...rc/main/kotlin/net/rsprox/protocol/v225/game/outgoing/model/info/npcinfo/NpcInfoClient.kt
@@ -114,6 +114,7 @@ internal class NpcInfoClient(
                             npc.steps,
                             npc.moveSpeed,
                             extendedInfo,
+                            npc.jump,
                         )
                 }
             }

diff --git a/...rc/main/kotlin/net/rsprox/protocol/v226/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/...rc/main/kotlin/net/rsprox/protocol/v226/game/outgoing/model/info/npcinfo/NpcInfoClient.kt
@@ -114,6 +114,7 @@ internal class NpcInfoClient(
                             npc.steps,
                             npc.moveSpeed,
                             extendedInfo,
+                            npc.jump,
                         )
                 }
             }

diff --git a/...rc/main/kotlin/net/rsprox/protocol/v227/game/outgoing/model/info/npcinfo/NpcInfoClient.kt b/...rc/main/kotlin/net/rsprox/protocol/v227/game/outgoing/model/info/npcinfo/NpcInfoClient.kt
@@ -114,6 +114,7 @@ internal class NpcInfoClient(
                             npc.steps,
                             npc.moveSpeed,
                             extendedInfo,
+                            npc.jump,
                         )
                 }
             }

diff --git a/...col/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/npcinfo/NpcUpdateType.kt b/...col/src/main/kotlin/net/rsprox/protocol/game/outgoing/model/info/npcinfo/NpcUpdateType.kt
@@ -68,6 +68,7 @@ public sealed interface NpcUpdateType {
         public val steps: List<Int>,
         public val moveSpeed: MoveSpeed,
         public val extendedInfo: List<ExtendedInfo>,
+        public val jump: Boolean,
     ) : NpcUpdateType {
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
@@ -81,6 +82,7 @@ public sealed interface NpcUpdateType {
             if (steps != other.steps) return false
             if (moveSpeed != other.moveSpeed) return false
             if (extendedInfo != other.extendedInfo) return false
+            if (jump != other.jump) return false
 
             return true
         }
@@ -92,6 +94,7 @@ public sealed interface NpcUpdateType {
             result = 31 * result + steps.hashCode()
             result = 31 * result + moveSpeed.hashCode()
             result = 31 * result + extendedInfo.hashCode()
+            result = 31 * result + jump.hashCode()
             return result
         }
 
@@ -102,7 +105,8 @@ public sealed interface NpcUpdateType {
                 "level=$level, " +
                 "steps=$steps, " +
                 "moveSpeed=$moveSpeed, " +
-                "extendedInfo=$extendedInfo" +
+                "extendedInfo=$extendedInfo, " +
+                "jump=$jump" +
                 ")"
         }
     }

diff --git a/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt b/transcriber/src/main/kotlin/net/rsprox/transcriber/text/TextNpcInfoTranscriber.kt
@@ -199,9 +199,17 @@ public class TextNpcInfoTranscriber(
                                 continue
                             }
                             val npc = world.getNpc(index)
+                            val newCoord = CoordGrid(update.level, update.x, update.z)
+                            val coordShift = npc.coord != newCoord
                             val movementType =
                                 when (update.moveSpeed) {
-                                    MoveSpeed.STATIONARY -> "ACTIVE"
+                                    MoveSpeed.STATIONARY -> {
+                                        when {
+                                            coordShift && update.jump -> "TELEJUMP"
+                                            coordShift -> "TELEPORT"
+                                            else -> "ACTIVE"
+                                        }
+                                    }
                                     MoveSpeed.CRAWL -> "CRAWL"
                                     MoveSpeed.WALK -> "WALK"
                                     MoveSpeed.RUN -> "RUN"
@@ -222,6 +230,8 @@ public class TextNpcInfoTranscriber(
                                         namedEnum("step1", step1)
                                         namedEnum("step2", step2)
                                     }
+                                } else if (coordShift) {
+                                    coordGrid(update.level, update.x, update.z, "newcoord")
                                 }
                                 appendExtendedInfo(npc, update.extendedInfo)
                             }