Keep Omega Deck consistent with Karma Deck

.gitignore

@@ -0,0 +1,43 @@
+# Compiled Lua sources
+luac.out
+
+# luarocks build files
+*.src.rock
+*.zip
+*.tar.gz
+
+# Object files
+*.o
+*.os
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+*.def
+*.exp
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Syncthing
+.stfolder

manifest.json

@@ -17,5 +17,5 @@
     "conflicts": [
         "Jen"
     ],
-    "version": "1.5.32"
+    "version": "1.5.36"
 }

src/back.lua

@@ -692,8 +692,6 @@ back {
         G.GAME.mysterious = nil
 
         if Jane.is_end_of_ante(context) then
-            add_rain_world_joker()
-
             Jane.q(function()
                 Jane.empowered()
             end)

src/edition.lua

@@ -50,7 +50,7 @@ SMODS.Edition({
     },
     sound = {sound = "jane_e_polygloss", per = 1.2, vol = 0.4},
     weight = 10,
-    extra_cost = 4,
+    extra_cost = 2,
     in_shop = true,
     shader = "polygloss",
     apply_to_float = false,
@@ -177,7 +177,7 @@ SMODS.Edition({
     config = {e_chips = Cryptid and 0.8 or 0.9, e_mult = Cryptid and 1.2 or 1.1},
     sound = {sound = "jane_e_moire", per = 1, vol = 0.7},
     weight = 2,
-    extra_cost = 6,
+    extra_cost = 10,
     in_shop = true,
     shader = "moire",
     in_pool = allow_moire,

src/joker.lua

@@ -39,7 +39,6 @@ local food = {
     "j_cry_jawbreaker",
     "j_cry_mellowcreme",
     "j_cry_brittle",
-    "j_jane_peppino",
 }
 
 local granddad_palette = {
@@ -50,15 +49,21 @@ local granddad_palette = {
 }
 
 local function food_jokers_count()
-    if not G.jokers then
+    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
@@ -378,13 +383,13 @@ SMODS.Joker {
             "{C:inactive,s:0.75,E:1}#11#{C:red,s:1.5,E:1}#12#",
         },
     },
-    config = {extra = {corrupted_steel = 6, is_corrupted = false, milestone = 3, progress = 0}},
+    config = {extra = {corrupted_steel = Cryptid and 20 or 5, is_corrupted = false, milestone = 3, progress = 0}},
     pos = {x = 0, y = 0},
     sinis = {x = 2, y = 0},
     soul_pos = {x = 1, y = 0},
     blueprint_compat = true,
-    cost = Cryptid and 8 or 20,
-    rarity = Cryptid and 3 or 4,
+    cost = 8,
+    rarity = 3,
     loc_vars = function(_, info_queue, card)
         info_queue[#info_queue + 1] = G.P_CENTERS.m_steel
         local ability = card.ability.extra or {}
@@ -402,7 +407,7 @@ SMODS.Joker {
                 is_corrupted and "Purifies " or "",
                 is_corrupted and "in " or "",
                 is_corrupted and "" or "Destroying ",
-                effective .. (is_corrupted and " round" or " steel card") .. plural,
+                effective .. (is_corrupted and " ante" or " steel card") .. plural,
                 is_corrupted and "" or "corrupts ",
                 is_corrupted and "Destroying steel cards" or "this Joker",
                 is_corrupted and "prolongs the " or "",
@@ -427,7 +432,7 @@ SMODS.Joker {
         local extra = card.ability.extra or {}
         Jane.oxy(card, context.removed)
 
-        if context.end_of_round and
+        if context.ante_end and context.ante_change and
             extra.progress > 0 and not
             context.individual and not
             context.repetition and not
@@ -516,8 +521,8 @@ SMODS.Joker {
 
             return {
                 card = card,
-                colour = G.C.jane_RGB,
-                message = operator .. number_format(num),
+                colour = Cryptid and G.C.jane_RGB or nil,
+                message = Cryptid and (operator .. number_format(num)) or nil,
                 [Cryptid and "e_mult" or "x_mult"] = num,
             }, true
         end
@@ -607,18 +612,16 @@ SMODS.Joker {
     loc_txt = {
         name = "Peppino Spaghetti",
         text = {
-            operator_prefix .. operator .. "2^x{C:red} Mult{} for every",
-            "{C:attention}food or Peppino Joker",
-            "in your possession",
-            "{C:inactive}(Currently " .. operator_prefix .. operator .. "#1#{C:red} Mult{C:inactive})",
+            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}},
-    rarity = exotic,
+    rarity = 3,
+    cost = 8,
     blueprint_compat = true,
-    cost = Cryptid and 50 or 20,
     loc_vars = function(_, _, card)
         return {vars = {card.ability.extra.base ^ food_jokers_count()}}
     end,

src/main.lua

@@ -218,17 +218,6 @@ function Card:nosuit()
     return self.ability.name == "Stone Card" or self.config.center.no_suit
 end
 
-local orig_can_highlight = CardArea.can_highlight
-
-function CardArea:can_highlight(...)
-    if self ~= G.hand or not next(SMODS.find_card("j_jane_gourmand")) then
-        return orig_can_highlight(self, ...)
-    end
-
-    self.config.highlighted_limit = math.max(self.config.highlighted_limit, 6)
-    return true
-end
-
 local orig_menu = Game.main_menu
 
 function Game:main_menu(change_context)

src/slugcat.lua

@@ -165,7 +165,7 @@ SMODS.Joker {
 
         info_queue[#info_queue + 1] = Cryptid and G.P_CENTERS.c_cry_empowered or G.P_CENTERS.c_soul
         local rounds_left = card.ability.extra.rounds_left
-        local sold = rounds_left - hunter[3]
+        local sold = rounds_left - hunter[5]
 
         return {
             vars = {
@@ -221,7 +221,7 @@ SMODS.Joker {
             return
         end
 
-        if context.selling_self and card.ability.extra.rounds_left <= hunter[3] then
+        if context.selling_self and card.ability.extra.rounds_left <= hunter[5] then
             spawn_rot()
         elseif not context.individual and not context.repetition and not context.retrigger_joker then
             if G.GAME.round_resets.hands <= 0 then
@@ -469,7 +469,7 @@ function Card:set_debuff(should_debuff)
 end
 
 local function attunement()
-    return (G.GAME or {}).weeckweeck and 2 or (Cryptid and 1.002 or 1.2)
+    return (G.GAME or {}).weeckweeck and 2 or (Cryptid and 1.002 or 1.25)
 end
 
 SMODS.Joker {
@@ -489,7 +489,7 @@ SMODS.Joker {
             "{C:inactive,s:1.25}#6#{C:attention,s:1.25}#7#{C:inactive,s:1.25}#8#{C:inactive}#9#",
         },
     },
-    config = {extra = {karma = 0, max_karma = Cryptid and 10 or 3}},
+    config = {extra = {karma = 0, max_karma = Cryptid and 10 or 2}},
     pos = {x = 0, y = 0},
     soul_pos = {x = 1, y = 0},
     cost = 20,
@@ -615,9 +615,9 @@ SMODS.Joker {
                 e_jane_moire = {
                     colour = G.C.jane_RGB,
                     sound = "talisman_eeechip",
-                    [Cryptid and "EEchip_mod" or "Echip_mod"] = attune,
+                    EEchip_mod = Cryptid and attune or nil,
                     [Cryptid and "EEmult_mod" or "Emult_mod"] = attune,
-                    message = (Cryptid and "^^" or "^") .. attune .. " Chips & Mult",
+                    message = (Cryptid and "^^" or "^") .. attune .. (Cryptid and " Chips & Mult" or ""),
                 },
             })[Cryptid and "e_jane_moire" or ((context.other_card or context.other_joker or {}).edition or {}).key]
 
@@ -703,9 +703,9 @@ SMODS.Joker {
     loc_txt = {
         name = "The Rot",
         text = {
-            "Clogs up your Joker slots",
-            "{C:attention}Duplicates itself{} at the",
-            "end of {C:attention}every ante",
+            not Cryptid and "{C:inactive,E:1}Does nothing" or nil,
+            Cryptid and "{C:attention}Duplicates itself{} at the" or nil,
+            Cryptid and "end of {C:attention}every ante" or nil,
         },
     },
     pos = {x = 0, y = 0},
@@ -721,7 +721,7 @@ SMODS.Joker {
 
         return not not next(SMODS.find_card("j_jane_rot"))
     end,
-    calculate = function(_, card, context)
+    calculate = Cryptid and function(_, card, context)
         local function has_room()
             return G.jokers.config.card_count < G.jokers.config.card_limit
         end
@@ -743,5 +743,5 @@ SMODS.Joker {
         else
             card.cloned = false
         end
-    end,
+    end or nil,
 }