Skip to content

Commit 2b059a4

Browse files
Better Lebaron
-Swapped to Card:get_id -Changed Lebaron to increase G.GAME.round_resets.temp_handsize instead of card.ability.h_size which already handles removing temp handsize at end of round (less jank?) -Removed card.ability.h_size since it's not needed anymore (WILL BREAK OLD RUNS)
1 parent ce3278e commit 2b059a4

File tree

5 files changed

+9
-26
lines changed

5 files changed

+9
-26
lines changed

items/misc_joker.lua

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7657,42 +7657,31 @@ local lebaron_james = {
76577657
pools = { ["Meme"] = true },
76587658
key = "lebaron_james",
76597659
pos = { x = 2, y = 5 },
7660-
config = { extra = { h_mod = 1, h_size = 0 } },
7660+
config = { extra = { h_mod = 1 } },
76617661
rarity = 3,
76627662
cost = 6,
76637663
atlas = "atlasone",
76647664
order = 133,
76657665
no_dbl = true,
76667666
immutable = true, -- has issues with value manip and not easy to fix
76677667
loc_vars = function(self, info_queue, center)
7668-
return { vars = { center.ability.extra.h_mod, math.min(1000, center.ability.extra.h_size) } }
7668+
return { vars = { center.ability.extra.h_mod } }
76697669
end,
76707670
calculate = function(self, card, context)
76717671
if context.cardarea == G.play and context.individual then
7672-
if SMODS.Ranks[context.other_card.base.value].key == "King" then
7672+
if context.other_card:get_id() == 13 then
76737673
local h_size = math.max(0, math.min(1000 - card.ability.extra.h_size, card.ability.extra.h_mod))
7674-
G.hand:change_size(h_size)
7675-
card.ability.extra.h_size = card.ability.extra.h_size + h_size
7676-
if h_size > 0 then
7674+
G.hand:change_size(math.floor(h_size))
7675+
G.GAME.round_resets.temp_handsize = (G.GAME.round_resets.temp_handsize or 0) + math.floor(h_size)
7676+
if math.floor(h_size) > 0 then
76777677
return {
7678-
message = localize({ type = "variable", key = "a_handsize", vars = { h_size } }),
7678+
message = localize({ type = "variable", key = "a_handsize", vars = { math.floor(h_size) } }),
76797679
colour = G.C.FILTER,
76807680
card = card,
76817681
}
76827682
end
76837683
end
76847684
end
7685-
if context.end_of_round and not context.individual and not context.repetition then
7686-
G.hand:change_size(-1 * math.min(1000, card.ability.extra.h_size))
7687-
card.ability.extra.h_size = 0
7688-
return {
7689-
card = card,
7690-
message = localize("k_reset"),
7691-
}
7692-
end
7693-
end,
7694-
remove_from_deck = function(self, card, from_debuff)
7695-
G.hand:change_size(-1 * math.min(1000, card.ability.extra.h_size))
76967685
end,
76977686
cry_credits = {
76987687
idea = {

localization/de.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1302,7 +1302,6 @@ return {
13021302
"Gespeilte und gewertete {C:attention}Könige{} geben",
13031303
"{C:attention}+#1#{} Handgröße für diese Runde",
13041304
"und lösen {C:attention}in der Hand{} Effekte aus",
1305-
"{C:inactive}(Momentan {C:attention}+#2#{C:inactive} Handgröße)",
13061305
},
13071306
},
13081307
j_cry_lightupthenight = {

localization/en-us.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1677,7 +1677,6 @@ return {
16771677
"Played and scoring {C:attention}Kings{} give",
16781678
"{C:attention}+#1#{} hand size for the round",
16791679
"and trigger {C:attention}held in hand{} effects",
1680-
"{C:inactive}(Currently {C:attention}+#2#{C:inactive} hand size)",
16811680
},
16821681
},
16831682
j_cry_lightupthenight = {

localization/fr.lua

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
--[[
22
Progress:
33
4-
Decks: Almost [ChatSigna]
5-
Beta Deck TODO
6-
Note from Jevonn: Enchanced decks are planned to have their localization done differently, don't worry about these for now
4+
Decks: Yes [ChatSigna]
75
Jokers: Yes [HastagGuigui]
86
Code Cards: Yes [ChatSigna]
97
Deck Sleeves (requires Decksleeves Mod): Yes [HastagGuigui]
@@ -14,7 +12,7 @@ Planets: Yes [HastagGuigui]
1412
Dictonary: Yes [HastagGuigui]
1513
Editions: Yes [HastagGuigui]
1614
Vouchers: Yes [HastagGuigui]
17-
Enhancements (aka echo card): Yes [HastagGuigui]
15+
Enhancements: Yes [HastagGuigui]
1816
Tags: Yes [HastagGuigui]
1917
Other (packs, stickers, etc): Yes [HastagGuigui]
2018
Misc: Yes [HastagGuigui]
@@ -1634,7 +1632,6 @@ return {
16341632
"Les {C:attention}Rois{} comptés donnent",
16351633
"{C:attention}+#1#{} à la taille de la main cette manche",
16361634
"et redéclenchent les effets des cartes {C:attention}tenues en main{}",
1637-
"{C:inactive}(Actuellement {C:attention}+#2#{C:inactive} taille de main)",
16381635
},
16391636
},
16401637
j_cry_lightupthenight = {

localization/vi.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1653,7 +1653,6 @@ return {
16531653
"Lá {C:attention}Già{} đã chơi ghi điểm thêm",
16541654
"{C:attention}+#1#{} lá giữ trong tay cho ván này",
16551655
"và kích hoạt hiệu ứng {C:attention}giữ trong tay{}",
1656-
"{C:inactive}(Hiện tại là {C:attention}+#2#{C:inactive} lá giữ trong tay)",
16571656
},
16581657
},
16591658
j_cry_lightupthenight = {

0 commit comments

Comments
 (0)