Merge pull request #53 from lord-ruby/dev

Dev

Author: lord-ruby

items/jokers/misc_jokers.lua

@@ -1847,7 +1847,7 @@ local free_samples = {
         }
     },
     loc_vars = function(self, q, card)
-        local numerator, denominator = SMODS.get_probability_vars(card, 1, card.ability.extra.odds)
+        local numerator, denominator = SMODS.get_probability_vars(card, 1, card and card.ability.extra and card.ability.extra.odds or 4)
         return {vars = {
             numerator,
             denominator,

items/misc/editions.lua

@@ -273,14 +273,16 @@ if AurinkoAddons then
 end
 
 if Entropy.config.override_glitched then
-	-- SMODS.Shader({
-	-- 	key="entr_glitched",
-	-- 	path="entr_glitched.fs"
-	-- })
 
-	-- SMODS.Edition:take_ownership("cry_glitched", {
-	-- 	shader = "entr_glitched"
-	-- }, true)
+	SMODS.Shader({
+		key="entr_glitched",
+		path="entr_glitched.fs"
+	})
+
+	SMODS.Edition:take_ownership("cry_glitched", {
+		shader = "entr_glitched"
+	}, true)
+
 end
 
 SMODS.Shader({

items/misc/runes.lua

@@ -266,7 +266,7 @@ function Tag:rune_remove()
         if G.HUD_runes and G.HUD_runes[HUD_tag_key+1] then
             if HUD_tag_key == 1 then
                 G.HUD_runes[HUD_tag_key+1]:set_alignment({type = 'tri',
-                offset = {x=1.7,y=0},
+                offset = {x=1,y=0},
                 xy_bond = 'Weak',
                 major = G.ROOM_ATTACH})
             else

lib/config.lua

@@ -57,14 +57,14 @@ local entrConfigTab = function()
 			callback = function()
 			end,
 		})
-		-- entr_nodes[#entr_nodes + 1] = create_toggle({
-		-- 	label = localize("k_entr_glitched"),
-		-- 	active_colour = HEX("40c76d"),
-		-- 	ref_table = Entropy.config,
-		-- 	ref_value = "override_glitched",
-		-- 	callback = function()
-		-- 	end,
-		-- })
+		entr_nodes[#entr_nodes + 1] = create_toggle({
+			label = localize("k_entr_glitched"),
+			active_colour = HEX("40c76d"),
+			ref_table = Entropy.config,
+			ref_value = "override_glitched",
+			callback = function()
+			end,
+		})
 	end
 	entr_nodes[#entr_nodes + 1] = create_toggle({
 		label = localize("k_entr_omega_aleph"),

lovely/core.toml

@@ -1820,72 +1820,3 @@ elseif G.GAME.round_resets.blind == G.P_BLINDS.bl_big then
 elseif G.GAME.blind_on_deck ~= "Red" then
 '''
 match_indent = true
-
-[[patches]]
-[patches.pattern]
-target = 'card.lua'
-pattern = '''
-self.children.back.VT.w = 0
-'''
-position = 'before'
-payload = '''
-if not self.children.center then
-  if center and center.set then
-    local _center = center
-    if self.children.center then
-        self.children.center.atlas = G.ASSET_ATLAS[(_center.atlas or (_center.set == 'Joker' or _center.consumeable or _center.set == 'Voucher') and _center.set) or 'centers']
-        self.children.center:set_sprite_pos(_center.pos)
-    else
-        if _center.set == 'Joker' and not _center.unlocked and not self.params.bypass_discovery_center then 
-            self.children.center = Sprite(self.T.x, self.T.y, self.T.w, self.T.h, G.ASSET_ATLAS["Joker"], G.j_locked.pos)
-        elseif self.config.center.set == 'Voucher' and not self.config.center.unlocked and not self.params.bypass_discovery_center then 
-            self.children.center = Sprite(self.T.x, self.T.y, self.T.w, self.T.h, G.ASSET_ATLAS["Voucher"], G.v_locked.pos)
-        elseif self.config.center.consumeable and self.config.center.demo then 
-            self.children.center = Sprite(self.T.x, self.T.y, self.T.w, self.T.h, G.ASSET_ATLAS["Tarot"], G.c_locked.pos)
-        elseif not self.params.bypass_discovery_center and (_center.set == 'Edition' or _center.set == 'Joker' or _center.consumeable or _center.set == 'Voucher' or _center.set == 'Booster') and not _center.discovered then 
-            self.children.center = Sprite(self.T.x, self.T.y, self.T.w, self.T.h, G.ASSET_ATLAS[_center.atlas or _center.set], 
-            (_center.set == 'Joker' and G.j_undiscovered.pos) or 
-            (_center.set == 'Edition' and G.j_undiscovered.pos) or 
-            (_center.set == 'Tarot' and G.t_undiscovered.pos) or 
-            (_center.set == 'Planet' and G.p_undiscovered.pos) or 
-            (_center.set == 'Spectral' and G.s_undiscovered.pos) or 
-            (_center.set == 'Voucher' and G.v_undiscovered.pos) or 
-            (_center.set == 'Booster' and G.booster_undiscovered.pos))
-        elseif _center.set == 'Joker' or _center.consumeable or _center.set == 'Voucher' then
-            self.children.center = Sprite(self.T.x, self.T.y, self.T.w, self.T.h, G.ASSET_ATLAS[_center.set], self.config.center.pos)
-        else
-            self.children.center = Sprite(self.T.x, self.T.y, self.T.w, self.T.h, G.ASSET_ATLAS[_center.atlas or 'centers'], _center.pos)
-        end
-        self.children.center.states.hover = self.states.hover
-        self.children.center.states.click = self.states.click
-        self.children.center.states.drag = self.states.drag
-        self.children.center.states.collide.can = false
-        self.children.center:set_role({major = self, role_type = 'Glued', draw_major = self})
-    end
-    if _center.name == 'Half Joker' and (_center.discovered or self.bypass_discovery_center) then 
-        self.children.center.scale.y = self.children.center.scale.y/1.7
-    end
-    if _center.name == 'Photograph' and (_center.discovered or self.bypass_discovery_center) then 
-        self.children.center.scale.y = self.children.center.scale.y/1.2
-    end
-    if _center.name == 'Square Joker' and (_center.discovered or self.bypass_discovery_center) then 
-        self.children.center.scale.y = self.children.center.scale.x
-    end
-    if _center.pixel_size and _center.pixel_size.h and (_center.discovered or self.bypass_discovery_center) then
-        self.children.center.scale.y = self.children.center.scale.y*(_center.pixel_size.h/95)
-    end
-    if _center.pixel_size and _center.pixel_size.w and (_center.discovered or self.bypass_discovery_center) then
-        self.children.center.scale.x = self.children.center.scale.x*(_center.pixel_size.w/71)
-    end
-  end
-end
-if not self.children.back then
-  self.children.back = Sprite(self.T.x, self.T.y, self.T.w, self.T.h, G.ASSET_ATLAS["centers"], self.params.bypass_back or (self.playing_card and G.GAME[self.back].pos or G.P_CENTERS['b_red'].pos))
-  self.children.back.states.hover = self.states.hover
-  self.children.back.states.click = self.states.click
-  self.children.back.states.drag = self.states.drag
-  self.children.back.states.collide.can = false
-  self.children.back:set_role({major = self, role_type = 'Glued', draw_major = self})
-end
-'''
-match_indent = true