@@ -386,7 +386,7 @@ local wee_fib = {
386386 end ,
387387 calculate = function (self , card , context )
388388 if context .cardarea == G .play and context .individual and not context .blueprint then
389- local rank = SMODS . Ranks [ context .other_card . base . value ]. key
389+ local rank = context .other_card : get_id ()
390390 if rank == " Ace" or rank == " 2" or rank == " 3" or rank == " 5" or rank == " 8" then
391391 card .ability .extra .mult = card .ability .extra .mult + card .ability .extra .mult_mod
392392
@@ -795,7 +795,7 @@ local triplet_rhythm = {
795795 if context .joker_main and context .scoring_hand then
796796 local threes = 0
797797 for i = 1 , # context .scoring_hand do
798- if SMODS . Ranks [ context .scoring_hand [i ]. base . value ]. key == " 3 " then
798+ if context .scoring_hand [i ]: get_id () then
799799 threes = threes + 1
800800 end
801801 end
@@ -1047,7 +1047,7 @@ local eternalflame = {
10471047 name = " cry-eternalflame" ,
10481048 key = " eternalflame" ,
10491049 pos = { x = 0 , y = 4 },
1050- config = { extra = { extra = 0.1 , x_mult = 1 } },
1050+ config = { extra = { extra = 0.2 , x_mult = 1 } },
10511051 rarity = 3 ,
10521052 order = 100 ,
10531053 cost = 9 ,
@@ -2732,11 +2732,7 @@ local happy = {
27322732 eternal_compat = false ,
27332733 atlas = " atlastwo" ,
27342734 calculate = function (self , card , context )
2735- if
2736- context .selling_self
2737- and # G .jokers .cards + G .GAME .joker_buffer <= G .jokers .config .card_limit
2738- and not context .retrigger_joker
2739- then
2735+ if context .selling_self and # G .jokers .cards + G .GAME .joker_buffer <= G .jokers .config .card_limit then
27402736 local sellcreatejoker = 1
27412737 G .GAME .joker_buffer = G .GAME .joker_buffer + sellcreatejoker
27422738 G .E_MANAGER :add_event (Event ({
@@ -2766,7 +2762,6 @@ local happy = {
27662762 and not context .individual
27672763 and not context .repetition
27682764 and # G .jokers .cards + G .GAME .joker_buffer < G .jokers .config .card_limit
2769- and not context .retrigger_joker
27702765 then
27712766 local roundcreatejoker = math.min (1 , G .jokers .config .card_limit - (# G .jokers .cards + G .GAME .joker_buffer ))
27722767 G .GAME .joker_buffer = G .GAME .joker_buffer + roundcreatejoker
@@ -6760,7 +6755,7 @@ local exposed = {
67606755 if not context .other_card :is_face () then
67616756 return {
67626757 message = localize (" k_again_ex" ),
6763- repetitions = card .ability .extra ,
6758+ repetitions = math.min ( 40 , card .ability .extra ) ,
67646759 card = card ,
67656760 }
67666761 end
@@ -6807,7 +6802,7 @@ local mask = {
68076802 if context .other_card :is_face () then
68086803 return {
68096804 message = localize (" k_again_ex" ),
6810- repetitions = card .ability .extra ,
6805+ repetitions = math.min ( 40 , card .ability .extra ) ,
68116806 card = card ,
68126807 }
68136808 end
@@ -7277,7 +7272,7 @@ local pity_prize = {
72777272 pos = { x = 5 , y = 5 },
72787273 config = {},
72797274 rarity = 1 ,
7280- cost = 4 ,
7275+ cost = 2 ,
72817276 atlas = " atlastwo" ,
72827277 order = 129 ,
72837278 loc_vars = function (self , info_queue , center )
0 commit comments