@@ -923,9 +923,13 @@ function force_calculate(card)
923923 end
924924 context .forced = true
925925 temp = {}
926- if trig then trig (true , temp , card ) end
926+ if trig then
927+ trig (true , temp , card )
928+ end
927929 local eval , post = eval_card (card , context )
928- if trig then trig (false , temp , card ) end
930+ if trig then
931+ trig (false , temp , card )
932+ end
929933 local effects = { eval }
930934 SMODS .trigger_effects (effects , card )
931935 return eval and true or post
@@ -948,7 +952,7 @@ function __individual_play(t)
948952end
949953
950954function __setting_blind (t )
951- return __context (t , { setting_blind = true })
955+ return __context (t , { setting_blind = true })
952956end
953957
954958function __poker_hand (t )
@@ -965,57 +969,82 @@ __any_suit = { other_card = {
965969Cryptid .force_contexts = {
966970 -- Vanilla Jokers (collection order)
967971 -- Page 1
968- j_joker = {__joker_main },
969- j_greedy_joker = {__individual_play , __any_suit },
970- j_lusty_joker = {__individual_play , __any_suit },
971- j_wrathful_joker = {__individual_play , __any_suit },
972- j_gluttenous_joker = {__individual_play , __any_suit },
973- j_jolly = {__joker_main , __poker_hand (" Pair" )},
974- j_zany = {__joker_main , __poker_hand (" Three of a Kind" )},
975- j_mad = {__joker_main , __poker_hand (" Two Pair" )},
976- j_crazy = {__joker_main , __poker_hand (" Straight" )},
977- j_droll = {__joker_main , __poker_hand (" Flush" )},
978- j_sly = {__joker_main , __poker_hand (" Pair" )},
979- j_wily = {__joker_main , __poker_hand (" Three of a Kind" )},
980- j_clever = {__joker_main , __poker_hand (" Two Pair" )},
981- j_devious = {__joker_main , __poker_hand (" Straight" )},
982- j_crafty = {__joker_main , __poker_hand (" Flush" )},
972+ j_joker = { __joker_main },
973+ j_greedy_joker = { __individual_play , __any_suit },
974+ j_lusty_joker = { __individual_play , __any_suit },
975+ j_wrathful_joker = { __individual_play , __any_suit },
976+ j_gluttenous_joker = { __individual_play , __any_suit },
977+ j_jolly = { __joker_main , __poker_hand (" Pair" ) },
978+ j_zany = { __joker_main , __poker_hand (" Three of a Kind" ) },
979+ j_mad = { __joker_main , __poker_hand (" Two Pair" ) },
980+ j_crazy = { __joker_main , __poker_hand (" Straight" ) },
981+ j_droll = { __joker_main , __poker_hand (" Flush" ) },
982+ j_sly = { __joker_main , __poker_hand (" Pair" ) },
983+ j_wily = { __joker_main , __poker_hand (" Three of a Kind" ) },
984+ j_clever = { __joker_main , __poker_hand (" Two Pair" ) },
985+ j_devious = { __joker_main , __poker_hand (" Straight" ) },
986+ j_crafty = { __joker_main , __poker_hand (" Flush" ) },
983987 -- Page 2
984- j_half = {__joker_main , { full_hand = {} }},
985- j_stencil = {__joker_main },
988+ j_half = { __joker_main , { full_hand = {} } },
989+ j_stencil = { __joker_main },
986990 -- Four Fingers, Mime, Credit Card
987- j_ceremonial = {__setting_blind }, -- TODO: also trigger mult, acts janky with multiple triggers
988- j_banner = {__joker_main },
989- j_mystic_summit = {__joker_main , nil , function (trigger , memory )
990- if trigger then
991- memory .discards = G .GAME .current_round .discards_left
992- G .GAME .current_round .discards_left = 0
993- else
994- G .GAME .current_round .discards_left = memory .discards
995- end end
991+ j_ceremonial = { __setting_blind }, -- TODO: also trigger mult, acts janky with multiple triggers
992+ j_banner = { __joker_main },
993+ j_mystic_summit = {
994+ __joker_main ,
995+ nil ,
996+ function (trigger , memory )
997+ if trigger then
998+ memory .discards = G .GAME .current_round .discards_left
999+ G .GAME .current_round .discards_left = 0
1000+ else
1001+ G .GAME .current_round .discards_left = memory .discards
1002+ end
1003+ end ,
9961004 },
997- j_marble = {__context , nil , function (trigger , memory , _card ) -- Doesn't play nicely, redoing from scratch
998- if trigger then
999- local front = pseudorandom_element (G .P_CARDS , pseudoseed (' marb_fr' ))
1000- G .playing_card = (G .playing_card and G .playing_card + 1 ) or 1
1001- local card = Card (G .discard .T .x + G .discard .T .w / 2 , G .discard .T .y , G .CARD_W , G .CARD_H , front , G .P_CENTERS .m_stone , {playing_card = G .playing_card })
1002- G .E_MANAGER :add_event (Event ({
1003- func = function ()
1004- card :start_materialize ({G .C .SECONDARY_SET .Enhanced })
1005- G .deck :emplace (card )
1006- table.insert (G .playing_cards , card )
1007- return true
1008- end }))
1009- card_eval_status_text (_card , ' extra' , nil , nil , nil , {message = localize (' k_plus_stone' ), colour = G .C .SECONDARY_SET .Enhanced })
1010-
1011- G .E_MANAGER :add_event (Event ({
1012- func = function ()
1013- G .deck .config .card_limit = G .deck .config .card_limit + 1
1014- return true
1015- end }))
1016-
1017- playing_card_joker_effects ({card })
1018- end end
1005+ j_marble = {
1006+ __context ,
1007+ nil ,
1008+ function (trigger , memory , _card ) -- Doesn't play nicely, redoing from scratch
1009+ if trigger then
1010+ local front = pseudorandom_element (G .P_CARDS , pseudoseed (" marb_fr" ))
1011+ G .playing_card = (G .playing_card and G .playing_card + 1 ) or 1
1012+ local card = Card (
1013+ G .discard .T .x + G .discard .T .w / 2 ,
1014+ G .discard .T .y ,
1015+ G .CARD_W ,
1016+ G .CARD_H ,
1017+ front ,
1018+ G .P_CENTERS .m_stone ,
1019+ { playing_card = G .playing_card }
1020+ )
1021+ G .E_MANAGER :add_event (Event ({
1022+ func = function ()
1023+ card :start_materialize ({ G .C .SECONDARY_SET .Enhanced })
1024+ G .deck :emplace (card )
1025+ table.insert (G .playing_cards , card )
1026+ return true
1027+ end ,
1028+ }))
1029+ card_eval_status_text (
1030+ _card ,
1031+ " extra" ,
1032+ nil ,
1033+ nil ,
1034+ nil ,
1035+ { message = localize (" k_plus_stone" ), colour = G .C .SECONDARY_SET .Enhanced }
1036+ )
1037+
1038+ G .E_MANAGER :add_event (Event ({
1039+ func = function ()
1040+ G .deck .config .card_limit = G .deck .config .card_limit + 1
1041+ return true
1042+ end ,
1043+ }))
1044+
1045+ playing_card_joker_effects ({ card })
1046+ end
1047+ end ,
10191048 },
10201049 -- Cryptid Jokers (alphabetical order probably?)
10211050 j_cry_demicolon = { __joker_main },
0 commit comments