diff --git a/manifest.json b/manifest.json index e92f5be..42013fb 100644 --- a/manifest.json +++ b/manifest.json @@ -16,5 +16,5 @@ "Bakery (>=3.0.0~*)" ], "conflicts": [], - "version": "1.12.3" + "version": "1.12.4" } \ No newline at end of file diff --git a/src/omega.lua b/src/omega.lua index 0bd9e7d..fceb6c1 100644 --- a/src/omega.lua +++ b/src/omega.lua @@ -65,9 +65,6 @@ local function create_card_set(needle, edition, amount) end end ----@param hand string? ----@param number number ----@param card Card local function omega_level_up(hand, number, card) local factor = 3 ^ number @@ -205,7 +202,7 @@ SMODS.Consumable { text = { "{C:attention}Nonuples {C:chips}Chips{}, {C:chips}Level Chips{},", "{C:mult}Mult{}, {C:mult}Level Mult{}, and", - "{C:planet}planet level {}of {C:attention}all hands", + "{C:planet}planet level {}of {C:attention}every hand", }, }, set = "jane_omegaconsumable", @@ -546,17 +543,14 @@ SMODS.Consumable { soul_rate = 0, hidden = true, atlas = "janeomegaspectrals", - loc_vars = function(_, info_queue) + loc_vars = function() return {vars = {2000}} end, can_use = function() return Jane.can_use() and next(G.hand.cards) end, use = function() - ---@diagnostic disable-next-line: deprecated - local copy = {unpack(G.hand.cards)} - - for _, v in pairs(copy) do + for _, v in pairs(G.hand.cards) do Jane.q(function() v:sell_card() local amount = (v:norank() and 1 or v:get_id()) * G.GAME.dollars - G.GAME.dollars @@ -767,10 +761,12 @@ SMODS.Consumable { soul_rate = 0, hidden = true, atlas = "janeomegatarots", - can_use = Jane.can_use, + can_use = function() + return Jane.can_use() and #G.consumeables.cards < G.consumeables.config.card_limit + end, use = function() for _ = 1, 2 do - if G.consumeables.config.card_limit > #G.consumeables.cards then + if #G.consumeables.cards < G.consumeables.config.card_limit then local orig = G.GAME.banned_keys.c_jane_soul_omega G.GAME.banned_keys.c_jane_soul_omega = true SMODS.add_card({set = "jane_omegaconsumable"}) @@ -989,6 +985,7 @@ SMODS.Consumable { "Create a random {C:red}Rare", "{C:attention}Joker {}for every {C:attention}King", "in your deck", + "{C:inactive}(Currently #1#)", "{C:inactive}(Adds a temporary Showman)", }, }, @@ -998,7 +995,30 @@ SMODS.Consumable { soul_rate = 0, hidden = true, atlas = "janeomegatarots", - can_use = Jane.can_use, + loc_vars = function() + local count = 0 + + for _, v in pairs(G.playing_cards) do + if not v:norank() and v:get_id() == 13 then + count = count + 1 + end + end + + return {vars = {count}} + end, + can_use = function() + if not Jane.can_use() then + return false + end + + for _, v in pairs(G.playing_cards) do + if not v:norank() and v:get_id() == 13 then + return true + end + end + + return false + end, use = function() local count = 0 @@ -1048,7 +1068,7 @@ SMODS.Consumable { loc_txt = { name = "The Wheel of Fortune {C:dark_edition}Omega", text = { - "Create {C:dark_edition,E:1}50 {C:attention}consumables", + "Create {C:dark_edition,E:1}100 {C:attention}consumables", "{C:inactive}(Adds a temporary Showman)", "{C:inactive}(Doesn't require room)", }, @@ -1064,7 +1084,7 @@ SMODS.Consumable { return {vars = {((G.GAME or {}).dollars or 0) ^ 2}} end, use = function() - create_many("Consumeables", 50, "Rare") + create_many("Consumeables", 100) end, } diff --git a/src/slugcat.lua b/src/slugcat.lua index 2d4a586..c5e4716 100644 --- a/src/slugcat.lua +++ b/src/slugcat.lua @@ -336,7 +336,6 @@ local function add_to_consumable_ability_by(n) return type(v) == "number" and v + n or type(v) == "table" and f(v):map(new):table() or v end - ---@param card Card return function(card) local ability = card.ability or {}