Skip to content

Commit c7fce79

Browse files
authored
kitty printer i guess
1 parent e0d4216 commit c7fce79

File tree

5 files changed

+65
-6
lines changed

5 files changed

+65
-6
lines changed

assets/1x/atlasone.png

12 KB
Loading

assets/2x/atlasone.png

63.1 KB
Loading

items/misc_joker.lua

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ local pickle = {
582582
nil,
583583
nil,
584584
{
585-
message = localize({ type = "variable", key = card.ability.extra.tags_mod == 1 and "a_tag_minus" or "a_tags_minus", vars = { card.ability.extra.tags_mod } })[1]
585+
message = localize({ type = "variable", key = card.ability.extra.tags_mod == 1 and "a_tag_minus" or "a_tags_minus", vars = { card.ability.extra.tags_mod } })[1],
586586
colour = G.C.FILTER,
587587
}
588588
)
@@ -6031,6 +6031,40 @@ local astral_bottle = {
60316031
end
60326032
end,
60336033
}
6034+
local kittyprinter = {
6035+
dependencies = {
6036+
items = {
6037+
"tag_cry_cat",
6038+
},
6039+
},
6040+
object_type = "Joker",
6041+
name = "cry-kittyprinter",
6042+
key = "kittyprinter",
6043+
config = { extra = { Xmult = 2 } },
6044+
pos = { x = 2, y = 5 },
6045+
rarity = 2,
6046+
cost = 6,
6047+
atlas = "atlasone",
6048+
order = 129,
6049+
blueprint_compat = true,
6050+
loc_vars = function(self, info_queue, card)
6051+
return { vars = { card.ability.extra.Xmult } }
6052+
end,
6053+
calculate = function(self, card, context)
6054+
if
6055+
context.joker_main
6056+
then
6057+
return {
6058+
message = localize({
6059+
type = "variable",
6060+
key = "a_xmult",
6061+
vars = { card.ability.extra.Xmult },
6062+
}),
6063+
Xmult_mod = card.ability.extra.Xmult,
6064+
}
6065+
end
6066+
end,
6067+
}
60346068
local kidnap = {
60356069
object_type = "Joker",
60366070
name = "cry-kidnap",
@@ -6334,7 +6368,7 @@ local cookie = {
63346368
rarity = 1,
63356369
cost = 4,
63366370
atlas = "atlastwo",
6337-
order = 133,
6371+
order = 129,
63386372
config = {extra = {chips = 150, chip_mod = 1}},
63396373
blueprint_compat = true,
63406374
eternal_compat = false,
@@ -6598,7 +6632,7 @@ local digitalhallucinations = {
65986632
name = "cry-Digital Hallucinations",
65996633
key = "digitalhallucinations",
66006634
pos = { x = 0, y = 7 },
6601-
order = 130,
6635+
order = 129,
66026636
config = { odds = 2 },
66036637
loc_vars = function(self, info_queue, card)
66046638
return { vars = { cry_prob(card.ability.cry_prob, card.ability.odds, card.ability.cry_rigged), card.ability.odds } }
@@ -6714,7 +6748,7 @@ local arsonist = {
67146748
rarity = 3,
67156749
cost = 5,
67166750
atlas = "atlasone",
6717-
order = 131,
6751+
order = 129,
67186752
loc_vars = function(self, info_queue, center)
67196753
return { vars = { } }
67206754
end,
@@ -6747,7 +6781,7 @@ local zooble = {
67476781
rarity = 2,
67486782
cost = 6,
67496783
atlas = "atlasone",
6750-
order = 132,
6784+
order = 129,
67516785
loc_vars = function(self, info_queue, center)
67526786
return { vars = {center.ability.extra.mult,center.ability.extra.a_mult }}
67536787
end,
@@ -6878,6 +6912,7 @@ local miscitems = {
68786912
savvy,
68796913
subtle,
68806914
discreet,
6915+
kittyprinter,
68816916
kidnap,
68826917
exposed,
68836918
mask,

localization/en-us.lua

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,6 +1604,14 @@ return {
16041604
"{C:attention}Type Chips{} Joker is sold",
16051605
},
16061606
},
1607+
j_cry_kittyprinter = {
1608+
name = "Kitty Printer",
1609+
text = {
1610+
"{X:mult,C:white} X#1# {} Mult",
1611+
"All {C:attention}skip{} tags",
1612+
"become {C:attention}Cat Tags{}"
1613+
},
1614+
},
16071615
j_cry_kooky = {
16081616
name = "Kooky Joker",
16091617
text = {

lovely/misc.toml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,15 @@ payload = '''if true then'''
252252
match_indent = true
253253

254254
# Energia - detect blind skips from tag
255+
# kitty printer - add cat tag
255256
[[patches]]
256257
[patches.pattern]
257258
target = "functions/button_callbacks.lua"
258259
pattern = '''add_tag(_tag.config.ref_table)'''
259260
position = "at"
260-
payload = '''add_tag(_tag.config.ref_table, true)'''
261+
payload = '''
262+
add_tag( next(SMODS.find_card('j_cry_kittyprinter')) and Tag('tag_cry_cat') or _tag.config.ref_table, true)
263+
'''
261264
match_indent = true
262265

263266
# Energia - don't add tags from save load
@@ -422,4 +425,17 @@ if (not self.ability.orbital_hand) or (not G.GAME.hands[self.ability.orbital_han
422425
self.ability.orbital_hand = pseudorandom_element(_poker_hands, pseudoseed('orbital'))
423426
end
424427
'''
428+
match_indent = true
429+
430+
# kitty printer 2 (for some reason i can't figure out how to not create another object here)
431+
[[patches]]
432+
[patches.pattern]
433+
target = "functions/UI_definitions.lua"
434+
pattern = "local _tag = Tag(G.GAME.round_resets.blind_tags[blind_choice], nil, blind_choice)"
435+
position = "after"
436+
payload = '''
437+
if next(SMODS.find_card('j_cry_kittyprinter')) then
438+
_tag = Tag('tag_cry_cat', nil, blind_choice)
439+
end
440+
'''
425441
match_indent = true

0 commit comments

Comments
 (0)