From d9394605f4af7244fc72d3cecfd2e25b69955105 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sun, 26 Nov 2023 13:00:27 +0100 Subject: [PATCH] Set tempvar values for raid events --- data/locale/en-US.ini | 14 ++++++++++++++ .../twitch/macro-condition-twitch.cpp | 13 ++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index 66775f5e..a88f8825 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -1412,6 +1412,20 @@ AdvSceneSwitcher.tempVar.twitch.chatter="User login" AdvSceneSwitcher.tempVar.twitch.chatter.description="The user login of the person who sent the chat message." AdvSceneSwitcher.tempVar.twitch.chat_message="Chat message" +AdvSceneSwitcher.tempVar.twitch.from_broadcaster_user_id.raid="Raid creator user ID" +AdvSceneSwitcher.tempVar.twitch.from_broadcaster_user_id.raid.description="The broadcaster ID that created the raid." +AdvSceneSwitcher.tempVar.twitch.from_broadcaster_user_login.raid="Raid creator user login" +AdvSceneSwitcher.tempVar.twitch.from_broadcaster_user_login.raid.description="The broadcaster login that created the raid." +AdvSceneSwitcher.tempVar.twitch.from_broadcaster_user_name.raid="Raid creator user name" +AdvSceneSwitcher.tempVar.twitch.from_broadcaster_user_name.raid.description="The broadcaster display name that created the raid." +AdvSceneSwitcher.tempVar.twitch.to_broadcaster_user_id.raid="Raid receiver user ID" +AdvSceneSwitcher.tempVar.twitch.to_broadcaster_user_id.raid.description="The broadcaster ID that created the raid." +AdvSceneSwitcher.tempVar.twitch.to_broadcaster_user_login.raid="Raid receiver user login" +AdvSceneSwitcher.tempVar.twitch.to_broadcaster_user_login.raid.description="The broadcaster login that created the raid." +AdvSceneSwitcher.tempVar.twitch.to_broadcaster_user_name.raid="Raid receiver user name" +AdvSceneSwitcher.tempVar.twitch.to_broadcaster_user_name.raid.description="The broadcaster display name that created the raid." +AdvSceneSwitcher.tempVar.twitch.viewers.raid="Raid participants" +AdvSceneSwitcher.tempVar.twitch.viewers.raid.description="The number of viewers in the raid." AdvSceneSwitcher.tempVar.audio.output_volume="Output volume" AdvSceneSwitcher.tempVar.audio.output_volume.description="The volume the audio source is outputting." diff --git a/src/macro-external/twitch/macro-condition-twitch.cpp b/src/macro-external/twitch/macro-condition-twitch.cpp index bcc5e6d3..b63101cb 100644 --- a/src/macro-external/twitch/macro-condition-twitch.cpp +++ b/src/macro-external/twitch/macro-condition-twitch.cpp @@ -866,7 +866,9 @@ void MacroConditionTwitch::SetupTempVars() AddTempvar(id, name.empty() ? id : name, description); }; - if (_condition != Condition::CHAT_MESSAGE_RECEIVED) { + if (_condition != Condition::CHAT_MESSAGE_RECEIVED && + _condition != Condition::RAID_INBOUND_EVENT && + _condition != Condition::RAID_OUTBOUND_EVENT) { setupTempVarHelper("broadcaster_user_id"); setupTempVarHelper("broadcaster_user_login"); setupTempVarHelper("broadcaster_user_name"); @@ -1141,7 +1143,16 @@ void MacroConditionTwitch::SetupTempVars() setupTempVarHelper("user_name", ".follow"); setupTempVarHelper("followed_at"); break; + case Condition::RAID_INBOUND_EVENT: case Condition::RAID_OUTBOUND_EVENT: + setupTempVarHelper("from_broadcaster_user_id", ".raid"); + setupTempVarHelper("from_broadcaster_user_login", ".raid"); + setupTempVarHelper("from_broadcaster_user_name", ".raid"); + setupTempVarHelper("to_broadcaster_user_id", ".raid"); + setupTempVarHelper("to_broadcaster_user_login", ".raid"); + setupTempVarHelper("to_broadcaster_user_name", ".raid"); + setupTempVarHelper("viewers", ".raid"); + break; case Condition::LIVE_POLLING: setupTempVarHelper("id", ".stream.online"); setupTempVarHelper("game_id");