Merge pull request #168 from FofoFromBaba/main

random things and fixes
ROBOT-IS-CHILL · Aug 8, 2024 · 9f5641f · 9f5641f
2 parents 78f05cc + 7c0b086
commit 9f5641f
Show file tree

Hide file tree

Showing 701 changed files with 724 additions and 247 deletions.
diff --git a/data/custom/3suns-sprites.json b/data/custom/3suns-sprites.json
@@ -51,6 +51,6 @@
             "4",
             "1"
         ],
-        "tiling": "1"
+        "tiling": "-1"
     }
 ]
diff --git a/data/custom/YOU-HAVE-UNO.json b/data/custom/YOU-HAVE-UNO.json
@@ -51,7 +51,7 @@
             "3",
             "3"
         ],
-        "tiling": "0"
+        "tiling": "-1"
     },
     {
         "name": "unowild",

diff --git a/data/custom/another-sprites.json b/data/custom/another-sprites.json
@@ -81,7 +81,7 @@
         "tiling": "2"
     },
     {
-        "name": "text_unknown",
+        "name": "text_unknown2",
         "sprite": "text_unknown",
         "color": [
             "3",

diff --git a/data/custom/bab.json b/data/custom/bab.json
@@ -271,7 +271,7 @@
     },
     {
         "name": "text_n\u2019t",
-        "sprite": "text_n\u2019t",
+        "sprite": "text_n't",
         "color": [
             "2",
             "2"
@@ -586,7 +586,7 @@
     },
     {
         "name": "n\u2019tsuf",
-        "sprite": "n\u2019tsuf",
+        "sprite": "n'tsuf",
         "color": [
             "2",
             "2"

diff --git a/data/custom/balt-sprites.json b/data/custom/balt-sprites.json
@@ -73,7 +73,7 @@
     {
         "name": "metronome",
         "sprite": "metronome",
-        "tiling": "-1",
+        "tiling": "4",
         "color": [
             "0",
             "3"

diff --git a/data/custom/blokos-sprites.json b/data/custom/blokos-sprites.json
@@ -53,6 +53,42 @@
         ],
         "tiling": "0"
     },
+    {
+        "name": "text_all i want for christmas",
+        "sprite": "text_all i want for christmas",
+        "color": [
+            "5",
+            "2"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "all i want for christmas",
+        "sprite": "all i want for christmas",
+        "color": [
+            "5",
+            "2"
+        ],
+        "tiling": "0"
+    },
+    {
+        "name": "text_all~i~want~for~christmas",
+        "sprite": "text_all i want for christmas",
+        "color": [
+            "5",
+            "2"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "all~i~want~for~christmas",
+        "sprite": "all i want for christmas",
+        "color": [
+            "5",
+            "2"
+        ],
+        "tiling": "0"
+    },
     {
         "name": "text_aiwfc",
         "sprite": "text_all i want for christmas",
@@ -240,7 +276,7 @@
             "2",
             "3"
         ],
-        "tiling": "-1"
+        "tiling": "2"
     },
     {
         "name": "text_\u3068",

diff --git a/data/custom/dizzyandy-sprites.json b/data/custom/dizzyandy-sprites.json
@@ -483,7 +483,7 @@
             "1",
             "1"
         ],
-        "tiling": "2"
+        "tiling": "0"
     },
     {
         "name": "text_ixix",
@@ -692,6 +692,42 @@
         ],
         "tiling": "-1"
     },
+    {
+        "name": "two words",
+        "sprite": "two words",
+        "color": [
+            "6",
+            "3"
+        ],
+        "tiling": "0"
+    },
+    {
+        "name": "text_two words",
+        "sprite": "text_two words",
+        "color": [
+            "6",
+            "3"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "two~words",
+        "sprite": "two words",
+        "color": [
+            "6",
+            "3"
+        ],
+        "tiling": "0"
+    },
+    {
+        "name": "text_two~words",
+        "sprite": "text_two words",
+        "color": [
+            "6",
+            "3"
+        ],
+        "tiling": "-1"
+    },
     {
         "name": "tw",
         "sprite": "two words",
@@ -807,7 +843,7 @@
             "0",
             "3"
         ],
-        "tiling": "2"
+        "tiling": "0"
     },
     {
         "name": "text_del",
@@ -825,7 +861,7 @@
             "5",
             "3"
         ],
-        "tiling": "2"
+        "tiling": "0"
     },
     {
         "name": "text_new",
@@ -843,7 +879,7 @@
             "1",
             "4"
         ],
-        "tiling": "2"
+        "tiling": "0"
     },
     {
         "name": "text_letter",
@@ -1250,6 +1286,24 @@
         ],
         "tiling": "0"
     },
+    {
+        "name": "text_babacharacterthatlookslikethis",
+        "sprite": "text_babacharacterthatlookslikethis",
+        "color": [
+            "5",
+            "2"
+        ],
+        "tiling": "-1"
+    },
+    {
+        "name": "babacharacterthatlookslikethis",
+        "sprite": "babacharacterthatlookslikethis",
+        "color": [
+            "5",
+            "1"
+        ],
+        "tiling": "0"
+    },
     {
         "name": "text_bctllt",
         "sprite": "text_babacharacterthatlookslikethis",

diff --git a/data/custom/iiy.json b/data/custom/iiy.json
@@ -117,13 +117,13 @@
         "tiling": "0"
     },
     {
-        "name": "text_oc",
+        "name": "text_-oc",
         "sprite": "text_oc",
         "color": [
             "3",
             "4"
         ],
-        "tiling": "0"
+        "tiling": "-1"
     },
     {
         "name": "shiftoc",

diff --git a/data/custom/iwl-sprites.json b/data/custom/iwl-sprites.json
diff --git a/data/custom/konus-sprites.json b/data/custom/konus-sprites.json
diff --git a/data/custom/lumsel-sprites.json b/data/custom/lumsel-sprites.json
@@ -29,7 +29,7 @@
     {
         "name": "oni",
         "sprite": "oni",
-        "tiling": "4",
+        "tiling": "2",
         "color": [
             "0",
             "3"

diff --git a/data/custom/mathman-sprites.json b/data/custom/mathman-sprites.json
@@ -22,7 +22,7 @@
         "tiling": "-1"
     },
     {
-        "name": "text_de",
+        "name": "text_de2",
         "sprite": "text_de",
         "color": [
             "0",

diff --git a/data/custom/misc.json b/data/custom/misc.json
@@ -42,79 +42,89 @@
         "color": [
             "0",
             "3"
-        ]
+        ],
+        "tiling": "-1"
     },
     {
         "name": "point",
         "sprite": "point",
         "color": [
             "0",
             "3"
-        ]
+        ],
+        "tiling": "-1"
     },
     {
         "name": "comma",
         "sprite": "comma",
         "color": [
             "0",
             "3"
-        ]
+        ],
+        "tiling": "-1"
     },
     {
         "name": "text_'",
         "sprite": "text_'",
         "color": [
             "0",
             "3"
-        ]
+        ],
+        "tiling": "-1"
     },
     {
         "name": "text_asterisk",
         "sprite": "text_asterisk",
         "color": [
             "0",
             "3"
-        ]
+        ],
+        "tiling": "-1"
     },
     {
         "name": "slash",
         "sprite": "slash",
         "color": [
             "0",
             "3"
-        ]
+        ],
+        "tiling": "-1"
     },
     {
         "name": "minus",
         "sprite": "minus",
         "color": [
             "0",
             "3"
-        ]
+        ],
+        "tiling": "-1"
     },
     {
         "name": "equals",
         "sprite": "equals",
         "color": [
             "0",
             "3"
-        ]
+        ],
+        "tiling": "-1"
     },
     {
         "name": "no",
         "sprite": "no",
         "color": [
             "2",
             "2"
-        ]
+        ],
+        "tiling": "-1"
     },
     {
         "name": "yes",
         "sprite": "yes",
         "color": [
             "5",
             "3"
-        ]
+        ],
+        "tiling": "-1"
     },
     {
         "name": "hempuli",
@@ -513,7 +523,7 @@
         "tiling": "2"
     },
     {
-        "name": "page",
+        "name": "paige",
         "sprite": "page",
         "color": [
             "0",

diff --git a/data/custom/misc2.json b/data/custom/misc2.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,6 @@ @@
                 "4",
                 "1"
             ],
-            "tiling": "1"
+            "tiling": "-1"
         }
     ]