Merge pull request #7100 from mdr55/CT-conditional-nonspellbuffs

[script][combat-trainer] Arbitrary condition checks for non-spell buffs

combat-trainer.lic

@@ -2710,13 +2710,23 @@ class AbilityProcess
   end
 
   def check_nonspell_buffs(game_state)
-    @buffs.each do |action, cooldown|
+    @buffs.each do |action, blob|
       timer = game_state.cooldown_timers[action]
+
+      # break apart the blob into OG cooldown timer and the new optional conditional string using a fake && as a delimiter
+      blob_array = blob.to_s.split(/ && /, 2)
+      cooldown = blob_array[0].to_i
+      conditional = blob_array[1][1..-2] # strip out the leading and following double quotes
+
       next unless !timer || (Time.now - timer).to_i > cooldown
 
       game_state.cooldown_timers[action] = Time.now
-      fput action
-      waitrt?
+
+      # do action if there is no conditional (OG behaviour), or do action if there is a conditional and it evaluated as true
+      if conditional.nil? || (conditional && eval(conditional))
+        fput action
+        waitrt?
+      end
     end
 
     @khri