Add intolerant hunt mode

GregHib · Jan 15, 2025 · 8529afd · 8529afd
1 parent aa80792
commit 8529afd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/data/definitions/hunt-modes.yml b/data/definitions/hunt-modes.yml
@@ -9,6 +9,9 @@ aggressive:
 aggressive_npcs:
   <<: *aggressive
   type: npc
+aggressive_intolerant:
+  <<: *aggressive
+  check_afk: false
 not_busy:
   <<: *aggressive
   check_not_busy: true

diff --git a/data/definitions/npcs.yml b/data/definitions/npcs.yml
@@ -2516,7 +2516,7 @@ skeleton_mace_shield:
   wander_radius: 8
   attack_radius: 4
   max_hit_melee: 40
-  hunt_mode: aggressive
+  hunt_mode: aggressive_intolerant
   style: slash
   height: 30
   respawn_delay: 60

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/npc/combat/Aggression.kts b/game/src/main/kotlin/world/gregs/voidps/world/interact/entity/npc/combat/Aggression.kts
@@ -14,7 +14,7 @@ import world.gregs.voidps.engine.inject
 
 val areas: AreaDefinitions by inject()
 
-huntPlayer(mode = "aggressive") { npc ->
+huntPlayer(mode = "aggressive*") { npc ->
     if (!Settings["world.npcs.aggression", true] || attacking(npc, target)) {
         return@huntPlayer
     }
@@ -34,7 +34,7 @@ huntPlayer(mode = "cowardly") { npc ->
     npc.mode = Interact(npc, target, PlayerOption(npc, target, "Attack"))
 }
 
-huntNPC(mode = "aggressive") { npc ->
+huntNPC(mode = "aggressive*") { npc ->
     if (attacking(npc, target)) {
         return@huntNPC
     }