manifest.json

@@ -17,5 +17,5 @@
     "conflicts": [
         "Jen"
     ],
-    "version": "1.2.0"
+    "version": "1.1.5"
 }

src/back.lua

@@ -5,25 +5,9 @@ SMODS.Atlas {
     path = Jane.config.texture_pack .. "/b_jane_decks.png",
 }
 
-local function back(x)
-    SMODS.Back(x)
-    local text = x.loc_txt.text
-    local name = x.loc_txt.name:gsub("Deck$", "Sleeve")
-
-    CardSleeves.Sleeve {
-        key = x.key,
-        pos = x.pos,
-        apply = x.apply,
-        atlas = "janedecks",
-        loc_vars = x.loc_vars,
-        trigger_effect = x.trigger_effect,
-        loc_txt = {name = name, text = text},
-    }
-end
-
 local eternal_text = Cryptid and "Absolute" or "Eternal"
 
-back {
+SMODS.Back {
     key = "nitro",
     atlas = "janedecks",
     pos = {x = 1, y = 1},
@@ -91,7 +75,7 @@ local function add_rain_world_joker()
     return true
 end
 
-back {
+SMODS.Back {
     key = "karma",
     atlas = "janedecks",
     pos = {x = 3, y = 0},
@@ -113,7 +97,7 @@ back {
     end,
 }
 
-back {
+SMODS.Back {
     key = "mysterious",
     atlas = "janedecks",
     pos = {x = 1, y = 0},
@@ -136,7 +120,7 @@ back {
     end,
 }
 
-back {
+SMODS.Back {
     key = "obsidian",
     atlas = "janedecks",
     pos = {x = 2, y = 1},
@@ -183,7 +167,7 @@ local function apply_orrery()
     end)
 end
 
-back {
+SMODS.Back {
     key = "orrery",
     atlas = "janedecks",
     pos = {x = 0, y = 0},
@@ -199,7 +183,7 @@ back {
     end,
 }
 
-back {
+SMODS.Back {
     key = "tortoise",
     atlas = "janedecks",
     pos = {x = 3, y = 1},
@@ -249,7 +233,7 @@ local function apply_weeck()
     end)
 end
 
-back {
+SMODS.Back {
     key = "weeck",
     atlas = "janedecks",
     pos = {x = 4, y = 1},
@@ -267,7 +251,7 @@ back {
     end,
 }
 
-back {
+SMODS.Back {
     key = "omega",
     atlas = "janedecks",
     pos = {x = 5, y = 1},

src/edition.lua

@@ -4,6 +4,10 @@ SMODS.Sound({key = "e_jumbo", path = "e_jumbo.ogg"})
 SMODS.Sound({key = "e_moire", path = "e_moire.ogg"})
 SMODS.Sound({key = "e_polygloss", path = "e_polygloss.ogg"})
 
+local function get_weight(self)
+    return G.GAME.edition_rate * self.weight
+end
+
 local function allow_moire()
     if Cryptid then
         return true
@@ -18,10 +22,6 @@ local function allow_moire()
     return false
 end
 
-local function get_weight(self)
-    return G.GAME.edition_rate * self.weight * (allow_moire() and 1 or 0)
-end
-
 SMODS.Edition({
     key = "polygloss",
     loc_txt = {
@@ -191,7 +191,7 @@ SMODS.Edition({
         return {vars = {self.config.e_chips, self.config.e_mult}}
     end,
     calculate = function(self, _, context)
-        if context.post_joker or context.main_scoring and context.cardarea == G.play then
+        if context.post_joker or context.main_scoring then
             return {e_chips = self.config.e_chips, e_mult = self.config.e_mult}
         end
     end,