Skip to content

Commit 663f5f0

Browse files
committed
How do i fix my stupidity
1 parent f288c3a commit 663f5f0

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

lib/hooks.lua

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2182,12 +2182,6 @@ function Tag:init(_tag, for_collection, _blind_type, ...)
21822182
return ret
21832183
end
21842184

2185-
local TrumpCardAllow = {
2186-
["Planet"] = true,
2187-
["Tarot"] = true,
2188-
["Code"] = true
2189-
}
2190-
21912185
G.FUNCS.has_inversion = function(e)
21922186
if G.GAME.last_inversion and G.GAME.last_inversion.key ~= "c_entr_master" then
21932187
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()
44714465
end
44724466
end
44734467
G.harvest_cost = G.harvest_cost or 0
4474-
end
4468+
end

lib/utils.lua

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2042,6 +2042,12 @@ function Entropy.rubber_ball_scoring(cards)
20422042
return new_cards
20432043
end
20442044

2045+
local TrumpCardAllow = {
2046+
["Planet"] = true,
2047+
["Tarot"] = true,
2048+
["Code"] = true
2049+
}
2050+
20452051
function Entropy.post_create_card(card, from_booster)
20462052
if G.SETTINGS.paused then return end
20472053
local set = card.config.center.set
@@ -2055,20 +2061,20 @@ function Entropy.post_create_card(card, from_booster)
20552061
set = c.set
20562062
elseif card.config and card.config.center
20572063
and pseudorandom("trump_card") < 0.10 and G.GAME.TrumpCard and G.STATE == G.STATES.SMODS_BOOSTER_OPENED
2058-
and TrumpCardAllow[center.set] and (not card.area or not card.area.config.collection) then
2064+
and TrumpCardAllow[set] and (not card.area or not card.area.config.collection) then
20592065
card:set_ability(G.P_CENTERS["c_entr_flipside"])
20602066
key = "c_entr_flipside"
20612067
set = "Spectral"
20622068
elseif card.config and card.config.center and card.config.center.set == "Booster"
20632069
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
2064-
local type = (center.cost == 6 and "jumbo") or (center.cost == 8 and "mega") or "normal"
2070+
local type = (G.P_CENTERS[key].cost == 6 and "jumbo") or (G.P_CENTERS[key].cost == 8 and "mega") or "normal"
20652071
card:set_ability(G.P_CENTERS["p_entr_twisted_pack_"..type])
20662072

20672073
key = "p_entr_twisted_pack_"..type
20682074
set = "Booster"
20692075
elseif card.config and card.config.center and card.config.center.set == "Booster" and Entropy.DeckOrSleeve("doc")
20702076
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
2071-
local type = (center.cost == 6 and "jumbo_1") or (center.cost == 8 and "mega_1") or "normal_"..pseudorandom_element({1,2},pseudoseed("doc"))
2077+
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"))
20722078
card:set_ability(G.P_CENTERS["p_spectral_"..type])
20732079
key = "p_spectral_"..type
20742080
set = "Booster"
@@ -2102,4 +2108,4 @@ function Entropy.post_create_card(card, from_booster)
21022108
card.ability.glitched_crown = gc
21032109
end
21042110
end
2105-
end
2111+
end

0 commit comments

Comments
 (0)