Merge pull request #1744 from Deysh/bigshot

[bigshot] v5.7.2 720 cooldown and voidweaver buff
elanthia-online · Jan 15, 2025 · 0a51d87 · 0a51d87
2 parents f5c2d0e + 54a424d
commit 0a51d87
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/scripts/bigshot.lic b/scripts/bigshot.lic
@@ -8,7 +8,7 @@
   contributors: SpiffyJr, Tillmen, Kalros, Hazado, Tysong, Athias, Falicor, Deysh, Nisugi
           game: Gemstone
           tags: hunting, bigshot, combat
-       version: 5.7.1
+       version: 5.7.2
       required: Lich >= 5.5.0, infomon >= 1.18.11
 
   Setup Instructions: https://gswiki.play.net/Script_Bigshot
@@ -17,6 +17,9 @@
 
   Version Control:
     Major_change.feature_addition.bugfix
+  v5.7.2  (2025-01-15)
+    - added implosion(720) cooldown
+    - added check for voidweaver buff from 720
   v5.7.1  (2025-01-13)
     - added client input into debug file
   v5.7.0  (2025-01-12)
@@ -2973,7 +2976,7 @@ class Bigshot
     # check mana/stamina/health(percentage)/encumbrance/unarmed tiering/mobs in room/target not prone/target undead
     # ! means the inverse/opposite effect
     original_command = command
-    if (command =~ /(.*)\((.*?(?:506|!506|barrage|!barrage|bearhug|!bearhug|buff|burst|!burst|celerity|!celerity|censer|disease|!disease|e|!e|frozen|!frozen|flurry|!flurry|flying|!flying|fury|!fury|h|!h|hidden|!hidden|holler|!holler|justice|!justice|k|!k|m|!m|mob|!mob|noncorporeal|!noncorporeal|once|outside|!outside|pcs|!pcs|poison|!poison|prone|!prone|pummel|!pummel|rapid|!rapid|reflex|!reflex|room|rooted|!rooted|s|!s|shout|!shout|surge|!surge|tailwind|!tailwind|tier|!tier|tier1|!tier1|tier2|!tier2|tier3|!tier3|thrash|!thrash|undead|!undead|v|!v|vigor|!vigor|yowlp|!yowlp).*?)\)$/i)
+    if (command =~ /(.*)\((.*?(?:506|!506|barrage|!barrage|bearhug|!bearhug|buff|burst|!burst|celerity|!celerity|censer|disease|!disease|e|!e|frozen|!frozen|flurry|!flurry|flying|!flying|fury|!fury|h|!h|hidden|!hidden|holler|!holler|justice|!justice|k|!k|m|!m|mob|!mob|noncorporeal|!noncorporeal|once|outside|!outside|pcs|!pcs|poison|!poison|prone|!prone|pummel|!pummel|rapid|!rapid|reflex|!reflex|room|rooted|!rooted|s|!s|shout|!shout|surge|!surge|tailwind|!tailwind|tier|!tier|tier1|!tier1|tier2|!tier2|tier3|!tier3|thrash|!thrash|undead|!undead|v|!v|vigor|!vigor|voidweaver|!voidweaver|yowlp|!yowlp).*?)\)$/i)
       command = $1.strip
 
       $2.split(" ").each { |s|
@@ -3023,7 +3026,7 @@ class Bigshot
           return buff_check[command] if buff_check[command]
         end
 
-        if s =~ /((?:506|!506|barrage|!barrage|bearhug|!bearhug|burst|!burst|celerity|!celerity|censer|disease|!disease|flurry|!flurry|flying|!flying|frozen|!frozen|fury|!fury|hidden|!hidden|holler|!holler|justice|!justice|noncorporeal|!noncorporeal|once|outside|!outside|pcs|!pcs|poison|!poison|prone|!prone|pummel|!pummel|rapid|!rapid|reflex|!reflex|room|rooted|!rooted|shout|!shout|surge|!surge|tailwind|!tailwind|thrash|!thrash|tier1|!tier1|tier2|!tier2|tier3|!tier3|undead|!undead|vigor|!vigor|yowlp|!yowlp))/i
+        if s =~ /((?:506|!506|barrage|!barrage|bearhug|!bearhug|burst|!burst|celerity|!celerity|censer|disease|!disease|flurry|!flurry|flying|!flying|frozen|!frozen|fury|!fury|hidden|!hidden|holler|!holler|justice|!justice|noncorporeal|!noncorporeal|once|outside|!outside|pcs|!pcs|poison|!poison|prone|!prone|pummel|!pummel|rapid|!rapid|reflex|!reflex|room|rooted|!rooted|shout|!shout|surge|!surge|tailwind|!tailwind|thrash|!thrash|tier1|!tier1|tier2|!tier2|tier3|!tier3|undead|!undead|vigor|!vigor|voidweaver|!voidweaver|yowlp|!yowlp))/i
           item = $1.strip
           other_checks = {
             '506'           => (!Spell[506].active?),
@@ -3090,6 +3093,8 @@ class Bigshot
             '!undead'       => npc.type.split(',').any? { |a| a == "undead" },
             'vigor'         => !Effects::Buffs.active?('Tangleweed Vigor'),
             '!vigor'        => Effects::Buffs.active?('Tangleweed Vigor'),
+            'voidweaver'    => Effects::Buffs.to_h.keys.grep(/Voidweaver/).any?,
+            '!voidweaver'   => !Effects::Buffs.to_h.keys.grep(/Voidweaver/).any?,
             'yowlp'         => !Effects::Buffs.active?("Yertie's Yowlp"),
             '!yowlp'        => Effects::Buffs.active?("Yertie's Yowlp"),
           }
@@ -4042,6 +4047,7 @@ class Bigshot
     return if id == 703 and $bigshot_703_list.any? { |s| s == target.id }
     return if id == 1614 and $bigshot_1614_list.any? { |s| s == target.id }
     return if target.status =~ /dead|gone/ || !GameObj.targets.any? { |s| s.id == target.id }
+    return if id == 720 and Effects::Cooldowns.active?("Implosion") # implosion cooldown
 
     unless (Spell[id].affordable?)
       if (@WAND_IF_OOM)