update account bases and category, and editor script, reflect basedbuttonsprite changes (minor semver change)

VERSION

@@ -1 +1 @@
-3.1.1
+3.2.0

loader/include/Geode/ui/BasedButtonSprite.hpp

@@ -82,6 +82,9 @@ namespace geode {
         Teal = 6,
         Aqua = 7,
         Cyan = 8,
+        Magenta = 9,
+        DimGreen = 10,
+        BrightGreen = 11,
     };
     GEODE_DLL const char* baseEnumToString(EditorBaseColor);
 

loader/resources/blanks/svgs/baseEditor_Normal.svg

@@ -0,0 +1,25 @@
+<svg width="132" height="138" viewBox="0 0 132 138" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_922_144)">
+<rect x="4" y="7" width="124" height="124" rx="20" fill="white"/>
+</g>
+<rect x="8" y="11" width="116" height="116" rx="16" fill="black"/>
+<rect x="12" y="15" width="108" height="108" rx="14" fill="url(#paint0_linear_922_144)"/>
+<rect x="17" y="20" width="98" height="98" rx="8" fill="#7ADE2D"/>
+<defs>
+<filter id="filter0_d_922_144" x="4" y="7" width="128" height="131" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dx="4" dy="7"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.34 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_922_144"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_922_144" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_922_144" x1="12" y1="15" x2="120" y2="123" gradientUnits="userSpaceOnUse">
+<stop stop-color="#C6F249"/>
+<stop offset="0.495303" stop-color="#C6F249"/>
+<stop offset="0.495303" stop-color="#49851B"/>
+<stop offset="1" stop-color="#49851B"/>
+</linearGradient>
+</defs>
+</svg>

loader/resources/blanks/svgs/gen.py

@@ -27,7 +27,29 @@ colors = {
     "Cyan": ["#58FDFA", "#13D5EA", "#44F9F6", "#0B9FBE"],
     "Blue": ["#1AF1F8", "#0AB4FF", "#23DCFA", "#0077FA"],
     "Gray": ["#DEDEE0", "#979997", "#CACCCA", "#747472"],
-    # "DarkPurple": ["#41384b", "#2f2937", "#393142", "#221e28"],
+    "DarkPurple": ["#41384b", "#2f2937", "#393142", "#221e28"],
+    "DarkAqua": ["#2a4559", "#1f3441", "#253d4e", "#17272f"],
+}
+
+editor_sizes = [
+    "Normal",
+]
+
+editor_color_from = ["#C6F249", "#7ADE2D", "#49851B"]
+
+editor_colors = {
+    "Cyan": ["#0effff", "#00d2f6", "#007d94"],
+    "Blue": ["#82d6ff", "#80a1ff", "#4d60d2"],
+    "Teal": ["#3cfcbc", "#3cfcbc", "#0f7a68"],
+    "Magenta": ["#ffafff", "#f67fff", "#944cca"],
+    "Pink": ["#ff93fd", "#ff6fab", "#d44266"],
+    "Green": ["#a2f30e", "#58d000", "#347c00"],
+    "BrightGreen": ["#62ff2a", "#23dc23", "#148414"],
+    "DimGreen": ["#ace83f", "#6ac227", "#3f7417"],
+    "Orange": ["#ffd387", "#ffa83f", "#b35d1e"],
+    "LightBlue": ["#52e8ff", "#4fb1ff", "#2f6ac7"],
+    "Gray": ["#c8c7c9", "#9b9a9b", "#5c5c5d"],
+    "DarkGray": ["#9a9a9a", "#717171", "#3a3a3a"],
 }
 
 for size in sizes:
@@ -40,3 +62,14 @@ for size in sizes:
         for color_orig, color_to in zip(color_from, cols):
             svg = svg.replace(color_orig, color_to)
         subprocess.run(["rsvg-convert", "-o", out], input=svg.encode())
+
+for size in editor_sizes:
+    with open(f"baseEditor_{size}.svg", "r") as file:
+        svg_base = file.read()
+    for name, cols in editor_colors.items():
+        svg = svg_base
+        out = f"../baseEditor_{size}_{name.title()}.png"
+        print(f"Generating {out}")
+        for color_orig, color_to in zip(editor_color_from, cols):
+            svg = svg.replace(color_orig, color_to)
+        subprocess.run(["rsvg-convert", "-o", out], input=svg.encode())

loader/src/ui/nodes/BasedButtonSprite.cpp

@@ -95,6 +95,9 @@ const char* geode::baseEnumToString(EditorBaseColor value) {
         case EditorBaseColor::Teal: return "Teal";
         case EditorBaseColor::Aqua: return "Aqua";
         case EditorBaseColor::Cyan: return "Cyan";
+        case EditorBaseColor::Magenta: return "Magenta";
+        case EditorBaseColor::DimGreen: return "DimGreen";
+        case EditorBaseColor::BrightGreen: return "BrightGreen";
     }
     return "Unknown";
 }