Merge pull request #790 from InvalidOS/probability_hook_fix

Probability hook fix

Author: Jevonnissocoolman

cryptid.code-workspace

@@ -0,0 +1,11 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"name": "Cryptid",
+			"path": "Cryptid"
+		}
+	]
+}

lib/overrides.lua

@@ -2163,20 +2163,20 @@ function get_straight(hand, min_length, skip, wrap)
 end
 
 local get_prob_vars_ref = SMODS.get_probability_vars
-function SMODS.get_probability_vars(trigger_obj, base_numerator, base_denominator, identifier, from_roll)
+function SMODS.get_probability_vars(trigger_obj, base_numerator, base_denominator, identifier, from_roll, no_mod, ...)
 	local mod = trigger_obj and trigger_obj.ability and trigger_obj.ability.cry_prob or 1
 	local numerator = base_numerator * mod
-	if trigger_obj and trigger_obj.ability and trigger_obj.ability.cry_rigged then
+	if trigger_obj and trigger_obj.ability and trigger_obj.ability.cry_rigged and not no_mod then
 		numerator = base_denominator
 	end
-	return get_prob_vars_ref(trigger_obj, numerator, base_denominator, identifier, from_roll)
+	return get_prob_vars_ref(trigger_obj, numerator, base_denominator, identifier, from_roll, no_mod, ...)
 end
 
 local pseudorandom_probability_ref = SMODS.pseudorandom_probability
-function SMODS.pseudorandom_probability(trigger_obj, seed, base_numerator, base_denominator, identifier)
+function SMODS.pseudorandom_probability(trigger_obj, seed, base_numerator, base_denominator, identifier, no_mod, ...)
 	local mod = trigger_obj and trigger_obj.ability and trigger_obj.ability.cry_prob or 1
 	local numerator = base_numerator * mod
-	if trigger_obj and trigger_obj.ability and trigger_obj.ability.cry_rigged then
+	if trigger_obj and trigger_obj.ability and trigger_obj.ability.cry_rigged and not no_mod then
 		SMODS.post_prob = SMODS.post_prob or {}
 		SMODS.post_prob[#SMODS.post_prob + 1] = {
 			pseudorandom_result = true,
@@ -2188,7 +2188,7 @@ function SMODS.pseudorandom_probability(trigger_obj, seed, base_numerator, base_
 		}
 		return true
 	end
-	return pseudorandom_probability_ref(trigger_obj, seed, numerator, base_denominator, identifier)
+	return pseudorandom_probability_ref(trigger_obj, seed, numerator, base_denominator, identifier, no_mod, ...)
 end
 
 local is_eternalref = SMODS.is_eternal