From d0688171ae17ced40a90a19e18cf9352f2a2d6a5 Mon Sep 17 00:00:00 2001 From: Pierce Lally Date: Wed, 20 Sep 2023 21:59:01 -0400 Subject: [PATCH] Round modifiers (#44) * add round modifiers * add round modifier * fix hookguard * Update web/discord_relay/queue.go Co-authored-by: Brandon Sturgeon --------- Co-authored-by: Brandon Sturgeon --- .../cfc_chat_transit/server/modules/round_modifiers.moon | 9 +++++++++ web/discord_relay/queue.go | 7 +++++++ 2 files changed, 16 insertions(+) create mode 100644 moon/cfc_chat_transit/server/modules/round_modifiers.moon diff --git a/moon/cfc_chat_transit/server/modules/round_modifiers.moon b/moon/cfc_chat_transit/server/modules/round_modifiers.moon new file mode 100644 index 0000000..705d589 --- /dev/null +++ b/moon/cfc_chat_transit/server/modules/round_modifiers.moon @@ -0,0 +1,9 @@ +import guard from ChatTransit + +ChatTransit.RoundModifierEvent = (_, modifier) => + @Send + Type: "round_modifier_enabled" + Data: + Content: "Enabled Modifier #{modifier\PrintName!}: #{modifier\ShortDesription!}" + +hook.Add "RoundModifiers_ModifierEnabled", "CFC_ChatTransit_Relay", guard ChatTransit\RoundModifierEvent diff --git a/web/discord_relay/queue.go b/web/discord_relay/queue.go index ccf0280..4db65b9 100644 --- a/web/discord_relay/queue.go +++ b/web/discord_relay/queue.go @@ -63,6 +63,7 @@ const ( EMOJI_CONNECT = "📡" EMOJI_ULX = "⌨️" EMOJI_VOICE = "🗣️" + EMOJI_ROUND_MODIFIER = "🔵" COLOR_RED = 0xE7373E COLOR_GREEN = 0x37E73E @@ -172,6 +173,10 @@ func sendUlxAction(discord *discordgo.Session, event EventStruct) { sendEvent(discord, event, event.Data.Content, COLOR_BLUE, EMOJI_ULX) } +func sendRoundModifierEnabled(discord *discordgo.Session, event EventStruct) { + sendEvent(discord, event, event.Data.Content, COLOR_BLUE, EMOJI_ROUND_MODIFIER) +} + func sendPvpStatusChange(discord *discordgo.Session, event EventStruct) { var emoji string var color int @@ -308,6 +313,8 @@ func queueGroomer() { sendUlxAction(discord, message) case "pvp_status_change": sendPvpStatusChange(discord, message) + case "round_modifier_enabled": + sendRoundModifierEnabled(discord, message) case "voice_transcript": processVoiceText(voiceManager.ReceiveVoiceTranscript, message) }