From ddf426d4eeb34cc0253eb199b5f86a3d0ad14dd1 Mon Sep 17 00:00:00 2001 From: Tooze Date: Tue, 27 Jan 2026 11:30:19 -0500 Subject: [PATCH] Cleaned up HornListeners --- .../barbassault/arena/HornListeners.kt | 80 ++++++++++--------- 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/Server/src/main/content/minigame/barbassault/arena/HornListeners.kt b/Server/src/main/content/minigame/barbassault/arena/HornListeners.kt index b67f1a8bf..83098b264 100644 --- a/Server/src/main/content/minigame/barbassault/arena/HornListeners.kt +++ b/Server/src/main/content/minigame/barbassault/arena/HornListeners.kt @@ -1,5 +1,6 @@ package content.minigame.barbassault.arena +import content.minigame.barbassault.lobby.baSession import core.api.sendChat import core.api.sendMessage import core.game.interaction.IntType @@ -8,96 +9,101 @@ import org.rs09.consts.Items class HornListeners : InteractionListener { val ATTACKER_HORNS = intArrayOf(Items.ATTACKER_HORN_10516,Items.ATTACKER_HORN_10517,Items.ATTACKER_HORN_10518,Items.ATTACKER_HORN_10519,Items.ATTACKER_HORN_10520) - val TELL_RED = "Collector: Red Eggs!" - val TELL_GREEN = "Collector: Green Eggs!" - val TELL_BLUE = "Collector: Blue Eggs!" - - val TELL_PTOFU = "Healer: Poison tofo!" - val TELL_PWORMS = "Healer: Poison worms!" - val TELL_PMEAT = "Healer: Poison meat!" - - val TELL_STYLE1 = "Attacker: Controlled/Bronze/Wind!" - val TELL_STYLE2 = "Attacker: Accurate/Iron/Water!" - val TELL_STYLE3 = "Attacker: Aggressive/Steel/Earth!" - val TELL_STYLE4 = "Attacker: Defensive/Mithril/Fire!" - val HEALER_HORNS = intArrayOf(Items.HEALER_HORN_10526,Items.HEALER_HORN_10527,Items.HEALER_HORN_10528,Items.HEALER_HORN_10529,Items.HEALER_HORN_10530 ) - val TELL_TOFU = "Defender: Drop Tofu!" - val TELL_CRACKERS= "Defender: Drop Crackers!" - val TELL_WORMS = "Defender: Drop Worms!" - val ALL_HORNS = intArrayOf(Items.COLLECTOR_HORN_10560,Items.DEFENDER_HORN_10538) + HEALER_HORNS + ATTACKER_HORNS - val TELL_MEDIC = "Medic!!" + + enum class BaCall(val text: String) { + COLLECTOR_RED("Collector: Red Eggs!"), + COLLECTOR_GREEN("Collector: Green Eggs!"), + COLLECTOR_BLUE("Collector: Blue Eggs!"), + + HEALER_TOFU("Healer: Poison tofu!"), + HEALER_WORMS("Healer: Poison worms!"), + HEALER_MEAT("Healer: Poison meat!"), + + ATTACKER_STYLE_1("Attacker: Controlled/Bronze/Wind!"), + ATTACKER_STYLE_2("Attacker: Accurate/Iron/Water!"), + ATTACKER_STYLE_3("Attacker: Aggressive/Steel/Earth!"), + ATTACKER_STYLE_4("Attacker: Defensive/Mithril/Fire!"), + + DEFENDER_TOFU("Defender: Drop Tofu!"), + DEFENDER_CRACKERS("Defender: Drop Crackers!"), + DEFENDER_WORMS("Defender: Drop Worms!"), + MEDIC("Medic!!") + } override fun defineListeners() { on(ALL_HORNS, IntType.ITEM, "Medic") { player, _ -> - sendChat(player,TELL_MEDIC) + sendChat(player,BaCall.MEDIC.text) + //pretty sure there is an emote with this (wave hand, panic face?) + //player.baSession.team.broadcastMedic(player) return@on true } on(ALL_HORNS, IntType.ITEM, "Drop") { player, _ -> sendMessage(player,"I need that!") // not authentic return@on false } - //ATTACKER on(ATTACKER_HORNS, IntType.ITEM, "Tell-red") { player, _ -> - sendChat(player,TELL_RED) + sendChat(player,BaCall.COLLECTOR_RED.text) + //player.baSession.team.broadcastColl(red) return@on true } on(ATTACKER_HORNS, IntType.ITEM, "Tell-green") { player, _ -> - sendChat(player,TELL_GREEN) + sendChat(player,BaCall.COLLECTOR_GREEN.text) + //player.baSession.team.broadcastColl(green) return@on true } on(ATTACKER_HORNS, IntType.ITEM, "Tell-blue") { player, _ -> - sendChat(player,TELL_BLUE) + sendChat(player,BaCall.COLLECTOR_BLUE.text) + //player.baSession.team.broadcastColl(blue) return@on true } - //DEFENDER on(Items.DEFENDER_HORN_10538, IntType.ITEM, "Tell-tofu") { player, _ -> - sendChat(player,TELL_PTOFU) + sendChat(player,BaCall.HEALER_TOFU.text) + //player.baSession.team.broadcastDef(tofu) return@on true } on(Items.DEFENDER_HORN_10538, IntType.ITEM, "Tell-worms") { player, _ -> - sendChat(player,TELL_PWORMS) + sendChat(player,BaCall.HEALER_WORMS.text) + //player.baSession.team.broadcastDef(worms) return@on true } on(Items.DEFENDER_HORN_10538, IntType.ITEM, "Tell-meat") { player, _ -> - sendChat(player,TELL_PMEAT) + sendChat(player,BaCall.HEALER_MEAT.text) + //player.baSession.team.broadcastDef(meat) return@on true } - //COLLECTOR on(Items.COLLECTOR_HORN_10560, IntType.ITEM, "Tell-style1") { player, _ -> - sendChat(player,TELL_STYLE1) + sendChat(player,BaCall.ATTACKER_STYLE_1.text) return@on true } on(Items.COLLECTOR_HORN_10560, IntType.ITEM, "Tell-style2") { player, _ -> - sendChat(player,TELL_STYLE2) + sendChat(player,BaCall.ATTACKER_STYLE_2.text) return@on true } on(Items.COLLECTOR_HORN_10560, IntType.ITEM, "Tell-style3") { player, _ -> - sendChat(player,TELL_STYLE3) + sendChat(player,BaCall.ATTACKER_STYLE_3.text) return@on true } on(Items.COLLECTOR_HORN_10560, IntType.ITEM, "Tell-style4") { player, _ -> - sendChat(player,TELL_STYLE4) + sendChat(player,BaCall.ATTACKER_STYLE_4.text) return@on true } - //HEALER on(HEALER_HORNS, IntType.ITEM, "Tell-tofu") { player, _ -> - sendChat(player,TELL_TOFU) + sendChat(player,BaCall.DEFENDER_TOFU.text) return@on true } on(HEALER_HORNS, IntType.ITEM, "Tell-crackers") { player, _ -> - sendChat(player,TELL_CRACKERS) + sendChat(player,BaCall.DEFENDER_CRACKERS.text) return@on true } on(HEALER_HORNS, IntType.ITEM, "tell-worms") { player, _ -> - sendChat(player,TELL_WORMS) + sendChat(player,BaCall.DEFENDER_WORMS.text) return@on true } - } } \ No newline at end of file