From 767916e3c3df7aa2b7eea07a6321574c940b12ab Mon Sep 17 00:00:00 2001 From: Emik Date: Sun, 26 Jul 2026 22:24:05 +0200 Subject: [PATCH] Buff Polygloss, remove Peppino, rework 7 GRAND DAD --- assets/1x/default/j_jane_peppino.png | Bin 3178 -> 0 bytes assets/2x/default/j_jane_peppino.png | Bin 4325 -> 0 bytes manifest.json | 2 +- src/edition.lua | 8 +- src/joker.lua | 192 ++++++++------------------- src/main.lua | 2 +- 6 files changed, 58 insertions(+), 146 deletions(-) delete mode 100644 assets/1x/default/j_jane_peppino.png delete mode 100644 assets/2x/default/j_jane_peppino.png diff --git a/assets/1x/default/j_jane_peppino.png b/assets/1x/default/j_jane_peppino.png deleted file mode 100644 index 4085c583fca83c1fcc9b8743387e8ec8e8705a5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3178 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 b8DdIRuGa97OOyY56M%)OjY)-(XYBs~%+Q}G diff --git a/assets/2x/default/j_jane_peppino.png b/assets/2x/default/j_jane_peppino.png deleted file mode 100644 index 91c2beb40c2911a2d7a5db0c5ceca6097140b65c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4325 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 TTF1Nr008uK5I0M-9U}e@NMWs+ diff --git a/manifest.json b/manifest.json index 486ce99..9e0a40d 100644 --- a/manifest.json +++ b/manifest.json @@ -18,5 +18,5 @@ "conflicts": [ "Jen" ], - "version": "1.11.12" + "version": "1.11.13" } \ No newline at end of file diff --git a/src/edition.lua b/src/edition.lua index 6d6658e..6bee36b 100644 --- a/src/edition.lua +++ b/src/edition.lua @@ -15,7 +15,7 @@ SMODS.Edition({ label = "Polygloss", text = Jane.cry and { "{C:chips}+#1#{} Chips", - "{C:mult}+#2#{}, {X:mult,C:white}X#3#{}, & {X:mult,C:dark_edition}^#4#{} Mult", + "{C:mult}+#2#{}, {X:mult,C:white}X#3#{}, & {X:dark_edition,C:white}^#4#{} Mult", "{C:money}$#5# {}when scored", } or { "{C:chips}+#1#{} Chips", @@ -25,7 +25,7 @@ SMODS.Edition({ }, config = { mult = 2, - chips = 12, + chips = 22, x_mult = 1.2, p_dollars = 1, e_mult = Jane.cry and 1.02 or nil, @@ -200,8 +200,8 @@ SMODS.Edition({ name = "Moire", label = "Moire", text = { - "{X:chips,C:dark_edition}^#1#{C:chips} Chips", - "{X:mult,C:dark_edition}^#2#{C:mult} Mult", + "{X:dark_edition,C:white}^#1#{} Chips", + "{X:dark_edition,C:white}^#2#{} Mult", }, }, config = {e_chips = 0.8, e_mult = 1.2}, diff --git a/src/joker.lua b/src/joker.lua index f4d1aa8..2377ef2 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -1,4 +1,4 @@ -for _, v in pairs({"7granddad", "betmma", "escapey", "honey", "oxy", "maxie", Jane.cry and "peppino" or nil}) do +for _, v in pairs({"7granddad", "betmma", "escapey", "honey", "oxy", "maxie"}) do SMODS.Atlas { px = 71, py = 95, @@ -15,63 +15,12 @@ SMODS.Sound({key = "corrupt_milestone", path = "corrupt_milestone.ogg"}) SMODS.Sound({key = "corrupt_untick", path = "corrupt_untick.ogg"}) SMODS.Sound({key = "corrupt_tick", path = "corrupt_tick.ogg"}) -local exotic = Jane.cry and "cry_exotic" or 4 - -local food = { - "j_gros_michel", - "j_egg", - "j_ice_cream", - "j_cavendish", - "j_turtle_bean", - "j_diet_cola", - "j_popcorn", - "j_ramen", - "j_selzer", - "j_cry_pickle", - "j_cry_chili_pepper", - "j_cry_oldcandy", - "j_cry_caramel", - "j_cry_foodm", - "j_cry_cotton_candy", - "j_cry_wrapped", - "j_cry_candy_cane", - "j_cry_candy_buttons", - "j_cry_jawbreaker", - "j_cry_mellowcreme", - "j_cry_brittle", -} - -local granddad_palette = { - HEX("155fd9"), - HEX("ff8170"), - HEX("ffffff"), - HEX("6c0700"), -} +local granddad_palette = {HEX("155fd9"), HEX("ff8170"), HEX("ffffff"), HEX("6c0700")} local function destructible(card) return card.ability.consumeable and not card.highlighted and not (card.ability or {}).eternal end -local function food_jokers_count() - if not G.jokers or not next(G.jokers.cards) then - return 0 - end - - local amount = 0 - - if G.jokers.cards[1] and G.jokers.cards[1].has_attribute then - for _, v in pairs(G.jokers.cards) do - amount = amount + (v:has_attribute "food" and 1 or 0) - end - else - for _, v in pairs(food) do - amount = amount + #SMODS.find_card(v) - end - end - - return amount -end - local function grand_dad(card) if ((Talisman or {}).config_file or {}).disable_anims then return @@ -535,7 +484,7 @@ SMODS.Joker { name = "Oxy{C:dark_edition}#1#", text = { "{C:attention}Scored steel {}cards", - "give {X:mult,C:white}X#2#{} {C:mult}Mult", + "give {X:mult,C:white}X#2#{} {}Mult", "{C:dark_edition,E:1}#3#{}#4#{C:red}#5#{C:attention}#6#", "{C:dark_edition,E:1}#7#{}#8#", "#9#{C:dark_edition,E:1}#10#", @@ -646,7 +595,7 @@ if Cryptid and Cryptid.aliases then end local operator = Jane.cry and "^" or "X" -local operator_prefix = Jane.cry and "{X:dark_edition,C:mult}" or "{X:mult,C:white}" +local operator_prefix = Jane.cry and "{X:dark_edition,C:white}" or "{X:mult,C:white}" SMODS.Joker { key = "betmma", @@ -654,7 +603,7 @@ SMODS.Joker { loc_txt = { name = "Betmma", text = { - operator_prefix .. "+" .. operator .. "#1#{C:mult} Mult{} for every", + operator_prefix .. "+" .. operator .. "#1#{} Mult for every", "{C:attention}" .. (Jane.cry and "Unique " or "") .. "Voucher{} redeemed", "{C:inactive}(Currently " .. operator_prefix .. operator .. "#2#{C:inactive})", }, @@ -681,17 +630,12 @@ SMODS.Joker { return { card = card, colour = Jane.cry and G.C.jane_RGB or nil, - message = Jane.cry and (operator .. number_format(num)) or nil, - [Jane.cry and "e_mult" or "x_mult"] = num, + [Jane.cry and "emult" or "xmult"] = num, }, true end end, } -if not Jane.cry then - return -end - SMODS.Joker { key = "7granddad", loc_txt = { @@ -701,16 +645,13 @@ SMODS.Joker { "{C:jane_RGB,E:1}reaction {}to scored {C:attention}7{}s", }, }, - config = {}, + config = {extra = {}}, pos = {x = 0, y = 0}, soul_pos = {x = 1, y = 0}, atlas = "jane7granddad", blueprint_compat = true, - cost = Jane.cry and 49 or 7, - rarity = Jane.cry and exotic or 3, - loc_vars = function(_, _, center) - return {vars = {center.ability.shopslots}} - end, + cost = 7, + rarity = 3, add_to_deck = function(_, card, _) grand_dad(card) end, @@ -718,81 +659,52 @@ SMODS.Joker { grand_dad(card) end, calculate = function(_, card, context) - if context.cardarea == G.play then - local function scj(c) - return c.cardarea and c.cardarea == G.play and not c.before and not c.after and not c.repetition - end - - if context.other_card and context.other_card:get_id() == 7 and scj(context) then - grand_dad(card) - local palette = granddad_palette[math.random(#granddad_palette)] - local rnd = pseudorandom(pseudoseed("granddad"), 1, Jane.cry and 5 or 4) - - if rnd == 1 then - return { - message = Jane.cry and "+777" or "+77", - chips = Jane.cry and 777 or 77, - colour = palette, - card = card, - }, true - elseif rnd == 2 then - return { - message = Jane.cry and "+777 Mult" or "+77 Mult", - mult = Jane.cry and 777 or 77, - colour = palette, - card = card, - }, true - elseif rnd == 3 then - return { - message = "+$7", - dollars = 7, - colour = palette, - card = card, - }, true - elseif rnd == 4 then - return { - message = Jane.cry and "X7 Mult" or "X1.77 Mult", - x_mult = Jane.cry and 7 or 1.77, - colour = palette, - card = card, - }, true - else - return { - message = "^1.77 Mult", - e_mult = 1.77, - colour = palette, - card = card, - }, true - end - end + if context.cardarea ~= G.play or + not context.individual or + not context.other_card or + context.other_card:get_id() ~= 7 then + return end - end, -} -SMODS.Joker { - key = "peppino", - atlas = "janepeppino", - loc_txt = { - name = "Peppino Spaghetti", - text = { - operator_prefix .. operator .. "2{C:mult} Mult{} per {C:attention}Food Joker", - "{C:inactive}(Currently " .. operator_prefix .. operator .. "#1#{C:mult} Mult{C:inactive})", - }, - }, - pos = {x = 0, y = 0}, - soul_pos = {x = 1, y = 0}, - config = {extra = {base = 2}}, - cost = Jane.cry and 20 or 8, - rarity = Jane.cry and 4 or 3, - blueprint_compat = true, - loc_vars = function(_, _, card) - return {vars = {card.ability.extra.base ^ food_jokers_count()}} - end, - calculate = function(_, card, context) - local count = food_jokers_count() + local palette = granddad_palette[math.random(#granddad_palette)] + local cycle = ((card.ability.extra.cycle or -1) + 1) % 5 + cycle = cycle == 2 and not Jane.cry and 3 or cycle + card.ability.extra.cycle = cycle - if context.joker_main and count > 0 then - return {[Jane.cry and "e_mult" or "x_mult"] = card.ability.extra.base ^ count} + if cycle == (Jane.cry and 2 or 3) then + grand_dad(card) + end + + if cycle == 0 then + return { + chips = 177, + colour = palette, + card = card, + }, true + elseif cycle == 1 then + return { + dollars = 7, + colour = palette, + card = card, + }, true + elseif cycle == 2 then + return { + emult = 1.17, + colour = palette, + card = card, + }, true + elseif cycle == 3 then + return { + xmult = 1.77, + colour = palette, + card = card, + }, true + elseif cycle == 4 then + return { + mult = 77, + colour = palette, + card = card, + }, true end end, } diff --git a/src/main.lua b/src/main.lua index 028f735..a6a5f0b 100644 --- a/src/main.lua +++ b/src/main.lua @@ -7,7 +7,7 @@ Jane = { }, } -Jane.rarity_ids = Jane.cry and {1, 2, 3, "cry_epic", 4, "cry_exotic", "jane_junk"} or {1, 2, 3, 4, "jane_junk"} +Jane.rarity_ids = Jane.cry and {1, 2, 3, "cry_epic", 4, "cry_exotic", "jane_junk"} or {1, 2, 3, "jane_junk"} Jane.rarity_names = Jane.cry and {"Common", "Uncommon", "Rare", "Epic", "Legendary", "Exotic", "Junk"} or {"Common", "Uncommon", "Rare", "Legendary", "Junk"}