Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/1x/jokers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/2x/jokers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 13 additions & 18 deletions items/jokers/misc_jokers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -6264,7 +6259,7 @@ local dancer = {
end,
entr_credits = {
idea = {"cassknows"},
art = {"candycanearter"}
art = {"Lil. Mr. Slipstream"}
}
}

Expand Down
2 changes: 1 addition & 1 deletion items/misc/blinds.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1068,4 +1068,4 @@ return {
void,
rr
}
}
}
8 changes: 1 addition & 7 deletions lib/hooks.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -4471,4 +4465,4 @@ function hotpot_horsechicot_market_section_init_cards()
end
end
G.harvest_cost = G.harvest_cost or 0
end
end
14 changes: 10 additions & 4 deletions lib/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -2102,4 +2108,4 @@ function Entropy.post_create_card(card, from_booster)
card.ability.glitched_crown = gc
end
end
end
end
4 changes: 2 additions & 2 deletions localization/en-us.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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{}"
}
},
Expand Down