diff --git a/manifest.json b/manifest.json index fc07698..ae73b0d 100644 --- a/manifest.json +++ b/manifest.json @@ -16,5 +16,5 @@ "Bakery (>=3.0.0~*)" ], "conflicts": [], - "version": "1.12.13" + "version": "1.12.14" } \ No newline at end of file diff --git a/src/edition.lua b/src/edition.lua index ca24b19..265202b 100644 --- a/src/edition.lua +++ b/src/edition.lua @@ -14,6 +14,48 @@ local function get_weight(self) (next(SMODS.find_card "j_jane_saint") and 10 or 1) end +SMODS.Edition({ + key = "gaming", + loc_txt = { + name = "Gaming", + label = "Gaming", + text = { + "{C:blue}+Mult{} Chips", + "{C:red}+Chips{} Mult", + }, + }, + config = {e_chips = 1.2, e_mult = 0.8}, + sound = {sound = "jane_e_gaming", per = 1, vol = 0.7}, + weight = 1, + extra_cost = 20, + in_shop = true, + no_shadow = true, + apply_to_float = false, + shader = "jane_gaming", + disable_base_shader = true, + loc_vars = function(self, _, _) + return {vars = {self.config.e_chips, self.config.e_mult}} + end, + calculate = function(_, card, context) + if not context.post_joker and (not context.main_scoring or context.cardarea ~= G.play) then + return + end + + return { + extra = { + card = card, + chips = mult, + colour = G.C.jane_RGB, + extra = { + card = card, + mult = hand_chips + mult, + colour = G.C.jane_RGB, + }, + }, + } + end, +}) + SMODS.Edition({ key = "polygloss", loc_txt = { @@ -73,48 +115,6 @@ SMODS.Edition({ get_weight = get_weight, }) -SMODS.Edition({ - key = "gaming", - loc_txt = { - name = "Gaming", - label = "Gaming", - text = { - "{C:blue}+Mult{} Chips", - "{C:red}+Chips{} Mult", - }, - }, - config = {e_chips = 1.2, e_mult = 0.8}, - sound = {sound = "jane_e_gaming", per = 1, vol = 0.7}, - weight = 1, - extra_cost = 20, - in_shop = true, - no_shadow = true, - apply_to_float = false, - shader = "jane_gaming", - disable_base_shader = true, - loc_vars = function(self, _, _) - return {vars = {self.config.e_chips, self.config.e_mult}} - end, - calculate = function(_, card, context) - if not context.post_joker and (not context.main_scoring or context.cardarea ~= G.play) then - return - end - - return { - extra = { - card = card, - chips = mult, - colour = G.C.jane_RGB, - extra = { - card = card, - mult = hand_chips + mult, - colour = G.C.jane_RGB, - }, - }, - } - end, -}) - SMODS.Edition({ key = "moire", loc_txt = { @@ -160,13 +160,20 @@ local jumbo_modifier = Jane.cry and 100 or 2 local jumbo = SMODS.Edition({ key = "jumbo", loc_txt = { - name = "Jumbo", + name = "{s:" .. math.pow(Jane.config.wee_sizemod, 2) .. "}" .. "Jumbo", label = "Jumbo", text = { + "{s:" .. Jane.config.wee_sizemod .. "}" .. "All values are", - "{C:attention}multiplied{} by {C:attention}" .. jumbo_modifier, - "{C:inactive}(If possible)", - "{C:inactive,E:1,s:0.75}Whoa, it's huge!!{}", + "{C:attention,s:" .. Jane.config.wee_sizemod .. "}" .. + "multiplied" .. + "{s:" .. Jane.config.wee_sizemod .. "}" .. + " by " .. + "{C:attention,s:" .. Jane.config.wee_sizemod .. "}" .. + jumbo_modifier, + "{C:inactive,s:" .. Jane.config.wee_sizemod .. "}" .. + "(If possible)", + "{C:inactive,E:1}Whoa, it's huge!!", }, }, on_apply = function(card) diff --git a/src/slugcat.lua b/src/slugcat.lua index a6c1e4d..7350559 100644 --- a/src/slugcat.lua +++ b/src/slugcat.lua @@ -315,7 +315,7 @@ SMODS.Joker { atlas = "janegourmand", loc_txt = { name = "The Gourmand", - text = {"All cards are {C:dark_edition}Jumbo"}, + text = {"All cards are {C:dark_edition,s:" .. Jane.config.wee_sizemod .. "}Jumbo"}, }, pos = {x = 0, y = 0}, soul_pos = {x = 1, y = 0},