diff --git a/assets/1x/jokers.png b/assets/1x/jokers.png index dc1c0cd8..0e70f616 100644 Binary files a/assets/1x/jokers.png and b/assets/1x/jokers.png differ diff --git a/assets/2x/jokers.png b/assets/2x/jokers.png index f5495f61..3ceb9002 100755 Binary files a/assets/2x/jokers.png and b/assets/2x/jokers.png differ diff --git a/items/jokers/misc_jokers.lua b/items/jokers/misc_jokers.lua index e16f17ae..1afc4dfe 100644 --- a/items/jokers/misc_jokers.lua +++ b/items/jokers/misc_jokers.lua @@ -5370,26 +5370,21 @@ local antipattern = { pos = {x = 4, y = 12}, atlas = "jokers", loc_vars = function(self, q, card) + local hands_after_last_played = {} local hands = {} - for i, v in pairs(G.handlist) do - hands[#hands+1] = {} - end - for i, v in pairs(card.ability.hand_pairs) do - hands[v[1]] = hands[v[1]] or {} - hands[v[1]][#hands[v[1]]+1] = v[2] - end - for i, v in pairs(hands) do - local vars = {localize(i, "poker_hands")} - if #v > 0 then - for i, v2 in pairs(v) do - vars[#vars+1] = localize(v2, "poker_hands") - end - for i = #vars, 12 do - vars[#vars+1] = "" - end - q[#q+1] = {set = "Other", key = "antipattern_pair", vars = vars} + for i = 1, 13 do hands_after_last_played[i] = "" end + local last_played = card.ability.last_hand + for _,hand_pair in ipairs(card.ability.hand_pairs) do + -- hand_pair[1] is last-played, hand_pair[2] is currently-played + if hand_pair[1] == last_played then + hands[#hands+1] = localize(hand_pair[2], "poker_hands") end end + for i, v in pairs(hands) do hands_after_last_played[i+1] = v end + if card.ability.last_hand ~= "" then + hands_after_last_played[1] = localize(card.ability.last_hand, "poker_hands") + q[#q+1] = {set = "Other", key = "antipattern_pair", vars = hands_after_last_played} + end return { vars = { card.ability.xchips_mod, @@ -6264,7 +6259,7 @@ local dancer = { end, entr_credits = { idea = {"cassknows"}, - art = {"candycanearter"} + art = {"Lil. Mr. Slipstream"} } } diff --git a/items/misc/blinds.lua b/items/misc/blinds.lua index e10426f7..04a41e64 100644 --- a/items/misc/blinds.lua +++ b/items/misc/blinds.lua @@ -1068,4 +1068,4 @@ return { void, rr } -} \ No newline at end of file +} diff --git a/lib/hooks.lua b/lib/hooks.lua index 775e2abc..d4c9f133 100644 --- a/lib/hooks.lua +++ b/lib/hooks.lua @@ -2182,12 +2182,6 @@ function Tag:init(_tag, for_collection, _blind_type, ...) return ret end -local TrumpCardAllow = { - ["Planet"] = true, - ["Tarot"] = true, - ["Code"] = true -} - G.FUNCS.has_inversion = function(e) if G.GAME.last_inversion and G.GAME.last_inversion.key ~= "c_entr_master" then e.config.colour = mix_colours(G.C.GREEN, G.C.JOKER_GREY, 0.8) @@ -4471,4 +4465,4 @@ function hotpot_horsechicot_market_section_init_cards() end end G.harvest_cost = G.harvest_cost or 0 -end \ No newline at end of file +end diff --git a/lib/utils.lua b/lib/utils.lua index ef7a4b19..22c72ad4 100644 --- a/lib/utils.lua +++ b/lib/utils.lua @@ -2042,6 +2042,12 @@ function Entropy.rubber_ball_scoring(cards) return new_cards end +local TrumpCardAllow = { + ["Planet"] = true, + ["Tarot"] = true, + ["Code"] = true +} + function Entropy.post_create_card(card, from_booster) if G.SETTINGS.paused then return end local set = card.config.center.set @@ -2055,20 +2061,20 @@ function Entropy.post_create_card(card, from_booster) set = c.set elseif card.config and card.config.center and pseudorandom("trump_card") < 0.10 and G.GAME.TrumpCard and G.STATE == G.STATES.SMODS_BOOSTER_OPENED - and TrumpCardAllow[center.set] and (not card.area or not card.area.config.collection) then + and TrumpCardAllow[set] and (not card.area or not card.area.config.collection) then card:set_ability(G.P_CENTERS["c_entr_flipside"]) key = "c_entr_flipside" set = "Spectral" elseif card.config and card.config.center and card.config.center.set == "Booster" and pseudorandom("supersede") < 0.20 and G.GAME.Supersede and G.STATE == G.STATES.SHOP and (not card.area or not card.area.config.collection) then - local type = (center.cost == 6 and "jumbo") or (center.cost == 8 and "mega") or "normal" + local type = (G.P_CENTERS[key].cost == 6 and "jumbo") or (G.P_CENTERS[key].cost == 8 and "mega") or "normal" card:set_ability(G.P_CENTERS["p_entr_twisted_pack_"..type]) key = "p_entr_twisted_pack_"..type set = "Booster" elseif card.config and card.config.center and card.config.center.set == "Booster" and Entropy.DeckOrSleeve("doc") and to_big(pseudorandom("doc")) < to_big(1-(0.995^(G.GAME.entropy/2))) and G.STATE == G.STATES.SHOP and (not card.area or not card.area.config.collection) then - local type = (center.cost == 6 and "jumbo_1") or (center.cost == 8 and "mega_1") or "normal_"..pseudorandom_element({1,2},pseudoseed("doc")) + local type = (G.P_CENTERS[key].cost == 6 and "jumbo_1") or (G.P_CENTERS[key].cost == 8 and "mega_1") or "normal_"..pseudorandom_element({1,2},pseudoseed("doc")) card:set_ability(G.P_CENTERS["p_spectral_"..type]) key = "p_spectral_"..type set = "Booster" @@ -2102,4 +2108,4 @@ function Entropy.post_create_card(card, from_booster) card.ability.glitched_crown = gc end end -end \ No newline at end of file +end diff --git a/localization/en-us.lua b/localization/en-us.lua index 3bfe5b57..d1a20f06 100644 --- a/localization/en-us.lua +++ b/localization/en-us.lua @@ -2605,8 +2605,8 @@ local decs = { c_entr_inferno = { name = "Inferno", text = { - "Destroy {C:attention}all{} Selected Cards", - "lost {C:money}$#1#{} for every card", + "Destroy {C:attention}all{} selected cards", + "Lose {C:money}$#1#{} for every card", "past {C:attention}2{}" } },