Skip to content

Commit 56b3aad

Browse files
HuyTheKillerHuyTheKiller
authored
Merge branch 'MathIsFun0:main' into main
2 parents 5dc5cad + fdd20fa commit 56b3aad

File tree

12 files changed

+891
-128
lines changed

12 files changed

+891
-128
lines changed

‎assets/1x/atlasepic.png‎

-6.55 KB
Loading

‎assets/1x/atlasone.png‎

2.91 KB
Loading

‎assets/2x/atlasepic.png‎

-48.7 KB
Loading

‎assets/2x/atlasone.png‎

2.92 KB
Loading

‎config.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ return {
99
["family_mode"] = false,
1010
["experimental"] = false,
1111
["HTTPS"] = false,
12-
["menu"] = false,
12+
["menu"] = true,
1313
}

‎items/epic.lua‎

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -262,25 +262,7 @@ local sync_catalyst = {
262262
"Math",
263263
},
264264
},
265-
unlocked = false,
266-
check_for_unlock = function(self, args)
267-
if safe_get(G, "jokers") and safe_get(G.GAME, "round_resets", "ante") and G.GAME.round_resets.ante < 9 then
268-
local rarities = {}
269-
for i = 1, #G.jokers.cards do
270-
local card = G.jokers.cards[i]
271-
rarities[card.config.center.rarity .. "_rarity"] = true
272-
end
273-
if rarities["3_rarity"] and rarities["4_rarity"] and rarities["cry_epic_rarity"] then
274-
unlock_card(self)
275-
end
276-
end
277-
if args.type == "cry_lock_all" then
278-
lock_card(self)
279-
end
280-
if args.type == "cry_unlock_all" then
281-
unlock_card(self)
282-
end
283-
end,
265+
unlocked = true,
284266
}
285267

286268
-- Negative Joker
@@ -1881,6 +1863,44 @@ local spectrogram = {
18811863
},
18821864
},
18831865
}
1866+
local jtron = {
1867+
object_type = "Joker",
1868+
name = "cry-jtron",
1869+
key = "jtron",
1870+
config = { extra = { bonus = 1, current = 0 } },
1871+
rarity = "cry_epic",
1872+
cost = 14,
1873+
order = 64,
1874+
blueprint_compat = true,
1875+
atlas = "atlasepic",
1876+
pos = { x = 2, y = 5 },
1877+
loc_vars = function(self, info_queue, center)
1878+
info_queue[#info_queue + 1] = G.P_CENTERS.j_joker
1879+
center.ability.extra.current = 1 + center.ability.extra.bonus * #SMODS.find_card("j_joker")
1880+
return { vars = { center.ability.extra.bonus, center.ability.extra.current } }
1881+
end,
1882+
calculate = function(self, card, context)
1883+
card.ability.extra.current = 1 + card.ability.extra.bonus * #SMODS.find_card("j_joker")
1884+
if context.cardarea == G.jokers and context.joker_main then
1885+
return {
1886+
message = localize({
1887+
type = "variable",
1888+
key = "a_powmult",
1889+
vars = {
1890+
number_format(card.ability.extra.current),
1891+
},
1892+
}),
1893+
Emult_mod = card.ability.extra.current,
1894+
colour = G.C.DARK_EDITION,
1895+
}
1896+
end
1897+
end,
1898+
cry_credits = {
1899+
idea = { "AlexZGreat" },
1900+
art = { "Darren_the_frog" },
1901+
code = { "candycanearter" },
1902+
},
1903+
}
18841904
return {
18851905
name = "Epic Jokers",
18861906
items = {
@@ -1907,5 +1927,6 @@ return {
19071927
soccer,
19081928
fleshpanopticon,
19091929
spectrogram,
1930+
jtron,
19101931
},
19111932
}

‎items/misc_joker.lua‎

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1755,7 +1755,7 @@ local gardenfork = {
17551755
return { vars = { center.ability.extra.money } }
17561756
end,
17571757
calculate = function(self, card, context)
1758-
if context.cardarea == G.jokers and context.before and not context.blueprint then
1758+
if context.cardarea == G.jokers and context.before then
17591759
for i = 1, #context.full_hand do
17601760
if context.scoring_hand[i]:get_id() == 14 then
17611761
for j = 1, #context.full_hand do
@@ -7600,6 +7600,81 @@ local zooble = {
76007600
},
76017601
},
76027602
}
7603+
local lebaron_james = {
7604+
object_type = "Joker",
7605+
dependencies = {
7606+
items = {
7607+
"set_cry_misc_joker",
7608+
},
7609+
},
7610+
name = "cry-LeBaron James",
7611+
key = "lebaron_james",
7612+
pos = { x = 2, y = 5 },
7613+
config = { extra = { h_mod = 1, h_size = 0 } },
7614+
rarity = 3,
7615+
cost = 6,
7616+
atlas = "atlasone",
7617+
order = 133,
7618+
loc_vars = function(self, info_queue, center)
7619+
return { vars = { center.ability.extra.h_mod, center.ability.extra.h_size } }
7620+
end,
7621+
calculate = function(self, card, context)
7622+
if context.cardarea == G.play and context.individual then
7623+
if SMODS.Ranks[context.other_card.base.value].key == "King" then
7624+
G.hand:change_size(math.min(1000 - card.ability.extra.h_size, card.ability.extra.h_mod))
7625+
card.ability.extra.h_size = card.ability.extra.h_size + card.ability.extra.h_mod
7626+
return {
7627+
message = localize({ type = "variable", key = "a_handsize", vars = { card.ability.extra.h_mod } }),
7628+
colour = G.C.FILTER,
7629+
card = card,
7630+
}
7631+
end
7632+
end
7633+
if context.end_of_round and not context.individual and not context.repetition then
7634+
G.hand:change_size(-1 * math.min(1000, card.ability.extra.h_size))
7635+
card.ability.extra.h_size = 0
7636+
return {
7637+
card = card,
7638+
message = localize("k_reset"),
7639+
}
7640+
end
7641+
end,
7642+
remove_from_deck = function(self, card, from_debuff)
7643+
G.hand:change_size(-1 * math.min(1000, card.ability.extra.h_size))
7644+
end,
7645+
cry_credits = {
7646+
idea = {
7647+
"indefenite_idiot",
7648+
"HexaCryonic",
7649+
},
7650+
code = {
7651+
"AlexZGreat",
7652+
},
7653+
art = {
7654+
"lamborghiniofficial",
7655+
},
7656+
},
7657+
init = function(self)
7658+
-- Calculate enhancements for kings as if held in hand
7659+
-- Note that for enhancements that work when played and held in hand, this will fail
7660+
-- Not tested since no enhancements use this yet (Steel is weird, and Gold won't work)
7661+
local cce = Card.calculate_enhancement
7662+
function Card:calculate_enhancement(context)
7663+
local ret = cce(self, context)
7664+
if
7665+
not ret
7666+
and next(SMODS.find_card("j_cry_lebaron_james"))
7667+
and SMODS.Ranks[self.base.value].key == "King"
7668+
and context.cardarea == G.play
7669+
then
7670+
context.cardarea = G.hand
7671+
local ret = cce(self, context)
7672+
context.cardarea = G.play
7673+
end
7674+
return ret
7675+
end
7676+
end,
7677+
}
76037678
local miscitems = {
76047679
jimball_sprite,
76057680
dropshot,
@@ -7710,6 +7785,7 @@ local miscitems = {
77107785
fuckedup,
77117786
foolhardy,
77127787
translucent,
7788+
lebaron_james,
77137789
}
77147790
return {
77157791
name = "Misc. Jokers",

‎localization/de.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3890,9 +3890,9 @@ return {
38903890
{ "VERSUCHST SPÄTER NOCHMAL", "HINWEIS: DU WIRST NICHT", "GENUG GELD HABEN" },
38913891
{ "HÄ?", '"GUTSCHEINE"?', "DAS IST NICHTMAL EIN WORT..." },
38923892
{ 'HALTE "R"', "UM ALLE GUTSCHEINE", "NACHZUFÜLLEN" },
3893-
{ "WÜSSTEST DU?", "ALT+F4 DRÜCKEN", "GIBT KOSTENLOSE GUTSCHEINE!" },
3893+
{ "WUSSTEST DU?", "ALT+F4 DRÜCKEN", "GIBT KOSTENLOSE GUTSCHEINE!" },
38943894
{ "TUHT MIR LEID,", "ES GIBT KEINE GUTSCHEINE", "WEGEN BUDGETVERKÜRZUNGEN" },
3895-
{ "RUFE 1-600-JIMBO AN", "UM DEINE ERFAHRUNG MIR", "GUTSCHEINEN ZU BEWERTEN" },
3895+
{ "RUFE 1-600-JIMBO AN", "UM DEINE ERFAHRUNG MIT", "GUTSCHEINEN ZU BEWERTEN" },
38963896
{ "BESIEGE", "ANTE 39 BOSS BLIND", "ZUM NACHFÜLLEN" },
38973897
{ "ZAUBERTRICK", "ICH HABE DIESEN GUTSCHEIN", "VERSCHWINDEN LASSEN" },
38983898
{ "WARUM IST EIN", "GUTSCHEIN WIE EIN", "SCHREIBTISCH?" },
@@ -3913,11 +3913,11 @@ return {
39133913
{ "ES GIBT KEINEN", "WEINACHTSMANN", "UND AUCH KEINE GUTSCHEINE" },
39143914
{ "", "GUTNEIN", "" },
39153915
{ "DU", "HAST GERADE", "DAS SPIEL VERLOREN" },
3916-
{ "CAN ICH DIR IN DIESEN", "IN DIESEN SCHWEREN ZEITEN", "EIN SCHÖNES EI ANBIETEN?" },
3917-
{ "BERÜHRE ETWAS GRASS", "ANSTATT DIESES", "DECK ZU BENUZEN" },
3916+
{ "KANN ICH DIR IN DIESEN", "IN DIESEN SCHWEREN ZEITEN", "EIN SCHÖNES EI ANBIETEN?" },
3917+
{ "BERÜHRE ETWAS GRASS", "ANSTATT DIESES", "DECK ZU BENUTZEN" },
39183918
{ "DU KÖNNTEST JETZT", "GERADE MIT DEM BLAUEN", "DECK SPEILEN" },
39193919
{ "KOSTENLOSE EXOTISCHE JOKER", "HOHLE SIE BEVOR", "ES ZU SPÄT IST (ausverkauft)" },
3920-
{ "DU KANNST BEWEISEN, DASS", "ICH FALSCH LIEGE INDEM", "DU DEN UNSICHBAREN GUTSCHEIN KAUFST" },
3920+
{ "DU KANNST BEWEISEN, DASS", "ICH FALSCH LIEGE INDEM", "DU DEN UNSICHTBAREN GUTSCHEIN KAUFST" },
39213921
{ "", "keine gutscheine?", "" },
39223922
{
39233923
"siehst du diese werbung?",

‎localization/en-us.lua‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,6 +1600,14 @@ return {
16001600
"{C:inactive,s:0.8}Seems legit...{}",
16011601
},
16021602
},
1603+
j_cry_jtron = {
1604+
name = "Jimbo-tron 9000",
1605+
text = {
1606+
"This Joker gains {X:dark_edition,C:white} ^#1# {} Mult",
1607+
"for each default {C:attention}Joker{}",
1608+
"{C:inactive}(Currently {X:dark_edition,C:white}^#2#{C:inactive} Mult)",
1609+
},
1610+
},
16031611
j_cry_kidnap = {
16041612
name = "Kidnapping",
16051613
text = {
@@ -1640,6 +1648,15 @@ return {
16401648
"{C:attention}Jokers",
16411649
},
16421650
},
1651+
j_cry_lebaron_james = {
1652+
name = "LeBaron James",
1653+
text = {
1654+
"Played and scoring {C:attention}Kings{} give",
1655+
"{C:attention}+#1#{} hand size for the round",
1656+
"and trigger {C:attention}held in hand{} effects",
1657+
"{C:inactive}(Currently {C:attention}+#2#{C:inactive} hand size)",
1658+
},
1659+
},
16431660
j_cry_lightupthenight = {
16441661
name = "Light Up the Night",
16451662
text = {

0 commit comments

Comments
 (0)