diff --git a/manifest.json b/manifest.json index edfedd3..8f2d2d6 100644 --- a/manifest.json +++ b/manifest.json @@ -17,5 +17,5 @@ "conflicts": [ "Jen" ], - "version": "1.1.4" + "version": "1.1.5" } \ No newline at end of file diff --git a/src/edition.lua b/src/edition.lua index 58b0eea..4601a3c 100644 --- a/src/edition.lua +++ b/src/edition.lua @@ -1,8 +1,8 @@ -SMODS.Shader({key = "polygloss", path = "polygloss.fs"}) SMODS.Shader({key = "moire", path = "moire.fs"}) +SMODS.Shader({key = "polygloss", path = "polygloss.fs"}) SMODS.Sound({key = "e_jumbo", path = "e_jumbo.ogg"}) -SMODS.Sound({key = "e_polygloss", path = "e_polygloss.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 @@ -90,6 +90,14 @@ SMODS.Edition({ get_weight = get_weight, }) +local orig_draw_shader = Sprite.draw_shader + +function Sprite:draw_shader(_shader, ...) + if _shader ~= "jane_jumbo" then + return orig_draw_shader(self, _shader, ...) + end +end + local jumbo_modifier = Cryptid and 100 or 2 SMODS.Edition({ @@ -154,9 +162,9 @@ SMODS.Edition({ end, sound = {sound = "jane_e_jumbo", per = 1, vol = 0.5}, weight = 3, + extra_cost = 5, in_shop = true, shader = false, - extra_cost = 5, apply_to_float = false, get_weight = get_weight, })