Add PvP bots for Clan Wars Free-For-All

data/bot/clan_wars_arenas.tables.toml

@@ -0,0 +1,26 @@
+[clan_wars_arenas]
+row_id = "string"
+spawn_area = "string"
+tiers = "list<string>"
+
+[.clan_wars_ffa_safe]
+spawn_area = "clan_wars_teleport"
+tiers = [
+    "clan_wars_ffa_safe_zerker",
+    "clan_wars_ffa_safe_dharoker",
+    "clan_wars_ffa_safe_ags_main",
+    "clan_wars_ffa_safe_obby_pure",
+    "clan_wars_ffa_safe_msb_pure",
+    "clan_wars_ffa_safe_karils_tank",
+    "clan_wars_ffa_safe_ancient_tank",
+    "clan_wars_ffa_safe_ancient_hybrid",
+]
+
+[.clan_wars_ffa_dangerous]
+spawn_area = "clan_wars_teleport"
+tiers = [
+    "clan_wars_ffa_dangerous_melee",
+    "clan_wars_ffa_dangerous_ranged",
+    "clan_wars_ffa_dangerous_magic",
+    "clan_wars_ffa_dangerous_hybrid",
+]

data/bot/clan_wars_tiers.tables.toml

@@ -0,0 +1,65 @@
+[clan_wars_tiers]
+row_id = "string"
+combat_style = "string"
+skills = "list<string>"
+levels = "list<int>"
+
+[.clan_wars_ffa_safe_zerker]
+combat_style = "slash"
+skills = ["attack", "strength", "defence", "constitution", "prayer"]
+levels = [60, 80, 45, 75, 95]
+
+[.clan_wars_ffa_safe_dharoker]
+combat_style = "slash"
+skills = ["attack", "strength", "defence", "constitution", "prayer"]
+levels = [70, 70, 70, 70, 95]
+
+[.clan_wars_ffa_safe_ags_main]
+combat_style = "slash"
+skills = ["attack", "strength", "defence", "constitution", "prayer"]
+levels = [75, 85, 75, 85, 95]
+
+[.clan_wars_ffa_safe_obby_pure]
+combat_style = "crush"
+skills = ["attack", "strength", "defence", "constitution"]
+levels = [1, 80, 1, 70]
+
+[.clan_wars_ffa_safe_msb_pure]
+combat_style = "rapid"
+skills = ["attack", "strength", "defence", "constitution", "ranged", "prayer"]
+levels = [1, 1, 1, 70, 70, 95]
+
+[.clan_wars_ffa_safe_karils_tank]
+combat_style = "rapid"
+skills = ["attack", "strength", "defence", "constitution", "ranged", "prayer"]
+levels = [1, 1, 70, 75, 75, 95]
+
+[.clan_wars_ffa_safe_ancient_tank]
+combat_style = "accurate"
+skills = ["magic", "defence", "constitution", "prayer"]
+levels = [94, 70, 80, 95]
+
+[.clan_wars_ffa_safe_ancient_hybrid]
+combat_style = "accurate"
+skills = ["magic", "attack", "strength", "ranged", "defence", "constitution", "prayer"]
+levels = [94, 75, 80, 75, 70, 85, 95]
+
+[.clan_wars_ffa_dangerous_melee]
+combat_style = "slash"
+skills = ["attack", "strength", "defence", "constitution", "prayer", "magic"]
+levels = [60, 70, 40, 70, 95, 94]
+
+[.clan_wars_ffa_dangerous_ranged]
+combat_style = "rapid"
+skills = ["ranged", "defence", "constitution", "prayer"]
+levels = [70, 40, 70, 95]
+
+[.clan_wars_ffa_dangerous_magic]
+combat_style = "accurate"
+skills = ["magic", "defence", "constitution", "prayer"]
+levels = [94, 40, 70, 95]
+
+[.clan_wars_ffa_dangerous_hybrid]
+combat_style = "slash"
+skills = ["attack", "strength", "ranged", "magic", "defence", "constitution", "prayer"]
+levels = [75, 80, 75, 94, 60, 80, 95]

data/minigame/clan_wars/clan_wars.areas.toml

@@ -24,3 +24,11 @@ y = [5512, 5631]
 x = [2948, 3071]
 y = [5571, 5631]
 tags = ["multi_combat"]
+
+[clan_wars_ffa_safe_lobby]
+x = [2810, 2820]
+y = [5508, 5511]
+
+[clan_wars_ffa_dangerous_lobby]
+x = [3002, 3012]
+y = [5508, 5511]

data/minigame/clan_wars/clan_wars.bots.toml

@@ -0,0 +1,87 @@
+[clan_wars_ffa_safe_zerker]
+template = "pvp_zerker"
+capacity = 3
+timeout = 500
+fields = { style = "style2", area = "clan_wars_ffa_safe_arena", safe_area = "clan_wars_ffa_safe_lobby" }
+
+[clan_wars_ffa_safe_dharoker]
+template = "pvp_dharoker"
+capacity = 3
+timeout = 500
+fields = { style = "style2", area = "clan_wars_ffa_safe_arena", safe_area = "clan_wars_ffa_safe_lobby" }
+
+[clan_wars_ffa_safe_ags_main]
+template = "pvp_ags_main"
+capacity = 3
+timeout = 500
+fields = { style = "style2", area = "clan_wars_ffa_safe_arena", safe_area = "clan_wars_ffa_safe_lobby" }
+
+[clan_wars_ffa_safe_obby_pure]
+template = "pvp_obby_pure"
+capacity = 3
+timeout = 500
+fields = { area = "clan_wars_ffa_safe_arena", safe_area = "clan_wars_ffa_safe_lobby" }
+
+[clan_wars_ffa_safe_msb_pure]
+template = "pvp_msb_pure"
+capacity = 3
+timeout = 500
+fields = { style = "style2", area = "clan_wars_ffa_safe_arena", safe_area = "clan_wars_ffa_safe_lobby" }
+
+[clan_wars_ffa_safe_karils_tank]
+template = "pvp_karils_tank"
+capacity = 3
+timeout = 500
+fields = { style = "style2", area = "clan_wars_ffa_safe_arena", safe_area = "clan_wars_ffa_safe_lobby" }
+
+[clan_wars_ffa_safe_ancient_tank]
+template = "pvp_ancient_tank"
+capacity = 3
+timeout = 500
+fields = { area = "clan_wars_ffa_safe_arena", safe_area = "clan_wars_ffa_safe_lobby" }
+
+[clan_wars_ffa_safe_ancient_hybrid]
+template = "pvp_ancient_hybrid"
+capacity = 3
+timeout = 500
+fields = { area = "clan_wars_ffa_safe_arena", safe_area = "clan_wars_ffa_safe_lobby" }
+
+[clan_wars_ffa_dangerous_melee]
+template = "pvp_dangerous_melee"
+capacity = 3
+timeout = 500
+fields = { style = "style2", area = "clan_wars_ffa_dangerous_arena", safe_area = "clan_wars_ffa_dangerous_lobby" }
+reactive = [
+    { interface = { option = "Wear", id = "inventory:inventory:games_necklace_6", if = { pvp_retreat_needed = {} }, success = { any = [{ area = { id = "clan_wars_teleport" } }, { equipment = { amulet = { id = "games_necklace_*" } } }] } } },
+    { jewellery_teleport = { item = "games_necklace_6", area = "clan_wars_teleport", if = { pvp_retreat_needed = {} }, success = { area = { id = "clan_wars_teleport" } } } },
+]
+
+[clan_wars_ffa_dangerous_ranged]
+template = "pvp_dangerous_ranged"
+capacity = 3
+timeout = 500
+fields = { style = "style2", area = "clan_wars_ffa_dangerous_arena", safe_area = "clan_wars_ffa_dangerous_lobby" }
+reactive = [
+    { interface = { option = "Wear", id = "inventory:inventory:games_necklace_6", if = { pvp_retreat_needed = {} }, success = { any = [{ area = { id = "clan_wars_teleport" } }, { equipment = { amulet = { id = "games_necklace_*" } } }] } } },
+    { jewellery_teleport = { item = "games_necklace_6", area = "clan_wars_teleport", if = { pvp_retreat_needed = {} }, success = { area = { id = "clan_wars_teleport" } } } },
+]
+
+[clan_wars_ffa_dangerous_magic]
+template = "pvp_dangerous_magic"
+capacity = 3
+timeout = 500
+fields = { area = "clan_wars_ffa_dangerous_arena", safe_area = "clan_wars_ffa_dangerous_lobby" }
+reactive = [
+    { interface = { option = "Wear", id = "inventory:inventory:games_necklace_6", if = { pvp_retreat_needed = {} }, success = { any = [{ area = { id = "clan_wars_teleport" } }, { equipment = { amulet = { id = "games_necklace_*" } } }] } } },
+    { jewellery_teleport = { item = "games_necklace_6", area = "clan_wars_teleport", if = { pvp_retreat_needed = {} }, success = { area = { id = "clan_wars_teleport" } } } },
+]
+
+[clan_wars_ffa_dangerous_hybrid]
+template = "pvp_dangerous_hybrid"
+capacity = 3
+timeout = 500
+fields = { area = "clan_wars_ffa_dangerous_arena", safe_area = "clan_wars_ffa_dangerous_lobby" }
+reactive = [
+    { interface = { option = "Wear", id = "inventory:inventory:games_necklace_6", if = { pvp_retreat_needed = {} }, success = { any = [{ area = { id = "clan_wars_teleport" } }, { equipment = { amulet = { id = "games_necklace_*" } } }] } } },
+    { jewellery_teleport = { item = "games_necklace_6", area = "clan_wars_teleport", if = { pvp_retreat_needed = {} }, success = { area = { id = "clan_wars_teleport" } } } },
+]

data/minigame/clan_wars/clan_wars.setups.toml

@@ -0,0 +1,68 @@
+[teleport_clan_wars_games_necklace]
+weight = 100
+requires = [
+    { equipment = { amulet = { id = "games_necklace_8" } } },
+]
+actions = [
+    { interface = { option = "Clan Wars", id = "worn_equipment:amulet_slot:games_necklace_8" } },
+    { wait = { ticks = 5 } },
+]
+produces = [
+    { area = "clan_wars_teleport" },
+]
+
+[enter_clan_wars_ffa_safe]
+weight = -10
+requires = [
+    { combat_level = { min = 30 } },
+    { area = { id = "clan_wars_teleport" } },
+]
+actions = [
+    { object = { option = "Enter", id = "clan_wars_portal_ffa_safe", radius = 15, success = { any = [{ interface_open = { id = "warning_clan_wars_ffa_safe" } }, { area = { id = "clan_wars_ffa_safe_lobby" } }, { area = { id = "clan_wars_ffa_safe_arena" } }] } } },
+    { interface = { option = "Go in", id = "warning_clan_wars_ffa_safe:yes", if = { interface_open = { id = "warning_clan_wars_ffa_safe" } }, success = { any = [{ area = { id = "clan_wars_ffa_safe_lobby" } }, { area = { id = "clan_wars_ffa_safe_arena" } }] } } },
+    { tile = { x = 2815, y = 5515, radius = 2 } },
+]
+produces = [
+    { area = "clan_wars_ffa_safe_arena" },
+]
+
+[enter_clan_wars_ffa_safe_from_lobby]
+weight = -10
+requires = [
+    { combat_level = { min = 30 } },
+    { area = { id = "clan_wars_ffa_safe_lobby" } },
+]
+actions = [
+    { tile = { x = 2815, y = 5515, radius = 2 } },
+]
+produces = [
+    { area = "clan_wars_ffa_safe_arena" },
+]
+
+[enter_clan_wars_ffa_dangerous]
+weight = -10
+requires = [
+    { combat_level = { min = 30 } },
+    { area = { id = "clan_wars_teleport" } },
+]
+actions = [
+    { object = { option = "Enter", id = "clan_wars_portal_ffa_dangerous", radius = 15, success = { any = [{ interface_open = { id = "warning_clan_wars_ffa_safe" } }, { area = { id = "clan_wars_ffa_dangerous_lobby" } }, { area = { id = "clan_wars_ffa_dangerous_arena" } }] } } },
+    { interface = { option = "Go in", id = "warning_clan_wars_ffa_safe:yes", if = { interface_open = { id = "warning_clan_wars_ffa_safe" } }, success = { any = [{ area = { id = "clan_wars_ffa_dangerous_lobby" } }, { area = { id = "clan_wars_ffa_dangerous_arena" } }] } } },
+    { tile = { x = 3007, y = 5515, radius = 2 } },
+]
+produces = [
+    { area = "clan_wars_ffa_dangerous_arena" },
+]
+
+[enter_clan_wars_ffa_dangerous_from_lobby]
+weight = -10
+requires = [
+    { combat_level = { min = 30 } },
+    { area = { id = "clan_wars_ffa_dangerous_lobby" } },
+]
+actions = [
+    { tile = { x = 3007, y = 5515, radius = 2 } },
+]
+produces = [
+    { area = "clan_wars_ffa_dangerous_arena" },
+]

engine/src/main/kotlin/world/gregs/voidps/engine/data/config/PrayerDefinition.kt

@@ -10,6 +10,7 @@ data class PrayerDefinition(
     val drains: Map<String, Int> = emptyMap(),
     val bonuses: Map<String, Int> = emptyMap(),
     val members: Boolean = false,
+    val isCurse: Boolean = false,
     override var stringId: String = "",
     override var params: Map<Int, Any>? = null,
 ) : Parameterized {

engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/PrayerDefinitions.kt

@@ -60,9 +60,10 @@ class PrayerDefinitions {
                             else -> throw IllegalArgumentException("Unexpected key: '$key' ${exception()}")
                         }
                         val id = stringId.substring(0, stringId.lastIndexOf('_'))
-                        val definition = PrayerDefinition(index, level, drain, groups, drains, bonuses, members, id)
+                        val isCurse = stringId.endsWith("_curse")
+                        val definition = PrayerDefinition(index, level, drain, groups, drains, bonuses, members, isCurse, id)
                         definitions[id] = definition
-                        if (stringId.endsWith("_curse")) {
+                        if (isCurse) {
                             curses[index] = definition
                         } else {
                             prayers[index] = definition

engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/CharacterIndexMap.kt

@@ -11,7 +11,8 @@ class CharacterIndexMap(size: Int) {
     /**
      * Table mapping tiles to sets
      */
-    private val table = Int2ObjectOpenHashMap<MutableSet<Int>>(size)
+    @PublishedApi
+    internal val table = Int2ObjectOpenHashMap<MutableSet<Int>>(size)
 
     /**
      * Which tile set the index is currently in
@@ -51,8 +52,11 @@ class CharacterIndexMap(size: Int) {
         current.fill(INVALID)
     }
 
-    fun onEach(id: Int, action: (Int) -> Unit) {
-        table.get(id)?.onEach(action)
+    inline fun onEach(id: Int, action: (Int) -> Unit) {
+        val set = table.get(id) ?: return
+        for (index in set) {
+            action(index)
+        }
     }
 
     companion object {

engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/mode/combat/CombatMovement.kt

@@ -47,6 +47,10 @@ class CombatMovement(
             character.mode = EmptyMode
             return
         }
+        if (target["dead", false]) {
+            character.mode = EmptyMode
+            return
+        }
         if (character is NPC) {
             val spawn: Tile = character["spawn_tile"] ?: return
             val definition = get<CombatDefinitions>().get(character.transformDef["combat_def", character.id])

engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/npc/NPCs.kt

@@ -73,7 +73,10 @@ object NPCs : Runnable,
     }
 
     fun remove(npc: NPC?): Boolean {
-        if (npc == null || npc.index == -1) {
+        if (npc == null) {
+            return false
+        }
+        if (npc.index == -1) {
             logger.warn { "Unable to remove npc $npc." }
             return false
         }

engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/player/Players.kt

@@ -9,9 +9,9 @@ import world.gregs.voidps.type.Zone
 
 object Players : Iterable<Player>, CharacterSearch<Player> {
     private val players = mutableListOf<Player>()
-    private val indexArray: Array<Player?> = arrayOfNulls(MAX_PLAYERS)
+    @PublishedApi internal val indexArray: Array<Player?> = arrayOfNulls(MAX_PLAYERS)
     private var indexer = 1
-    private val map = CharacterIndexMap(MAX_PLAYERS)
+    @PublishedApi internal val map = CharacterIndexMap(MAX_PLAYERS)
     val size: Int
         get() = players.size
 
@@ -71,6 +71,34 @@ object Players : Iterable<Player>, CharacterSearch<Player> {
         return list
     }
 
+    /**
+     * Non-allocating chebyshev-radius scan centred on [center]. Iterates only the zones whose
+     * bounds overlap `[center.x ± radius]` × `[center.y ± radius]` on [center]'s level, then
+     * filters each zone's players by exact tile bounds.
+     *
+     * Dramatically cheaper than calling [at] per-tile in a spiral: one zone lookup per overlapping
+     * zone (≤ 25 for radius 15) versus 961 tile lookups each scanning the full zone.
+     */
+    inline fun forEachInRadius(center: Tile, radius: Int, action: (Player) -> Unit) {
+        val minZx = (center.x - radius) shr 3
+        val maxZx = (center.x + radius) shr 3
+        val minZy = (center.y - radius) shr 3
+        val maxZy = (center.y + radius) shr 3
+        val level = center.level
+        for (zx in minZx..maxZx) {
+            for (zy in minZy..maxZy) {
+                map.onEach(Zone.id(zx, zy, level)) { index ->
+                    val player = indexArray[index] ?: return@onEach
+                    val dx = player.tile.x - center.x
+                    if (dx < -radius || dx > radius) return@onEach
+                    val dy = player.tile.y - center.y
+                    if (dy < -radius || dy > radius) return@onEach
+                    action(player)
+                }
+            }
+        }
+    }
+
     fun clear() {
         for (player in this) {
             Despawn.player(player)

game/src/main/kotlin/content/area/wilderness/Wilderness.kt

@@ -1,5 +1,6 @@
 package content.area.wilderness
 
+import world.gregs.voidps.engine.data.definition.Areas
 import world.gregs.voidps.engine.entity.character.Character
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.entity.character.player.combatLevel
@@ -35,6 +36,14 @@ val Character.inPvp: Boolean
 val Character.inWilderness: Boolean
     get() = get("in_wilderness", false)
 
+/**
+ * True when wilderness-style PvP consequences apply: combat-start skull and full item drops on
+ * death. Wilderness itself, plus the Clan Wars FFA dangerous arena. Distinct from [inPvp], which
+ * only gates "can you attack here" and is also true in safer arenas (FFA safe, etc.).
+ */
+val Character.inFullPvp: Boolean
+    get() = inWilderness || tile in Areas["clan_wars_ffa_dangerous_arena"]
+
 val Character.inMultiCombat: Boolean
     get() = contains("in_multi_combat")