Improve We

This commit is contained in:
Emik 2025-04-18 23:03:27 +02:00
parent cf014cb9b7
commit 151023da0e
Signed by: emik
GPG key ID: 09CDFF9E5703688D
2 changed files with 12 additions and 16 deletions

View file

@ -17,5 +17,5 @@
"conflicts": [ "conflicts": [
"Jen" "Jen"
], ],
"version": "1.4.0" "version": "1.4.1"
} }

View file

@ -592,7 +592,7 @@ local function two(x)
for k, v in pairs(x) do for k, v in pairs(x) do
if type(v) == "number" then if type(v) == "number" then
x[k] = 2 x[k] = x[k] == 0 and 0 or 2
elseif type(v) == "table" then elseif type(v) == "table" then
two(v) two(v)
end end
@ -625,7 +625,6 @@ back {
p.hands = 2 p.hands = 2
p.dollars = 2 p.dollars = 2
p.discards = 2 p.discards = 2
p.hand_size = 2
G.GAME.skips = 2 G.GAME.skips = 2
p.joker_slots = 2 p.joker_slots = 2
p.reroll_cost = 2 p.reroll_cost = 2
@ -633,8 +632,6 @@ back {
p.boosters_in_shop = 2 p.boosters_in_shop = 2
p.consumable_slots = 2 p.consumable_slots = 2
p.vouchers_in_shop = 2 p.vouchers_in_shop = 2
G.GAME.round_resets.temp_handsize = 2
G.GAME.weeckweeck = true
for _, v in pairs(G.GAME.hands) do for _, v in pairs(G.GAME.hands) do
v.mult = 2 v.mult = 2
@ -648,16 +645,10 @@ back {
apply_weeck() apply_weeck()
end, end,
alt_calculate = function(_) alt_calculate = function(_)
for _, v in pairs(G.hand.cards) do if not G.GAME.we then
two(v.ability) G.GAME.we = true
end G.hand.config.highlighted_limit = 2
G.hand:change_size(2 - G.hand.config.card_limit)
for _, v in pairs(G.jokers.cards) do
two(v.ability)
end
for _, v in pairs(G.consumeables.cards) do
two(v.ability)
end end
end, end,
} }
@ -911,7 +902,8 @@ function CardArea:emplace(card, location, stay_flipped)
G.deck and G.deck and
G.consumeables and G.consumeables and
(self == G.jokers or self == G.hand or self == G.deck or self == G.consumeables) and (self == G.jokers or self == G.hand or self == G.deck or self == G.consumeables) and
G.GAME.mysterious and card.ability and not G.GAME.mysterious and
card.ability and not
card.ability.mysterious_created and not card.ability.mysterious_created and not
card.created_from_split then card.created_from_split then
card.ability.mysterious_created = true card.ability.mysterious_created = true
@ -990,5 +982,9 @@ function CardArea:emplace(card, location, stay_flipped)
end) end)
else else
orig_emplace(self, card, location, stay_flipped) orig_emplace(self, card, location, stay_flipped)
if G.GAME.we then
two(card.ability)
end
end end
end end