Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/main/kotlin/game/game/item/experienceLamp/ExperienceLampInterface.kt

Author: hydrozoa-yt

src/main/java/io/luna/game/model/mob/overlay/AbstractOverlay.java

@@ -20,7 +20,7 @@ public abstract class AbstractOverlay {
     /**
      * Current lifecycle state of this overlay.
      */
-    private InterfaceState state = InterfaceState.IDLE;
+    private OverlayState state = OverlayState.IDLE;
 
     /**
      * Creates a new {@link AbstractOverlay} with the given type.
@@ -35,14 +35,14 @@ public AbstractOverlay(OverlayType type) {
      * Sends the client packets required to present this overlay to {@code player}.
      * <p>
      * This is invoked by {@link #setOpened(Player)} after {@link #onOpen(Player)}. Implementations should assume
-     * they are called only when the overlay is transitioning from a non-open state to {@link InterfaceState#OPEN}.
+     * they are called only when the overlay is transitioning from a non-open state to {@link OverlayState#OPEN}.
      *
      * @param player The player receiving the overlay.
      */
     public abstract void open(Player player);
 
     /**
-     * Hook invoked after the overlay has transitioned to {@link InterfaceState#CLOSED}.
+     * Hook invoked after the overlay has transitioned to {@link OverlayState#CLOSED}.
      * <p>
      * Use this to release resources, clear server-side flags, or send additional cleanup packets.
      * Called by {@link #setClosed(Player, AbstractOverlay)} regardless of whether a replacement exists.
@@ -53,7 +53,7 @@ public void onClose(Player player) {
     }
 
     /**
-     * Hook invoked just before {@link #open(Player)} when transitioning to {@link InterfaceState#OPEN}.
+     * Hook invoked just before {@link #open(Player)} when transitioning to {@link OverlayState#OPEN}.
      * <p>
      * Use this to prepare dynamic content (e.g., strings, config vars) or to perform access checks.
      *
@@ -76,14 +76,14 @@ public void onReplace(Player player, AbstractOverlay replace) {
     }
 
     /**
-     * Transitions this overlay to {@link InterfaceState#CLOSED} and fires the appropriate hooks.
+     * Transitions this overlay to {@link OverlayState#CLOSED} and fires the appropriate hooks.
      *
      * @param player  The player for whom the overlay is closing.
      * @param replace The replacement overlay, or {@code null} if the overlay is simply closing.
      */
     final void setClosed(Player player, AbstractOverlay replace) {
         if (isOpen()) {
-            state = InterfaceState.CLOSED;
+            state = OverlayState.CLOSED;
             if (replace != null) {
                 onReplace(player, replace);
             }
@@ -92,13 +92,13 @@ final void setClosed(Player player, AbstractOverlay replace) {
     }
 
     /**
-     * Transitions this overlay to {@link InterfaceState#OPEN} and fires the appropriate hooks.
+     * Transitions this overlay to {@link OverlayState#OPEN} and fires the appropriate hooks.
      *
      * @param player The player for whom the overlay is opening.
      */
     final void setOpened(Player player) {
         if (!isOpen()) {
-            state = InterfaceState.OPEN;
+            state = OverlayState.OPEN;
             onOpen(player);
             open(player);
         }
@@ -110,7 +110,7 @@ final void setOpened(Player player) {
      * @return {@code true} if this interface is open.
      */
     public final boolean isOpen() {
-        return state == InterfaceState.OPEN;
+        return state == OverlayState.OPEN;
     }
 
     /**
@@ -123,7 +123,7 @@ public final OverlayType getOverlayType() {
     /**
      * @return The interface state.
      */
-    public final InterfaceState getState() {
+    public final OverlayState getState() {
         return state;
     }
 }

src/main/java/io/luna/game/model/mob/overlay/InventoryOverlayInterface.java

@@ -6,11 +6,11 @@
 /**
  * A {@link StandardInterface} that opens both a main interface and a corresponding inventory overlay.
  * <p>
- * This is used for interfaces that temporarily replace the player’s inventory container with a custom
- * layout (such as banking, trading, or shop screens), while a primary fixed interface is displayed.
+ * This is used for interfaces that temporarily replace the player’s inventory container with a custom layout
+ * (such as banking, trading, or shop screens), while a primary fixed interface is displayed.
  * <p>
- * The overlay is opened via {@link InventoryOverlayMessageWriter}, which takes both the main interface id
- * and the replacement inventory interface id.
+ * The overlay is opened via {@link InventoryOverlayMessageWriter}, which takes both the main interface id and the
+ * replacement inventory interface id.
  *
  * @author lare96
  */

…me/model/mob/overlay/InterfaceState.java …game/model/mob/overlay/OverlayState.javasrc/main/java/io/luna/game/model/mob/overlay/InterfaceState.java renamed to src/main/java/io/luna/game/model/mob/overlay/OverlayState.java src/main/java/io/luna/game/model/mob/overlay/InterfaceState.java renamed to src/main/java/io/luna/game/model/mob/overlay/OverlayState.java

@@ -1,7 +1,7 @@
 package io.luna.game.model.mob.overlay;
 
 /**
- * Represents the lifecycle state of an {@link AbstractOverlay} (interface) instance.
+ * Represents the lifecycle state of an {@link AbstractOverlay} instance.
  * <p>
  * Each overlay transitions through these states as it is opened or closed on a player's screen.
  * The state is managed internally by {@link AbstractOverlaySet} to ensure correct invocation
@@ -19,7 +19,7 @@
  *
  * @author lare96
  */
-public enum InterfaceState {
+public enum OverlayState {
 
     /**
      * The default state for all overlay instances when first constructed.

src/main/kotlin/engine/engine/combat/death/npcDeath.kts

@@ -2,7 +2,9 @@ package engine.combat.death
 
 import api.combat.death.DeathHookHandler
 import api.predef.*
+import game.skill.slayer.Slayer
 import io.luna.game.model.mob.Npc
+import io.luna.game.model.mob.Player
 import io.luna.game.model.mob.block.Animation
 import io.luna.game.model.mob.block.Animation.AnimationPriority
 
@@ -11,10 +13,13 @@ import io.luna.game.model.mob.block.Animation.AnimationPriority
  */
 DeathHookHandler.setDefaultHook(Npc::class) {
     preDeath {
-        victim.combatDef.ifPresent { victim.animation(Animation(it.deathAnimation, AnimationPriority.HIGH)) }
+        victim.animation(Animation(victim.combatDef.deathAnimation, AnimationPriority.IMMUTABLE))
     }
 
     death {
+        if(source is Player) {
+            Slayer.record(source, victim.id)
+        }
         drop()
         world.npcs.remove(victim)
     }

src/main/kotlin/game/game/item/experienceLamp/ExperienceLampInterface.kt

@@ -6,31 +6,32 @@ import io.luna.game.model.mob.overlay.StandardInterface
 /**
  * Handles the interface where the player selects which skill to gain experience in,
  * from a lamp.
+ * @author hydrozoa
  */
 class ExperienceLampInterface : StandardInterface(2808) {
 
-    enum class InterfaceSkill(val varpValue: Int, val button: Int) {
-        ATTACK(1, 2812),
-        STRENGTH(2, 2813),
-        RANGED(3, 2814),
-        MAGIC(4, 2815),
-        DEFENCE(5, 2816),
-        HITPOINTS(6, 2817),
-        PRAYER(7, 2818),
-        AGILITY(8, 2819),
-        HERBLORE(9, 2820),
-        THIEVING(10, 2821),
-        CRAFTING(11, 2822),
-        RUNECRAFTING(12, 2823),
-        MINING(13, 2824),
-        SMITHING(14, 2825),
-        FISHING(15, 2826),
-        COOKING(16, 2827),
-        FIREMAKING(17, 2828),
-        WOODCUTTING(18, 2829),
-        FLETCHING(19, 2830),
-        SLAYER(20, 12034),
-        FARMING(21, 13914),
+    enum class InterfaceSkill(val varpValue: Int, val button: Int, val skill: Int) {
+        ATTACK(1, 2812, SKILL_ATTACK),
+        STRENGTH(2, 2813, SKILL_STRENGTH),
+        RANGED(3, 2814, SKILL_RANGED),
+        MAGIC(4, 2815, SKILL_MAGIC),
+        DEFENCE(5, 2816, SKILL_DEFENCE),
+        HITPOINTS(6, 2817, SKILL_HITPOINTS),
+        PRAYER(7, 2818, SKILL_PRAYER),
+        AGILITY(8, 2819, SKILL_AGILITY),
+        HERBLORE(9, 2820, SKILL_HERBLORE),
+        THIEVING(10, 2821, SKILL_THIEVING),
+        CRAFTING(11, 2822, SKILL_CRAFTING),
+        RUNECRAFTING(12, 2823, SKILL_RUNECRAFTING),
+        MINING(13, 2824, SKILL_MINING),
+        SMITHING(14, 2825, SKILL_SMITHING),
+        FISHING(15, 2826, SKILL_FISHING),
+        COOKING(16, 2827, SKILL_COOKING),
+        FIREMAKING(17, 2828, SKILL_FIREMAKING),
+        WOODCUTTING(18, 2829, SKILL_WOODCUTTING),
+        FLETCHING(19, 2830, SKILL_FLETCHING),
+        SLAYER(20, 12034, SKILL_SLAYER),
+        FARMING(21, 13914, SKILL_FARMING),
         ;
 
         companion object {
@@ -39,30 +40,8 @@ class ExperienceLampInterface : StandardInterface(2808) {
              * Returns null if no match is found.
              */
             fun getSkillByVarp(value: Int): Int {
-                when (value) {
-                    1 -> return SKILL_ATTACK
-                    2 -> return SKILL_STRENGTH
-                    3 -> return SKILL_RANGED
-                    4 -> return SKILL_MAGIC
-                    5 -> return SKILL_DEFENCE
-                    6 -> return SKILL_HITPOINTS
-                    7 -> return SKILL_PRAYER
-                    8 -> return SKILL_AGILITY
-                    9 -> return SKILL_HERBLORE
-                    10 -> return SKILL_THIEVING
-                    11 -> return SKILL_CRAFTING
-                    12 -> return SKILL_RUNECRAFTING
-                    13 -> return SKILL_MINING
-                    14 -> return SKILL_SMITHING
-                    15 -> return SKILL_FISHING
-                    16 -> return SKILL_COOKING
-                    17 -> return SKILL_FIREMAKING
-                    18 -> return SKILL_WOODCUTTING
-                    19 -> return SKILL_FLETCHING
-                    20 -> return SKILL_SLAYER
-                    21 -> return SKILL_FARMING
-                    else -> return SKILL_HITPOINTS
-                }
+                val map = InterfaceSkill.values().associateBy({i -> i.varpValue})
+                return map.get(value)?.skill ?: SKILL_HITPOINTS
             }
         }
     }

src/main/kotlin/game/game/skill/thieving/stealFromStall/StealFromAction.kt

@@ -109,7 +109,7 @@ class StealFromAction(plr: Player, val obj: GameObject, val thievable: Thievable
             if (!world.collisionManager.raycast(guard.position, mob.position) && guard.inViewCone(mob)) {
                 // The guard can see the player.
                 guard.speak("Hey! Get your hands off there!")
-                guard.follow(mob)
+                guard.combat.attack(mob)
                 break
             }
         }