Moved stuff, fixed stuff, added avoids

.gitignore

@@ -1,17 +1,8 @@
 *.py[cow]
 __pycache__/
 venv/
-index.5da4dcc7.js
+_junk/
-index.5da4dcc7.js.map
-index.js
-state.*
-bot.py
-boykisser-big.png
-image.png
-logs.txt
-rgb111-full.png
-state-new.json
-settings.json
 screenshots/
+settings.json
 avoid.png
 result.png

async-bot.py

@@ -138,7 +138,7 @@ async def amain():
                 )
             elif avoid["type"] == "range":
                 mgr.add_avoid_range(
-                    avoid["start"], avoid["stop"], avoid["step"]
+                    avoid["start"], avoid["stop"], avoid.get("step", 1)
                 )
         for elem in settings["elements"]:
             if elem["type"] == "text":

settings.json

@@ -20,56 +20,77 @@
       "w": 231,
       "h": 326,
       "description": "The Bald Critic"
+    },
+    {
+      "type": "rect",
+      "x": 0,
+      "y": 750,
+      "w": 123,
+      "h": 123,
+      "description": "catgirls.win QR code"
+    },
+    {
+      "type": "range",
+      "start": 900000,
+      "stop": 1000000,
+      "description": "catgirls.win text (both b64 and plain)"
+    },
+    {
+      "type": "rect",
+      "x": 400,
+      "y": 750,
+      "w": 400,
+      "h": 128,
+      "description": "'be gay do crime' sign"
+    },
+    {
+      "type": "image",
+      "path": "./avoid_masks/noita_black_outline_179x111.png",
+      "description": "Noita logo by Cr4xy"
     }
   ],
   "elements": [
     {
       "type": "rgb111",
-      "path": "./casey111.png",
+      "path": "./pictures/casey111.png",
       "x": 240,
       "y": 240
     },
     {
       "type": "rgb111",
-      "path": "./trans.png",
+      "path": "./pictures/trans.png",
       "x": 200,
       "y": 200
     },
     {
       "type": "image",
-      "path": "./casey.png",
+      "path": "./pictures/casey.png",
       "x": 256,
       "y": 256
     },
     {
       "type": "image",
-      "path": "./kangel.png",
+      "path": "./pictures/kangel.png",
       "x": 256,
       "y": 360
     },
     {
       "type": "image",
-      "path": "./boykisser.png",
+      "path": "./pictures/boykisser.png",
       "x": 69,
       "y": 420
     },
     {
       "type": "image",
-      "path": "./astley.png",
+      "path": "./pictures/astley.png",
       "x": 150,
       "y": 420
     },
     {
       "type": "image",
-      "path": "./colon3.png",
+      "path": "./pictures/colon3.png",
       "x": 333,
       "y": 333
-    },
-    {
-      "type": "text",
-      "text": "7H3 V01D C0N5UME5 U5 ALL",
-      "x": 32,
-      "y": 32
     }
   ]
 }