diff --git a/content/jokers.lua b/content/jokers.lua index 3dbd9de..ecbbf43 100644 --- a/content/jokers.lua +++ b/content/jokers.lua @@ -24,7 +24,7 @@ SMODS.Joker { if card.ability.extra.remaining > 0 then G.GAME.current_round.hands_left = G.GAME.round_resets.hands G.GAME.current_round.discards_left = G.GAME.round_resets.discards - play_sound('serenasbalatro_soul') + play_sound('serena_soul') card.ability.extra.remaining = card.ability.extra.remaining - 1 end end @@ -84,7 +84,7 @@ SMODS.Joker { end return { - message = localize("k_nums_increased"), + message = localize("k_serena_nums_increased"), colour = G.C.MONEY } end @@ -137,20 +137,27 @@ SMODS.Joker { cost = 8, calculate = function(self, card, context) --stage 1: remove debuff on played hand - if context.before and context.cardarea == G.play then + local check = false + if context.before then for i, played_card in ipairs(G.play.cards) do - print("index "..i.." has card "..played_card.ability.name) - if played_card.debuffed then - G.play.cards[i].debuffed = false + if played_card.debuff then + G.play.cards[i].debuff = false card.ability.extra.x_mult = card.ability.extra.x_mult + card.ability.extra.increase + check = true end end end + if check then + return { + message = localize('k_serena_debuff_removed') + } + end + --stage 2: do the xmult thing 🤤🤤🤤🤤🤤 if context.joker_main then return { - xmult = card.ability.extra.xmult + xmult = card.ability.extra.x_mult } end diff --git a/localization/en-us.lua b/localization/en-us.lua index eff91cb..05f6830 100644 --- a/localization/en-us.lua +++ b/localization/en-us.lua @@ -3,7 +3,7 @@ return { Back = {}, --decks Blind = {}, --blinds Joker = { - j_serenasbalatro_determination = { + j_serena_determination = { name = "{C:red}DETERMINATION{}", text = { "{C:inactive}The hardened {S:1.1,C:red,E:2}SOUL{} in your chest.{}", @@ -13,20 +13,20 @@ return { "after a boss blind is defeated." }, }, - j_serenasbalatro_inflation = { + j_serena_inflation = { name = "Inflation Joker", text = { "Increases {C:green}every value{} on each", "held joker by {C:money}#1#{} at the end of each round.", }, }, - j_serenasbalatro_mimic = { + j_serena_mimic = { name = "Mimic", text = { }, }, - j_serenasbalatro_dr_house = { + j_serena_dr_house = { name = "Dr. House", text = { "This joker gains {X:mult,C:white}x#2#{} mult when a debuffed card is played,", @@ -35,5 +35,11 @@ return { } } }, + misc = { + dictionary = { + k_serena_nums_increased = "Values UP!", + k_serena_debuff_removed = "Cured!", + } + } } } \ No newline at end of file diff --git a/metadata.json b/metadata.json index 297579b..deb200e 100644 --- a/metadata.json +++ b/metadata.json @@ -1,7 +1,7 @@ { "id": "serenasbalatro", "name": "Serena's Balatro Mod", - "prefix": "serenasbalatro", + "prefix": "serena", "author": [ "Serena (Sunskimmer82)" ], diff --git a/serenasbalatro.lua b/serenasbalatro.lua index 6731e89..4ef822d 100644 --- a/serenasbalatro.lua +++ b/serenasbalatro.lua @@ -21,6 +21,6 @@ vanilla_food = { } modded_food = { - j_vanilla = true, - j_500_cigarettes = true, + j_serena_vanilla = true, + j_serena_500_cigarettes = true, } \ No newline at end of file