From f7532ef892076781a16401f0fecc9140d853744c Mon Sep 17 00:00:00 2001 From: brittsmagee <74532349+brittsmagee@users.noreply.github.com> Date: Thu, 15 Apr 2021 01:49:44 -0600 Subject: [PATCH 1/6] Update Steal_StreamlabsSystem.py --- Steal/Steal_StreamlabsSystem.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Steal/Steal_StreamlabsSystem.py b/Steal/Steal_StreamlabsSystem.py index d6443c8..18674c8 100644 --- a/Steal/Steal_StreamlabsSystem.py +++ b/Steal/Steal_StreamlabsSystem.py @@ -49,6 +49,7 @@ def Execute(data): userId = data.User username = data.UserName points = Parent.GetPoints(userId) + victimId = data.User if points < settings["costs"]: outputMessage = settings["responseNotEnoughPoints"] @@ -67,17 +68,16 @@ def Execute(data): outputMessage = "" else: Parent.RemovePoints(userId, username, settings["costs"]) - isStealing = Parent.GetRandom(0, 2) - userList = Parent.GetViewerList() - + isStealing = Parent.GetDisplayName + while True: - victimId = userList[Parent.GetRandom(0, len(userList))] + victimId = Parent.GetDisplayName if victimId != userId: break victim = Parent.GetDisplayName(victimId) - reward = Parent.GetRandom(settings["minReward"], settings["maxReward"] + 1) + reward = Parent.GetDisplayName(settings["minReward"], settings["maxReward"] + 1) if reward > points: reward = points From 93cc275f57b8f01c91718ac25b35e2a05bf52be7 Mon Sep 17 00:00:00 2001 From: brittsmagee <74532349+brittsmagee@users.noreply.github.com> Date: Thu, 15 Apr 2021 06:25:41 -0600 Subject: [PATCH 2/6] Update Steal_StreamlabsSystem.py --- Steal/Steal_StreamlabsSystem.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Steal/Steal_StreamlabsSystem.py b/Steal/Steal_StreamlabsSystem.py index 18674c8..bac3f92 100644 --- a/Steal/Steal_StreamlabsSystem.py +++ b/Steal/Steal_StreamlabsSystem.py @@ -38,9 +38,9 @@ def Init(): "onCooldown": "$user, $command is still on cooldown for $cd minutes!", "userCooldown": 300, "onUserCooldown": "$user $command is still on user cooldown for $cd minutes!", - "responseWon": "$user stole $reward $currency from $victim", - "responseLost": "$user couldn't steal any $currency from $victim and lost $reward $currency", - "responseNotEnoughPoints": "$user you need $cost $currency to steal." + "responseWon": "$dummy $user stole $reward $currency from $victim", + "responseLost": "$dummy user couldn't steal any $currency from $victim and lost $reward $currency", + "responseNotEnoughPoints": "$user you need $cost $currency to steal from $msg." } def Execute(data): @@ -49,7 +49,8 @@ def Execute(data): userId = data.User username = data.UserName points = Parent.GetPoints(userId) - victimId = data.User + victimId = data.TargetName + victim = Parent.GetDisplayName(victimId) if points < settings["costs"]: outputMessage = settings["responseNotEnoughPoints"] @@ -68,16 +69,17 @@ def Execute(data): outputMessage = "" else: Parent.RemovePoints(userId, username, settings["costs"]) - isStealing = Parent.GetDisplayName - + isStealing = Parent.GetRandom(0, 2) + userList = Parent.GetViewerList() + while True: - victimId = Parent.GetDisplayName + victim = Parent.GetDisplayName(victimId) if victimId != userId: break victim = Parent.GetDisplayName(victimId) - reward = Parent.GetDisplayName(settings["minReward"], settings["maxReward"] + 1) + reward = Parent.GetRandom(settings["minReward"], settings["maxReward"] + 1) if reward > points: reward = points From 293c9070086589b7a0c1815892e42824d193a413 Mon Sep 17 00:00:00 2001 From: brittsmagee <74532349+brittsmagee@users.noreply.github.com> Date: Thu, 15 Apr 2021 06:32:48 -0600 Subject: [PATCH 3/6] Update Steal_StreamlabsSystem.py --- Steal/Steal_StreamlabsSystem.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Steal/Steal_StreamlabsSystem.py b/Steal/Steal_StreamlabsSystem.py index bac3f92..2fac1f1 100644 --- a/Steal/Steal_StreamlabsSystem.py +++ b/Steal/Steal_StreamlabsSystem.py @@ -38,8 +38,8 @@ def Init(): "onCooldown": "$user, $command is still on cooldown for $cd minutes!", "userCooldown": 300, "onUserCooldown": "$user $command is still on user cooldown for $cd minutes!", - "responseWon": "$dummy $user stole $reward $currency from $victim", - "responseLost": "$dummy user couldn't steal any $currency from $victim and lost $reward $currency", + "responseWon": "$user stole $reward $currency from $victim", + "responseLost": "$user couldn't steal any $currency from $victim and lost $reward $currency", "responseNotEnoughPoints": "$user you need $cost $currency to steal from $msg." } @@ -49,7 +49,7 @@ def Execute(data): userId = data.User username = data.UserName points = Parent.GetPoints(userId) - victimId = data.TargetName + victimId = data.Target victim = Parent.GetDisplayName(victimId) if points < settings["costs"]: From e0d3c52f1f26ef9672ccb1a216760ede3a9205dd Mon Sep 17 00:00:00 2001 From: brittsmagee <74532349+brittsmagee@users.noreply.github.com> Date: Thu, 15 Apr 2021 06:34:57 -0600 Subject: [PATCH 4/6] Update Steal_StreamlabsSystem.py --- Steal/Steal_StreamlabsSystem.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Steal/Steal_StreamlabsSystem.py b/Steal/Steal_StreamlabsSystem.py index 2fac1f1..80367e0 100644 --- a/Steal/Steal_StreamlabsSystem.py +++ b/Steal/Steal_StreamlabsSystem.py @@ -109,6 +109,7 @@ def Execute(data): outputMessage = outputMessage.replace("$cost", str(settings["costs"])) outputMessage = outputMessage.replace("$minReward", str(settings["minReward"])) outputMessage = outputMessage.replace("$maxReward", str(settings["maxReward"])) + outputMessage = outputMessage.replace("$victim", victim) Parent.SendStreamMessage(outputMessage) return From 3446dc70cf7085592c7c9c552ff224deeb0a45ab Mon Sep 17 00:00:00 2001 From: brittsmagee <74532349+brittsmagee@users.noreply.github.com> Date: Thu, 15 Apr 2021 07:26:12 -0600 Subject: [PATCH 5/6] Update Steal_StreamlabsSystem.py --- Steal/Steal_StreamlabsSystem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Steal/Steal_StreamlabsSystem.py b/Steal/Steal_StreamlabsSystem.py index 80367e0..f190b81 100644 --- a/Steal/Steal_StreamlabsSystem.py +++ b/Steal/Steal_StreamlabsSystem.py @@ -49,8 +49,7 @@ def Execute(data): userId = data.User username = data.UserName points = Parent.GetPoints(userId) - victimId = data.Target - victim = Parent.GetDisplayName(victimId) + victim = Parent.GetDisplayName("targetid") if points < settings["costs"]: outputMessage = settings["responseNotEnoughPoints"] @@ -109,6 +108,7 @@ def Execute(data): outputMessage = outputMessage.replace("$cost", str(settings["costs"])) outputMessage = outputMessage.replace("$minReward", str(settings["minReward"])) outputMessage = outputMessage.replace("$maxReward", str(settings["maxReward"])) + outputMessage = outputMessage.replace("$victim", Parent.GetDisplayName("$targetid")) outputMessage = outputMessage.replace("$victim", victim) Parent.SendStreamMessage(outputMessage) From 95075a93804d42bad788b99a0c636fd30bcdf260 Mon Sep 17 00:00:00 2001 From: brittsmagee <74532349+brittsmagee@users.noreply.github.com> Date: Thu, 15 Apr 2021 07:35:56 -0600 Subject: [PATCH 6/6] Update Steal_StreamlabsSystem.py --- Steal/Steal_StreamlabsSystem.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Steal/Steal_StreamlabsSystem.py b/Steal/Steal_StreamlabsSystem.py index f190b81..934b710 100644 --- a/Steal/Steal_StreamlabsSystem.py +++ b/Steal/Steal_StreamlabsSystem.py @@ -49,7 +49,8 @@ def Execute(data): userId = data.User username = data.UserName points = Parent.GetPoints(userId) - victim = Parent.GetDisplayName("targetid") + victimId = Parent.GetDisplayName("targetid") + victim = Parent.GetDisplayName(victimId) if points < settings["costs"]: outputMessage = settings["responseNotEnoughPoints"] @@ -94,6 +95,7 @@ def Execute(data): outputMessage = settings["responseLost"] + outputMessage = outputMessage.replace("$victim", Parent.GetDisplayName("$targetid")) outputMessage = outputMessage.replace("$victim", victim) outputMessage = outputMessage.replace("$reward", str(reward))