diff --git a/.gitignore b/.gitignore index 2abb34b..680254a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,8 @@ *.py[cow] __pycache__/ venv/ -index.5da4dcc7.js -index.5da4dcc7.js.map -index.js -state.* -bot.py -boykisser-big.png -image.png -logs.txt -rgb111-full.png -state-new.json -settings.json +_junk/ screenshots/ +settings.json avoid.png result.png diff --git a/async-bot.py b/async-bot.py index 629c68e..155d281 100644 --- a/async-bot.py +++ b/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": diff --git a/avoid_masks/noita_black_outline_179x111.png b/avoid_masks/noita_black_outline_179x111.png new file mode 100644 index 0000000..7358dcc Binary files /dev/null and b/avoid_masks/noita_black_outline_179x111.png differ diff --git a/astley.png b/pictures/astley.png similarity index 100% rename from astley.png rename to pictures/astley.png diff --git a/pictures/boykisser-big.png b/pictures/boykisser-big.png new file mode 100644 index 0000000..2cb3889 Binary files /dev/null and b/pictures/boykisser-big.png differ diff --git a/boykisser.png b/pictures/boykisser.png similarity index 100% rename from boykisser.png rename to pictures/boykisser.png diff --git a/casey.png b/pictures/casey.png similarity index 100% rename from casey.png rename to pictures/casey.png diff --git a/casey111.png b/pictures/casey111.png similarity index 100% rename from casey111.png rename to pictures/casey111.png diff --git a/casey565.png b/pictures/casey565.png similarity index 100% rename from casey565.png rename to pictures/casey565.png diff --git a/checkbox.png b/pictures/checkbox.png similarity index 100% rename from checkbox.png rename to pictures/checkbox.png diff --git a/colon3.png b/pictures/colon3.png similarity index 100% rename from colon3.png rename to pictures/colon3.png diff --git a/fedi.png b/pictures/fedi.png similarity index 100% rename from fedi.png rename to pictures/fedi.png diff --git a/glibc.png b/pictures/glibc.png similarity index 100% rename from glibc.png rename to pictures/glibc.png diff --git a/kangel.png b/pictures/kangel.png similarity index 100% rename from kangel.png rename to pictures/kangel.png diff --git a/lawbymike.png b/pictures/lawbymike.png similarity index 100% rename from lawbymike.png rename to pictures/lawbymike.png diff --git a/trans.png b/pictures/trans.png similarity index 100% rename from trans.png rename to pictures/trans.png diff --git a/transparen.png b/pictures/transparen.png similarity index 100% rename from transparen.png rename to pictures/transparen.png diff --git a/settings.json b/settings.json index 8b1fb0f..c19bd56 100644 --- a/settings.json +++ b/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 } ] }