Complete Overhaul

MathIsFun0 · MathIsFun0 · commit 35a76d30230f · 2024-06-09T14:15:46.000-04:00
diff --git a/colors/Base Game.lua b/colors/Base Game.lua
@@ -0,0 +1,143 @@
+return {
+    SPLASH = {
+        HEX('FE5F55'),
+        HEX('009DFF')
+    },
+    MULT = HEX('FE5F55'),
+    CHIPS = HEX("009dff"),
+    PLASMA = HEX('cc73d9'),
+    MONEY = HEX('f3b958'),
+    XMULT = HEX('FE5F55'),
+    FILTER = HEX('ff9a00'),
+    BLUE = HEX("009dff"),
+    RED = HEX('FE5F55'),
+    GREEN = HEX("4BC292"),
+    PALE_GREEN = HEX("56a887"),
+    ORANGE = HEX("fda200"),
+    IMPORTANT = HEX("ff9a00"),
+    GOLD = HEX('eac058'),
+    YELLOW = HEX('ffff00'),
+    CLEAR = HEX('00000000'), 
+    WHITE = HEX('ffffff'),
+    PURPLE = HEX('8867a5'),
+    BLACK = HEX("374244"),
+    L_BLACK = HEX("4f6367"),
+    GREY = HEX("5f7377"),
+    CHANCE = HEX("4BC292"),
+    JOKER_GREY = HEX('bfc7d5'),
+    VOUCHER = HEX("cb724c"),
+    BOOSTER = HEX("646eb7"),
+    ETERNAL = HEX('c75985'),
+    PERISHABLE = HEX('4f5da1'),
+    RENTAL = HEX('b18f43'),
+    DYN_UI = {
+        MAIN = HEX('374244'),
+        DARK = HEX('374244'),
+        BOSS_MAIN = HEX('374244'),
+        BOSS_DARK = HEX('374244'),
+        BOSS_PALE = HEX('374244')
+    },
+    SO_1 = {
+        Hearts = HEX('f03464'),
+        Diamonds = HEX('f06b3f'),
+        Spades = HEX("403995"),
+        Clubs = HEX("235955"),
+    },
+    SO_2 = {
+        Hearts = HEX('f83b2f'),
+        Diamonds = HEX('e29000'),
+        Spades = HEX("4f31b9"),
+        Clubs = HEX("008ee6"),
+    },
+    UI = {
+        TEXT_LIGHT = HEX('ffffff'),
+        TEXT_DARK = HEX("4F6367"),
+        TEXT_INACTIVE = HEX("88888899"),
+        BACKGROUND_LIGHT = HEX("B8D8D8"),
+        BACKGROUND_WHITE = HEX('ffffff'),
+        BACKGROUND_DARK = HEX("7A9E9F"),
+        BACKGROUND_INACTIVE = HEX("666666FF"),
+        OUTLINE_LIGHT = HEX("D8D8D8"),
+        OUTLINE_LIGHT_TRANS = HEX("D8D8D866"),
+        OUTLINE_DARK = HEX("7A9E9F"),
+        TRANSPARENT_LIGHT = HEX("eeeeee22"),
+        TRANSPARENT_DARK = HEX("22222222"),
+        HOVER = HEX('00000055'),
+    },
+    SET = {
+        Default = HEX("cdd9dc"),
+        Enhanced = HEX("cdd9dc"),
+        Joker = HEX('424e54'),
+        Tarot = HEX('424e54'),
+        Planet = HEX("424e54"),
+        Spectral = HEX('424e54'),
+        Voucher = HEX("424e54"),
+    }, 
+    SECONDARY_SET = {
+        Default = HEX("9bb6bdFF"),
+        Enhanced = HEX("8389DDFF"),
+        Joker = HEX('708b91'),
+        Tarot = HEX('a782d1'),
+        Planet = HEX('13afce'),
+        Spectral = HEX('4584fa'),
+        Voucher = HEX("fd682b"),
+        Edition = HEX("4ca893"),
+    }, 
+    RARITY = {
+        HEX('009dff'),
+        HEX("4BC292"),
+        HEX('fe5f55'),
+        HEX("b26cbb")
+    },
+    BLIND = {
+        Small = HEX("50846e"),
+        Big = HEX("50846e"),
+        Boss = HEX("b44430"),
+        won = HEX("4f6367")
+    },
+    HAND_LEVELS = {
+        HEX("efefef"),
+        HEX("95acff"),
+        HEX("65efaf"),
+        HEX('fae37e'), 
+        HEX('ffc052'), 
+        HEX('f87d75'),
+        HEX('caa0ef')
+    },
+    BACKGROUND = {
+        L = HEX('ffff00'),
+        D = HEX("374244"),
+        C = HEX("374244")
+    },
+    BOSSES = {
+        bl_ox = HEX('b95b08'),
+        bl_hook = HEX('a84024'),
+        bl_mouth = HEX('ae718e'),
+        bl_fish = HEX('3e85bd'),
+        bl_club = HEX('b9cb92'),
+        bl_manacle = HEX('575757'),
+        bl_tooth = HEX('b52d2d'),
+        bl_wall = HEX('8a59a5'),
+        bl_house = HEX('5186a8'),
+        bl_mark = HEX('6a3847'),
+        bl_wheel = HEX('50bf7c'),
+        bl_arm = HEX('6865f3'),
+        bl_psychic = HEX('efc03c'),
+        bl_goad = HEX('b95c96'),
+        bl_water = HEX('c6e0eb'),
+        bl_eye = HEX('4b71e4'),
+        bl_plant = HEX('709284'),
+        bl_needle = HEX('5c6e31'),
+        bl_head = HEX('ac9db4'),
+        bl_window = HEX('a9a295'),
+        bl_serpent = HEX('439a4f'),
+        bl_pillar = HEX('7e6752'),
+        bl_flint = HEX('e56a2f'),
+
+        bl_final_bell = HEX('009cfd'),
+        bl_final_leaf = HEX('56a786'),
+        bl_final_vessel = HEX('8a71e1'),
+        bl_final_acorn = HEX('fda200'),
+        bl_final_heart = HEX('ac3232')
+    }
+}
diff --git a/colors/Pastel.lua b/colors/Pastel.lua
@@ -51,10 +51,6 @@ return {
         TEXT_LIGHT = HEX('FFFFFF'),
         TEXT_DARK = HEX('BAC8C9'),
         TEXT_INACTIVE = HEX('D5D5D7'),
-        BACKGROUND_LIGHT = HEX('DFECEC'),
-        BACKGROUND_WHITE = HEX('FFFFFF'),
-        BACKGROUND_DARK = HEX('B6D5D5'),
-        BACKGROUND_INACTIVE = HEX('CCCCCC'),
         OUTLINE_LIGHT = HEX('E5E5E5'),
         OUTLINE_LIGHT_TRANS = HEX('E5E5E599'),
         OUTLINE_DARK = HEX('B6D5D5'),
@@ -101,42 +97,5 @@ return {
         HEX('FFD6A8'), 
         HEX('FFA39D'),
         HEX('E0C8FF')
-    },
-    BACKGROUND = {
-        L = HEX('FFFFB3'),
-        D = HEX('AAB6B8'),
-        C = HEX('AAB6B8'),
-        contrast = 1
-    },
-    BOSSES = {
-        bl_ox = HEX('EBA973'),
-        bl_hook = HEX('D89676'),
-        bl_mouth = HEX('DEB3CD'),
-        bl_fish = HEX('99CFF7'),
-        bl_club = HEX('DFE6C8'),
-        bl_manacle = HEX('BABABA'),
-        bl_tooth = HEX('EB7E7E'),
-        bl_wall = HEX('D1A8D8'),
-        bl_house = HEX('A4D0E8'),
-        bl_mark = HEX('B88A93'),
-        bl_wheel = HEX('99F1B4'),
-        bl_arm = HEX('9F9AFF'),
-        bl_psychic = HEX('FDE7A8'),
-        bl_goad = HEX('EBA3C6'),
-        bl_water = HEX('E8F3F9'),
-        bl_eye = HEX('99B6F0'),
-        bl_plant = HEX('B0C5B8'),
-        bl_needle = HEX('A8B18B'),
-        bl_head = HEX('D5C3D9'),
-        bl_window = HEX('D0CDC1'),
-        bl_serpent = HEX('99D1A7'),
-        bl_pillar = HEX('BCA39A'),
-        bl_flint = HEX('F4A778'),
-
-        bl_final_bell = HEX('A3D4FF'),
-        bl_final_leaf = HEX('B0D3BC'),
-        bl_final_vessel = HEX('C0B8E9'),
-        bl_final_acorn = HEX('FFDAA5'),
-        bl_final_heart = HEX('EB6B6B')
     }
 }
diff --git a/colors/Simple Blue.lua b/colors/Simple Blue.lua
@@ -0,0 +1,144 @@
+return {
+    SPLASH = {
+        HEX('0057B7'),
+        HEX('007FFF')
+    },
+    MULT = HEX('0057B7'),
+    CHIPS = HEX("007FFF"),
+    PLASMA = HEX('4B89DC'),
+    MONEY = HEX('66B2FF'),
+    XMULT = HEX('0057B7'),
+    FILTER = HEX('0096D6'),
+    BLUE = HEX("007FFF"),
+    RED = HEX('0057B7'),
+    GREEN = HEX("4A90E2"),
+    PALE_GREEN = HEX("4BA3E7"),
+    ORANGE = HEX("008ECC"),
+    IMPORTANT = HEX("0096D6"),
+    GOLD = HEX('66B2FF'),
+    YELLOW = HEX('A4D3EE'),
+    CLEAR = HEX('00000000'), 
+    WHITE = HEX('E0F7FF'),
+    PURPLE = HEX('5A89E6'),
+    BLACK = HEX("3B4A68"),
+    L_BLACK = HEX("4C5A79"),
+    GREY = HEX("647D9E"),
+    CHANCE = HEX("4A90E2"),
+    JOKER_GREY = HEX('9CB8D1'),
+    VOUCHER = HEX("3E73A6"),
+    BOOSTER = HEX("576FB8"),
+    ETERNAL = HEX('5C8CDA'),
+    PERISHABLE = HEX('3B5F8C'),
+    RENTAL = HEX('4F7EB0'),
+    DYN_UI = {
+        MAIN = HEX('3B4A68'),
+        DARK = HEX('3B4A68'),
+        BOSS_MAIN = HEX('3B4A68'),
+        BOSS_DARK = HEX('3B4A68'),
+        BOSS_PALE = HEX('3B4A68')
+    },
+    SO_1 = {
+        Hearts = HEX('3E73A6'),
+        Diamonds = HEX('347EBF'),
+        Spades = HEX("4B89DC"),
+        Clubs = HEX("2F6DAE"),
+    },
+    SO_2 = {
+        Hearts = HEX('3A72AC'),
+        Diamonds = HEX('4A8FDB'),
+        Spades = HEX("5B99E8"),
+        Clubs = HEX("3985CB"),
+    },
+    UI = {
+        TEXT_LIGHT = HEX('E0F7FF'),
+        TEXT_DARK = HEX("4C5A79"),
+        TEXT_INACTIVE = HEX("94ADCE"),
+        BACKGROUND_LIGHT = HEX("A4D3EE"),
+        BACKGROUND_WHITE = HEX('E0F7FF'),
+        BACKGROUND_DARK = HEX("7FA4D6"),
+        BACKGROUND_INACTIVE = HEX("647D9EFF"),
+        OUTLINE_LIGHT = HEX("A4D3EE"),
+        OUTLINE_LIGHT_TRANS = HEX("A4D3EE66"),
+        OUTLINE_DARK = HEX("7FA4D6"),
+        TRANSPARENT_LIGHT = HEX("B0D8F022"),
+        TRANSPARENT_DARK = HEX("3B4A6822"),
+        HOVER = HEX('3B4A6855'),
+    },
+    SET = {
+        Default = HEX("B0D8F0"),
+        Enhanced = HEX("B0D8F0"),
+        Joker = HEX('3B4A68'),
+        Tarot = HEX('3B4A68'),
+        Planet = HEX("3B4A68"),
+        Spectral = HEX('3B4A68'),
+        Voucher = HEX("3B4A68"),
+    }, 
+    SECONDARY_SET = {
+        Default = HEX("9CB8D1FF"),
+        Enhanced = HEX("5A89E6FF"),
+        Joker = HEX('7FA4D6'),
+        Tarot = HEX('8EACE8'),
+        Planet = HEX('66B2FF'),
+        Spectral = HEX('5B99E8'),
+        Voucher = HEX("4F7EB0"),
+        Edition = HEX("4A90E2"),
+    }, 
+    RARITY = {
+        HEX('007FFF'),
+        HEX("4A90E2"),
+        HEX('0057B7'),
+        HEX("5A89E6")
+    },
+    BLIND = {
+        Small = HEX("3B4A68"),
+        Big = HEX("3B4A68"),
+        Boss = HEX("5C8CDA"),
+        won = HEX("3B4A68")
+    },
+    HAND_LEVELS = {
+        HEX("E0F7FF"),
+        HEX("5B99E8"),
+        HEX("4A90E2"),
+        HEX('66B2FF'), 
+        HEX('4B89DC'), 
+        HEX('3E73A6'),
+        HEX('5A89E6')
+    },
+    BACKGROUND = {
+        L = HEX('A4D3EE'),
+        D = HEX("3B4A68"),
+        C = HEX("3B4A68"),
+        contrast = 1
+    },
+    BOSSES = {
+        bl_ox = HEX('3E73A6'),
+        bl_hook = HEX('5C8CDA'),
+        bl_mouth = HEX('4B89DC'),
+        bl_fish = HEX('3498DB'),
+        bl_club = HEX('4A90E2'),
+        bl_manacle = HEX('3B4A68'),
+        bl_tooth = HEX('0057B7'),
+        bl_wall = HEX('5A89E6'),
+        bl_house = HEX('3B5F8C'),
+        bl_mark = HEX('3E73A6'),
+        bl_wheel = HEX('4A90E2'),
+        bl_arm = HEX('5A89E6'),
+        bl_psychic = HEX('66B2FF'),
+        bl_goad = HEX('3E73A6'),
+        bl_water = HEX('A4D3EE'),
+        bl_eye = HEX('007FFF'),
+        bl_plant = HEX('4BA3E7'),
+        bl_needle = HEX('3B4A68'),
+        bl_head = HEX('647D9E'),
+        bl_window = HEX('9CB8D1'),
+        bl_serpent = HEX('1ABC9C'),
+        bl_pillar = HEX('4B89DC'),
+        bl_flint = HEX('3B5F8C'),
+
+        bl_final_bell = HEX('007FFF'),
+        bl_final_leaf = HEX('4A90E2'),
+        bl_final_vessel = HEX('5A89E6'),
+        bl_final_acorn = HEX('4B89DC'),
+        bl_final_heart = HEX('3E73A6')
+    }
+}
diff --git a/colors/Trans.lua b/colors/Trans.lua
@@ -0,0 +1,7 @@
+return {
+    MULT = HEX('F5A9B8'),
+    RED = HEX('F5A9B8'),
+    CHIPS = HEX("5BCEFA"),
+    BLUE = HEX("5BCEFA"),
+    PLASMA = HEX('95BCED')
+}
diff --git a/config.lua b/config.lua
@@ -0,0 +1 @@
+return {["palette"]="Simple Blue",}
diff --git a/lovely.toml b/lovely.toml
@@ -22,7 +22,7 @@ sources = [
 target = "game.lua"
 pattern = 'self.SPEEDFACTOR = 1'
 position = "after"
-payload = 'Trance.set_globals(self)'
+payload = 'Trance_set_globals(self, 0);print(tprint(G.C.SPLASH))'
 match_indent = true
 
 # Plasma Deck
@@ -31,15 +31,15 @@ match_indent = true
 target = "back.lua"
 pattern = 'ease_colour(G.C.UI_CHIPS, {0.8, 0.45, 0.85, 1})'
 position = "at"
-payload = 'ease_colour(G.C.UI_CHIPS, Trance.PLASMA)'
+payload = 'ease_colour(G.C.UI_CHIPS, G.C.PLASMA or {0.8, 0.45, 0.85, 1})'
 match_indent = true
 
 [[patches]]
 [patches.pattern]
 target = "back.lua"
 pattern = 'ease_colour(G.C.UI_MULT, {0.8, 0.45, 0.85, 1})'
 position = "at"
-payload = 'ease_colour(G.C.UI_MULT, Trance.PLASMA)'
+payload = 'ease_colour(G.C.UI_MULT, G.C.PLASMA or {0.8, 0.45, 0.85, 1})'
 match_indent = true
 
 [[patches]]
diff --git a/trance.lua b/trance.lua
