Merge pull request #119 from lord-ruby/dev

fix colour definitions

Author: lord-ruby

items/misc/rarities.lua

@@ -14,32 +14,6 @@ SMODS.Rarity {
     badge_colour = Entropy.reverse_legendary_gradient
 }
 
-local loc_colour_ref = loc_colour
-function loc_colour(_c, default)
-    if not G.ARGS.LOC_COLOURS then
-        loc_colour_ref(_c, default)
-    elseif not G.ARGS.LOC_COLOURS.entr_colours then
-        G.ARGS.LOC_COLOURS.entr_colours = true
-        local new_colors = {
-            entr_entropic = Entropy.entropic_gradient,
-            entr_reverse_legendary = Entropy.reverse_legendary_gradient,
-            entr_omen = G.C.Entropy.Omen,
-            entr_zenith = Entropy.zenith_gradient,
-            entr_eqmult = HEX("cb7f7f"),
-            entr_eqchips = HEX("5b89a6"),
-            entr_freaky = HEX("ff00ea"),
-            entr_transparent = {0,0,0,0},
-            entr_trans = Entropy.transgender_gradient,
-        }
-
-        for k, v in pairs(new_colors) do
-            G.ARGS.LOC_COLOURS[k] = v
-        end
-    end
-
-    return loc_colour_ref(_c, default)
-end
-
 local ease_colour_ref = ease_colour
 function ease_colour(orig, new, ...)
     if new.colours then orig = new return end
@@ -57,4 +31,21 @@ SMODS.Rarity {
         end
         return 0
 	end,
-}
+}
+
+loc_colour()
+local new_colors = {
+    entr_entropic = Entropy.entropic_gradient,
+    entr_reverse_legendary = Entropy.reverse_legendary_gradient,
+    entr_omen = G.C.Entropy.Omen,
+    entr_zenith = Entropy.zenith_gradient,
+    entr_eqmult = HEX("cb7f7f"),
+    entr_eqchips = HEX("5b89a6"),
+    entr_freaky = HEX("ff00ea"),
+    entr_transparent = {0,0,0,0},
+    entr_trans = Entropy.transgender_gradient,
+}
+
+for k, v in pairs(new_colors) do
+    G.ARGS.LOC_COLOURS[k] = v
+end

manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "Entropy",
     "id": "entr",
-    "version": "1.3.1",
+    "version": "1.3.3",
     "website_url": "https://github.com/lord-ruby/Entropy/tree/main",
     "description": "A Chaotic Balatro mod focused on Inverted Consumables and expanding on Vanilla mechanics in various other ways. Generally Vanilla adjacent but not exactly Vanilla+",
     "prefix": "entr",