@@ -15,14 +15,7 @@ function eval_card(card, context)
1515 return {}, {}
1616 end
1717 -- Store old probability for later reference
18- local ggpn = G .GAME .probabilities .normal
19- if card .ability .cry_rigged then
20- G .GAME .probabilities .normal = 1e9
21- end
2218 local ret , post = ec (card , context )
23- if card .ability .cry_rigged then
24- G .GAME .probabilities .normal = ggpn
25- end
2619 return ret , post
2720end
2821
@@ -368,10 +361,6 @@ function Card:cry_double_scale_calc(orig_ability, in_context_scaling)
368361 -- found one!
369362 if obj .cry_scale_mod and type (obj .cry_scale_mod ) == " function" then
370363 -- rig the probabilities in case that matters for the joker's scaling function
371- local ggpn = G .GAME .probabilities .normal
372- if G .jokers .cards [i ].ability .cry_rigged then
373- G .GAME .probabilities .normal = 1e9
374- end
375364
376365 -- 'o' will be the new factor that the joker should scale by next time
377366 local o = obj :cry_scale_mod (
@@ -383,11 +372,6 @@ function Card:cry_double_scale_calc(orig_ability, in_context_scaling)
383372 new_scale_base
384373 )
385374
386- -- return probabilities to normal
387- if G .jokers .cards [i ].ability .cry_rigged then
388- G .GAME .probabilities .normal = ggpn
389- end
390-
391375 -- the function returned a value, do the scale setting with it
392376 if o then
393377 -- set the scale factor field to 'o'
@@ -421,18 +405,11 @@ function Card:cry_double_scale_calc(orig_ability, in_context_scaling)
421405 -- now, let's check for repetitions on the scale-affecting jokers
422406 local reps = {}
423407 for j = 1 , # G .jokers .cards do
424- local ggpn = G .GAME .probabilities .normal
425- if G .jokers .cards [j ].ability .cry_rigged then
426- G .GAME .probabilities .normal = 1e9
427- end
428408 -- check if another joker is retriggering our scale-affecting joker
429409 local check = cj (
430410 G .jokers .cards [j ],
431411 { retrigger_joker_check = true , other_card = G .jokers .cards [i ] }
432412 )
433- if G .jokers .cards [j ].ability .cry_rigged then
434- G .GAME .probabilities .normal = ggpn
435- end
436413 -- keep track of which joker retriggers the scale-joker
437414 if type (check ) == " table" then
438415 reps [j ] = check and check .repetitions and check or 0
@@ -461,10 +438,6 @@ function Card:cry_double_scale_calc(orig_ability, in_context_scaling)
461438 for r = 1 , rep .repetitions do
462439 card_eval_status_text (rep .card , " jokers" , nil , nil , nil , rep )
463440 -- now, same thing as before, apply the scale-joker
464- local ggpn = G .GAME .probabilities .normal
465- if G .jokers .cards [i ].ability .cry_rigged then
466- G .GAME .probabilities .normal = 1e9
467- end
468441 local o = obj :cry_scale_mod (
469442 G .jokers .cards [i ],
470443 self ,
@@ -473,9 +446,6 @@ function Card:cry_double_scale_calc(orig_ability, in_context_scaling)
473446 orig_scale_base ,
474447 new_scale_base
475448 )
476- if G .jokers .cards [i ].ability .cry_rigged then
477- G .GAME .probabilities .normal = ggpn
478- end
479449
480450 if o then
481451 if # dbl_info .scaler [info_i ] == 2 then
@@ -598,13 +568,9 @@ function Card:calculate_joker(context)
598568 if not active_side or active_side .will_shatter then
599569 return
600570 end
601- local ggpn = G .GAME .probabilities .normal
602571 if not G .GAME .cry_double_scale then
603572 G .GAME .cry_double_scale = { double_scale = true } -- doesn't really matter what's in here as long as there's something
604573 end
605- if active_side .ability .cry_rigged then
606- G .GAME .probabilities .normal = 1e9
607- end
608574 local orig_ability = copy_table (active_side .ability )
609575 local in_context_scaling = false
610576 local callback = context .callback
@@ -682,9 +648,6 @@ function Card:calculate_joker(context)
682648 in_context_scaling = true
683649 end
684650 end
685- if active_side .ability .cry_rigged then
686- G .GAME .probabilities .normal = ggpn
687- end
688651 if next (find_joker (" cry-Scalae" )) or next (find_joker (" cry-Double Scale" )) then
689652 active_side :cry_double_scale_calc (orig_ability , in_context_scaling )
690653 end
@@ -728,10 +691,6 @@ function Cryptid.apply_scale_mod(jkr, orig_scale_scale, orig_scale_base, new_sca
728691 for i = 1 , # G .jokers .cards do
729692 local obj = G .jokers .cards [i ].config .center
730693 if obj .cry_scale_mod and type (obj .cry_scale_mod ) == " function" then
731- local ggpn = G .GAME .probabilities .normal
732- if G .jokers .cards [i ].ability .cry_rigged then
733- G .GAME .probabilities .normal = 1e9
734- end
735694 local o = obj :cry_scale_mod (
736695 G .jokers .cards [i ],
737696 jkr ,
@@ -740,9 +699,6 @@ function Cryptid.apply_scale_mod(jkr, orig_scale_scale, orig_scale_base, new_sca
740699 orig_scale_base ,
741700 new_scale_base
742701 )
743- if G .jokers .cards [i ].ability .cry_rigged then
744- G .GAME .probabilities .normal = ggpn
745- end
746702 if o then
747703 if # dbl_info .scaler [info_i ] == 2 then
748704 if
@@ -772,15 +728,8 @@ function Cryptid.apply_scale_mod(jkr, orig_scale_scale, orig_scale_base, new_sca
772728
773729 local reps = {}
774730 for j = 1 , # G .jokers .cards do
775- local ggpn = G .GAME .probabilities .normal
776- if G .jokers .cards [j ].ability .cry_rigged then
777- G .GAME .probabilities .normal = 1e9
778- end
779731 local check =
780732 cj (G .jokers .cards [j ], { retrigger_joker_check = true , other_card = G .jokers .cards [i ] })
781- if G .jokers .cards [j ].ability .cry_rigged then
782- G .GAME .probabilities .normal = ggpn
783- end
784733 if type (check ) == " table" then
785734 reps [j ] = check and check .repetitions and check or 0
786735 else
@@ -803,10 +752,6 @@ function Cryptid.apply_scale_mod(jkr, orig_scale_scale, orig_scale_base, new_sca
803752 if (type (rep ) == " table" ) and rep .repetitions and (rep .repetitions > 0 ) then
804753 for r = 1 , rep .repetitions do
805754 card_eval_status_text (rep .card , " jokers" , nil , nil , nil , rep )
806- local ggpn = G .GAME .probabilities .normal
807- if G .jokers .cards [i ].ability .cry_rigged then
808- G .GAME .probabilities .normal = 1e9
809- end
810755 local o = obj :cry_scale_mod (
811756 G .jokers .cards [i ],
812757 jkr ,
@@ -815,9 +760,6 @@ function Cryptid.apply_scale_mod(jkr, orig_scale_scale, orig_scale_base, new_sca
815760 orig_scale_base ,
816761 new_scale_base
817762 )
818- if G .jokers .cards [i ].ability .cry_rigged then
819- G .GAME .probabilities .normal = ggpn
820- end
821763
822764 if o then
823765 if # dbl_info .scaler [info_i ] == 2 then
0 commit comments