diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 10fa23f..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -art/game/__pycache__/ diff --git a/art/game/box_1x2_1-1.meta b/art/game/box_1x2_1-1.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_1x2_1-1.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_1x2_1-1_b.png b/art/game/box_1x2_1-1_b.png deleted file mode 100644 index 8685d8c..0000000 Binary files a/art/game/box_1x2_1-1_b.png and /dev/null differ diff --git a/art/game/box_1x2_1-1_g.png b/art/game/box_1x2_1-1_g.png deleted file mode 100644 index 14ef29a..0000000 Binary files a/art/game/box_1x2_1-1_g.png and /dev/null differ diff --git a/art/game/box_1x2_1-1_r.png b/art/game/box_1x2_1-1_r.png deleted file mode 100644 index a6b647b..0000000 Binary files a/art/game/box_1x2_1-1_r.png and /dev/null differ diff --git a/art/game/box_2x1_11.meta b/art/game/box_2x1_11.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x1_11.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x1_11_b.png b/art/game/box_2x1_11_b.png deleted file mode 100644 index cfc33fb..0000000 Binary files a/art/game/box_2x1_11_b.png and /dev/null differ diff --git a/art/game/box_2x1_11_g.png b/art/game/box_2x1_11_g.png deleted file mode 100644 index a75c188..0000000 Binary files a/art/game/box_2x1_11_g.png and /dev/null differ diff --git a/art/game/box_2x1_11_r.png b/art/game/box_2x1_11_r.png deleted file mode 100644 index 5b15a55..0000000 Binary files a/art/game/box_2x1_11_r.png and /dev/null differ diff --git a/art/game/box_2x2_01-11.meta b/art/game/box_2x2_01-11.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x2_01-11.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x2_01-11_b.png b/art/game/box_2x2_01-11_b.png deleted file mode 100644 index 4c2a951..0000000 Binary files a/art/game/box_2x2_01-11_b.png and /dev/null differ diff --git a/art/game/box_2x2_01-11_g.png b/art/game/box_2x2_01-11_g.png deleted file mode 100644 index 29bad2d..0000000 Binary files a/art/game/box_2x2_01-11_g.png and /dev/null differ diff --git a/art/game/box_2x2_01-11_r.png b/art/game/box_2x2_01-11_r.png deleted file mode 100644 index d7261b7..0000000 Binary files a/art/game/box_2x2_01-11_r.png and /dev/null differ diff --git a/art/game/box_2x2_10-11.meta b/art/game/box_2x2_10-11.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x2_10-11.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x2_10-11_b.png b/art/game/box_2x2_10-11_b.png deleted file mode 100644 index 32c1898..0000000 Binary files a/art/game/box_2x2_10-11_b.png and /dev/null differ diff --git a/art/game/box_2x2_10-11_g.png b/art/game/box_2x2_10-11_g.png deleted file mode 100644 index edd4a73..0000000 Binary files a/art/game/box_2x2_10-11_g.png and /dev/null differ diff --git a/art/game/box_2x2_10-11_r.png b/art/game/box_2x2_10-11_r.png deleted file mode 100644 index d7dffd9..0000000 Binary files a/art/game/box_2x2_10-11_r.png and /dev/null differ diff --git a/art/game/box_2x2_11-01.meta b/art/game/box_2x2_11-01.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x2_11-01.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x2_11-01_b.png b/art/game/box_2x2_11-01_b.png deleted file mode 100644 index 8b5d161..0000000 Binary files a/art/game/box_2x2_11-01_b.png and /dev/null differ diff --git a/art/game/box_2x2_11-01_g.png b/art/game/box_2x2_11-01_g.png deleted file mode 100644 index f50a714..0000000 Binary files a/art/game/box_2x2_11-01_g.png and /dev/null differ diff --git a/art/game/box_2x2_11-01_r.png b/art/game/box_2x2_11-01_r.png deleted file mode 100644 index 184def9..0000000 Binary files a/art/game/box_2x2_11-01_r.png and /dev/null differ diff --git a/art/game/box_2x2_11-10.meta b/art/game/box_2x2_11-10.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x2_11-10.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x2_11-10_b.png b/art/game/box_2x2_11-10_b.png deleted file mode 100644 index 48b1609..0000000 Binary files a/art/game/box_2x2_11-10_b.png and /dev/null differ diff --git a/art/game/box_2x2_11-10_g.png b/art/game/box_2x2_11-10_g.png deleted file mode 100644 index 5ca026f..0000000 Binary files a/art/game/box_2x2_11-10_g.png and /dev/null differ diff --git a/art/game/box_2x2_11-10_r.png b/art/game/box_2x2_11-10_r.png deleted file mode 100644 index 9e60204..0000000 Binary files a/art/game/box_2x2_11-10_r.png and /dev/null differ diff --git a/art/game/box_2x2_11-11.meta b/art/game/box_2x2_11-11.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x2_11-11.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x2_11-11_b.png b/art/game/box_2x2_11-11_b.png deleted file mode 100644 index 4700b24..0000000 Binary files a/art/game/box_2x2_11-11_b.png and /dev/null differ diff --git a/art/game/box_2x2_11-11_g.png b/art/game/box_2x2_11-11_g.png deleted file mode 100644 index 82114f8..0000000 Binary files a/art/game/box_2x2_11-11_g.png and /dev/null differ diff --git a/art/game/box_2x2_11-11_r.png b/art/game/box_2x2_11-11_r.png deleted file mode 100644 index 8a2891c..0000000 Binary files a/art/game/box_2x2_11-11_r.png and /dev/null differ diff --git a/art/game/box_2x3_01-01-11.meta b/art/game/box_2x3_01-01-11.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_01-01-11.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_01-01-11_b.png b/art/game/box_2x3_01-01-11_b.png deleted file mode 100644 index 9b8ab4b..0000000 Binary files a/art/game/box_2x3_01-01-11_b.png and /dev/null differ diff --git a/art/game/box_2x3_01-01-11_g.png b/art/game/box_2x3_01-01-11_g.png deleted file mode 100644 index 9f259cf..0000000 Binary files a/art/game/box_2x3_01-01-11_g.png and /dev/null differ diff --git a/art/game/box_2x3_01-01-11_r.png b/art/game/box_2x3_01-01-11_r.png deleted file mode 100644 index 22edc55..0000000 Binary files a/art/game/box_2x3_01-01-11_r.png and /dev/null differ diff --git a/art/game/box_2x3_01-11-01.meta b/art/game/box_2x3_01-11-01.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_01-11-01.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_01-11-01_b.png b/art/game/box_2x3_01-11-01_b.png deleted file mode 100644 index 667c5cd..0000000 Binary files a/art/game/box_2x3_01-11-01_b.png and /dev/null differ diff --git a/art/game/box_2x3_01-11-01_g.png b/art/game/box_2x3_01-11-01_g.png deleted file mode 100644 index f89161f..0000000 Binary files a/art/game/box_2x3_01-11-01_g.png and /dev/null differ diff --git a/art/game/box_2x3_01-11-01_r.png b/art/game/box_2x3_01-11-01_r.png deleted file mode 100644 index 4976436..0000000 Binary files a/art/game/box_2x3_01-11-01_r.png and /dev/null differ diff --git a/art/game/box_2x3_01-11-10.meta b/art/game/box_2x3_01-11-10.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_01-11-10.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_01-11-10_b.png b/art/game/box_2x3_01-11-10_b.png deleted file mode 100644 index 9c39f5d..0000000 Binary files a/art/game/box_2x3_01-11-10_b.png and /dev/null differ diff --git a/art/game/box_2x3_01-11-10_g.png b/art/game/box_2x3_01-11-10_g.png deleted file mode 100644 index 911ee0f..0000000 Binary files a/art/game/box_2x3_01-11-10_g.png and /dev/null differ diff --git a/art/game/box_2x3_01-11-10_r.png b/art/game/box_2x3_01-11-10_r.png deleted file mode 100644 index 437fbd1..0000000 Binary files a/art/game/box_2x3_01-11-10_r.png and /dev/null differ diff --git a/art/game/box_2x3_01-11-11.meta b/art/game/box_2x3_01-11-11.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_01-11-11.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_01-11-11_b.png b/art/game/box_2x3_01-11-11_b.png deleted file mode 100644 index c035f5b..0000000 Binary files a/art/game/box_2x3_01-11-11_b.png and /dev/null differ diff --git a/art/game/box_2x3_01-11-11_g.png b/art/game/box_2x3_01-11-11_g.png deleted file mode 100644 index 6a7cf92..0000000 Binary files a/art/game/box_2x3_01-11-11_g.png and /dev/null differ diff --git a/art/game/box_2x3_01-11-11_r.png b/art/game/box_2x3_01-11-11_r.png deleted file mode 100644 index dc29a62..0000000 Binary files a/art/game/box_2x3_01-11-11_r.png and /dev/null differ diff --git a/art/game/box_2x3_10-10-11.meta b/art/game/box_2x3_10-10-11.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_10-10-11.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_10-10-11_b.png b/art/game/box_2x3_10-10-11_b.png deleted file mode 100644 index 2f88bc4..0000000 Binary files a/art/game/box_2x3_10-10-11_b.png and /dev/null differ diff --git a/art/game/box_2x3_10-10-11_g.png b/art/game/box_2x3_10-10-11_g.png deleted file mode 100644 index 33e2229..0000000 Binary files a/art/game/box_2x3_10-10-11_g.png and /dev/null differ diff --git a/art/game/box_2x3_10-10-11_r.png b/art/game/box_2x3_10-10-11_r.png deleted file mode 100644 index 37fbd89..0000000 Binary files a/art/game/box_2x3_10-10-11_r.png and /dev/null differ diff --git a/art/game/box_2x3_10-11-01.meta b/art/game/box_2x3_10-11-01.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_10-11-01.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_10-11-01_b.png b/art/game/box_2x3_10-11-01_b.png deleted file mode 100644 index 38639ba..0000000 Binary files a/art/game/box_2x3_10-11-01_b.png and /dev/null differ diff --git a/art/game/box_2x3_10-11-01_g.png b/art/game/box_2x3_10-11-01_g.png deleted file mode 100644 index f2eeaee..0000000 Binary files a/art/game/box_2x3_10-11-01_g.png and /dev/null differ diff --git a/art/game/box_2x3_10-11-01_r.png b/art/game/box_2x3_10-11-01_r.png deleted file mode 100644 index 06ff5b9..0000000 Binary files a/art/game/box_2x3_10-11-01_r.png and /dev/null differ diff --git a/art/game/box_2x3_10-11-10.meta b/art/game/box_2x3_10-11-10.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_10-11-10.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_10-11-10_b.png b/art/game/box_2x3_10-11-10_b.png deleted file mode 100644 index 7841710..0000000 Binary files a/art/game/box_2x3_10-11-10_b.png and /dev/null differ diff --git a/art/game/box_2x3_10-11-10_g.png b/art/game/box_2x3_10-11-10_g.png deleted file mode 100644 index b25f2a9..0000000 Binary files a/art/game/box_2x3_10-11-10_g.png and /dev/null differ diff --git a/art/game/box_2x3_10-11-10_r.png b/art/game/box_2x3_10-11-10_r.png deleted file mode 100644 index 80a58ed..0000000 Binary files a/art/game/box_2x3_10-11-10_r.png and /dev/null differ diff --git a/art/game/box_2x3_10-11-11.meta b/art/game/box_2x3_10-11-11.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_10-11-11.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_10-11-11_b.png b/art/game/box_2x3_10-11-11_b.png deleted file mode 100644 index 83aa125..0000000 Binary files a/art/game/box_2x3_10-11-11_b.png and /dev/null differ diff --git a/art/game/box_2x3_10-11-11_g.png b/art/game/box_2x3_10-11-11_g.png deleted file mode 100644 index 82e9eb0..0000000 Binary files a/art/game/box_2x3_10-11-11_g.png and /dev/null differ diff --git a/art/game/box_2x3_10-11-11_r.png b/art/game/box_2x3_10-11-11_r.png deleted file mode 100644 index 847c502..0000000 Binary files a/art/game/box_2x3_10-11-11_r.png and /dev/null differ diff --git a/art/game/box_2x3_11-01-01.meta b/art/game/box_2x3_11-01-01.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_11-01-01.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_11-01-01_b.png b/art/game/box_2x3_11-01-01_b.png deleted file mode 100644 index b5d81f4..0000000 Binary files a/art/game/box_2x3_11-01-01_b.png and /dev/null differ diff --git a/art/game/box_2x3_11-01-01_g.png b/art/game/box_2x3_11-01-01_g.png deleted file mode 100644 index 88313e3..0000000 Binary files a/art/game/box_2x3_11-01-01_g.png and /dev/null differ diff --git a/art/game/box_2x3_11-01-01_r.png b/art/game/box_2x3_11-01-01_r.png deleted file mode 100644 index dbd3030..0000000 Binary files a/art/game/box_2x3_11-01-01_r.png and /dev/null differ diff --git a/art/game/box_2x3_11-01-11.meta b/art/game/box_2x3_11-01-11.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_11-01-11.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_11-01-11_b.png b/art/game/box_2x3_11-01-11_b.png deleted file mode 100644 index 184839c..0000000 Binary files a/art/game/box_2x3_11-01-11_b.png and /dev/null differ diff --git a/art/game/box_2x3_11-01-11_g.png b/art/game/box_2x3_11-01-11_g.png deleted file mode 100644 index dc36c58..0000000 Binary files a/art/game/box_2x3_11-01-11_g.png and /dev/null differ diff --git a/art/game/box_2x3_11-01-11_r.png b/art/game/box_2x3_11-01-11_r.png deleted file mode 100644 index 3b32467..0000000 Binary files a/art/game/box_2x3_11-01-11_r.png and /dev/null differ diff --git a/art/game/box_2x3_11-10-10.meta b/art/game/box_2x3_11-10-10.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_11-10-10.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_11-10-10_b.png b/art/game/box_2x3_11-10-10_b.png deleted file mode 100644 index 8de459e..0000000 Binary files a/art/game/box_2x3_11-10-10_b.png and /dev/null differ diff --git a/art/game/box_2x3_11-10-10_g.png b/art/game/box_2x3_11-10-10_g.png deleted file mode 100644 index b03e643..0000000 Binary files a/art/game/box_2x3_11-10-10_g.png and /dev/null differ diff --git a/art/game/box_2x3_11-10-10_r.png b/art/game/box_2x3_11-10-10_r.png deleted file mode 100644 index e13af86..0000000 Binary files a/art/game/box_2x3_11-10-10_r.png and /dev/null differ diff --git a/art/game/box_2x3_11-10-11.meta b/art/game/box_2x3_11-10-11.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_11-10-11.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_11-10-11_b.png b/art/game/box_2x3_11-10-11_b.png deleted file mode 100644 index 4449aa0..0000000 Binary files a/art/game/box_2x3_11-10-11_b.png and /dev/null differ diff --git a/art/game/box_2x3_11-10-11_g.png b/art/game/box_2x3_11-10-11_g.png deleted file mode 100644 index f767b6d..0000000 Binary files a/art/game/box_2x3_11-10-11_g.png and /dev/null differ diff --git a/art/game/box_2x3_11-10-11_r.png b/art/game/box_2x3_11-10-11_r.png deleted file mode 100644 index d04d2da..0000000 Binary files a/art/game/box_2x3_11-10-11_r.png and /dev/null differ diff --git a/art/game/box_2x3_11-11-01.meta b/art/game/box_2x3_11-11-01.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_11-11-01.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_11-11-01_b.png b/art/game/box_2x3_11-11-01_b.png deleted file mode 100644 index 9561e54..0000000 Binary files a/art/game/box_2x3_11-11-01_b.png and /dev/null differ diff --git a/art/game/box_2x3_11-11-01_g.png b/art/game/box_2x3_11-11-01_g.png deleted file mode 100644 index 29e0ba7..0000000 Binary files a/art/game/box_2x3_11-11-01_g.png and /dev/null differ diff --git a/art/game/box_2x3_11-11-01_r.png b/art/game/box_2x3_11-11-01_r.png deleted file mode 100644 index ae6f53c..0000000 Binary files a/art/game/box_2x3_11-11-01_r.png and /dev/null differ diff --git a/art/game/box_2x3_11-11-10.meta b/art/game/box_2x3_11-11-10.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_11-11-10.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_11-11-10_b.png b/art/game/box_2x3_11-11-10_b.png deleted file mode 100644 index 671cea9..0000000 Binary files a/art/game/box_2x3_11-11-10_b.png and /dev/null differ diff --git a/art/game/box_2x3_11-11-10_g.png b/art/game/box_2x3_11-11-10_g.png deleted file mode 100644 index bb3b0a6..0000000 Binary files a/art/game/box_2x3_11-11-10_g.png and /dev/null differ diff --git a/art/game/box_2x3_11-11-10_r.png b/art/game/box_2x3_11-11-10_r.png deleted file mode 100644 index e07ee67..0000000 Binary files a/art/game/box_2x3_11-11-10_r.png and /dev/null differ diff --git a/art/game/box_2x3_11-11-11.meta b/art/game/box_2x3_11-11-11.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_2x3_11-11-11.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_2x3_11-11-11_b.png b/art/game/box_2x3_11-11-11_b.png deleted file mode 100644 index 7d99192..0000000 Binary files a/art/game/box_2x3_11-11-11_b.png and /dev/null differ diff --git a/art/game/box_2x3_11-11-11_g.png b/art/game/box_2x3_11-11-11_g.png deleted file mode 100644 index d95fcb7..0000000 Binary files a/art/game/box_2x3_11-11-11_g.png and /dev/null differ diff --git a/art/game/box_2x3_11-11-11_r.png b/art/game/box_2x3_11-11-11_r.png deleted file mode 100644 index f143e9c..0000000 Binary files a/art/game/box_2x3_11-11-11_r.png and /dev/null differ diff --git a/art/game/box_3x2_001-111.meta b/art/game/box_3x2_001-111.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_001-111.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_001-111_b.png b/art/game/box_3x2_001-111_b.png deleted file mode 100644 index c41bf3b..0000000 Binary files a/art/game/box_3x2_001-111_b.png and /dev/null differ diff --git a/art/game/box_3x2_001-111_g.png b/art/game/box_3x2_001-111_g.png deleted file mode 100644 index fa79a67..0000000 Binary files a/art/game/box_3x2_001-111_g.png and /dev/null differ diff --git a/art/game/box_3x2_001-111_r.png b/art/game/box_3x2_001-111_r.png deleted file mode 100644 index 0823bfa..0000000 Binary files a/art/game/box_3x2_001-111_r.png and /dev/null differ diff --git a/art/game/box_3x2_010-111.meta b/art/game/box_3x2_010-111.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_010-111.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_010-111_b.png b/art/game/box_3x2_010-111_b.png deleted file mode 100644 index 6db1c86..0000000 Binary files a/art/game/box_3x2_010-111_b.png and /dev/null differ diff --git a/art/game/box_3x2_010-111_g.png b/art/game/box_3x2_010-111_g.png deleted file mode 100644 index 3f2a208..0000000 Binary files a/art/game/box_3x2_010-111_g.png and /dev/null differ diff --git a/art/game/box_3x2_010-111_r.png b/art/game/box_3x2_010-111_r.png deleted file mode 100644 index c5f1cfd..0000000 Binary files a/art/game/box_3x2_010-111_r.png and /dev/null differ diff --git a/art/game/box_3x2_011-110.meta b/art/game/box_3x2_011-110.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_011-110.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_011-110_b.png b/art/game/box_3x2_011-110_b.png deleted file mode 100644 index a2ba1cc..0000000 Binary files a/art/game/box_3x2_011-110_b.png and /dev/null differ diff --git a/art/game/box_3x2_011-110_g.png b/art/game/box_3x2_011-110_g.png deleted file mode 100644 index 3613555..0000000 Binary files a/art/game/box_3x2_011-110_g.png and /dev/null differ diff --git a/art/game/box_3x2_011-110_r.png b/art/game/box_3x2_011-110_r.png deleted file mode 100644 index d441967..0000000 Binary files a/art/game/box_3x2_011-110_r.png and /dev/null differ diff --git a/art/game/box_3x2_011-111.meta b/art/game/box_3x2_011-111.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_011-111.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_011-111_b.png b/art/game/box_3x2_011-111_b.png deleted file mode 100644 index 7572289..0000000 Binary files a/art/game/box_3x2_011-111_b.png and /dev/null differ diff --git a/art/game/box_3x2_011-111_g.png b/art/game/box_3x2_011-111_g.png deleted file mode 100644 index 2c3d15d..0000000 Binary files a/art/game/box_3x2_011-111_g.png and /dev/null differ diff --git a/art/game/box_3x2_011-111_r.png b/art/game/box_3x2_011-111_r.png deleted file mode 100644 index 1d148f1..0000000 Binary files a/art/game/box_3x2_011-111_r.png and /dev/null differ diff --git a/art/game/box_3x2_100-111.meta b/art/game/box_3x2_100-111.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_100-111.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_100-111_b.png b/art/game/box_3x2_100-111_b.png deleted file mode 100644 index f7395d1..0000000 Binary files a/art/game/box_3x2_100-111_b.png and /dev/null differ diff --git a/art/game/box_3x2_100-111_g.png b/art/game/box_3x2_100-111_g.png deleted file mode 100644 index 034ee69..0000000 Binary files a/art/game/box_3x2_100-111_g.png and /dev/null differ diff --git a/art/game/box_3x2_100-111_r.png b/art/game/box_3x2_100-111_r.png deleted file mode 100644 index c5e1a2b..0000000 Binary files a/art/game/box_3x2_100-111_r.png and /dev/null differ diff --git a/art/game/box_3x2_101-111.meta b/art/game/box_3x2_101-111.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_101-111.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_101-111_b.png b/art/game/box_3x2_101-111_b.png deleted file mode 100644 index 596bae4..0000000 Binary files a/art/game/box_3x2_101-111_b.png and /dev/null differ diff --git a/art/game/box_3x2_101-111_g.png b/art/game/box_3x2_101-111_g.png deleted file mode 100644 index 543f21a..0000000 Binary files a/art/game/box_3x2_101-111_g.png and /dev/null differ diff --git a/art/game/box_3x2_101-111_r.png b/art/game/box_3x2_101-111_r.png deleted file mode 100644 index 6f23da8..0000000 Binary files a/art/game/box_3x2_101-111_r.png and /dev/null differ diff --git a/art/game/box_3x2_110-011.meta b/art/game/box_3x2_110-011.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_110-011.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_110-011_b.png b/art/game/box_3x2_110-011_b.png deleted file mode 100644 index fcfa358..0000000 Binary files a/art/game/box_3x2_110-011_b.png and /dev/null differ diff --git a/art/game/box_3x2_110-011_g.png b/art/game/box_3x2_110-011_g.png deleted file mode 100644 index dfda67b..0000000 Binary files a/art/game/box_3x2_110-011_g.png and /dev/null differ diff --git a/art/game/box_3x2_110-011_r.png b/art/game/box_3x2_110-011_r.png deleted file mode 100644 index 4b3eab8..0000000 Binary files a/art/game/box_3x2_110-011_r.png and /dev/null differ diff --git a/art/game/box_3x2_110-111.meta b/art/game/box_3x2_110-111.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_110-111.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_110-111_b.png b/art/game/box_3x2_110-111_b.png deleted file mode 100644 index 6808a63..0000000 Binary files a/art/game/box_3x2_110-111_b.png and /dev/null differ diff --git a/art/game/box_3x2_110-111_g.png b/art/game/box_3x2_110-111_g.png deleted file mode 100644 index 6c2d2d4..0000000 Binary files a/art/game/box_3x2_110-111_g.png and /dev/null differ diff --git a/art/game/box_3x2_110-111_r.png b/art/game/box_3x2_110-111_r.png deleted file mode 100644 index e085d49..0000000 Binary files a/art/game/box_3x2_110-111_r.png and /dev/null differ diff --git a/art/game/box_3x2_111-001.meta b/art/game/box_3x2_111-001.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_111-001.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_111-001_b.png b/art/game/box_3x2_111-001_b.png deleted file mode 100644 index 2878be9..0000000 Binary files a/art/game/box_3x2_111-001_b.png and /dev/null differ diff --git a/art/game/box_3x2_111-001_g.png b/art/game/box_3x2_111-001_g.png deleted file mode 100644 index f5ce4fe..0000000 Binary files a/art/game/box_3x2_111-001_g.png and /dev/null differ diff --git a/art/game/box_3x2_111-001_r.png b/art/game/box_3x2_111-001_r.png deleted file mode 100644 index e26702c..0000000 Binary files a/art/game/box_3x2_111-001_r.png and /dev/null differ diff --git a/art/game/box_3x2_111-010.meta b/art/game/box_3x2_111-010.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_111-010.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_111-010_b.png b/art/game/box_3x2_111-010_b.png deleted file mode 100644 index fe36f05..0000000 Binary files a/art/game/box_3x2_111-010_b.png and /dev/null differ diff --git a/art/game/box_3x2_111-010_g.png b/art/game/box_3x2_111-010_g.png deleted file mode 100644 index f19e173..0000000 Binary files a/art/game/box_3x2_111-010_g.png and /dev/null differ diff --git a/art/game/box_3x2_111-010_r.png b/art/game/box_3x2_111-010_r.png deleted file mode 100644 index 805143e..0000000 Binary files a/art/game/box_3x2_111-010_r.png and /dev/null differ diff --git a/art/game/box_3x2_111-011.meta b/art/game/box_3x2_111-011.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_111-011.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_111-011_b.png b/art/game/box_3x2_111-011_b.png deleted file mode 100644 index 7b4da5f..0000000 Binary files a/art/game/box_3x2_111-011_b.png and /dev/null differ diff --git a/art/game/box_3x2_111-011_g.png b/art/game/box_3x2_111-011_g.png deleted file mode 100644 index 8ae838a..0000000 Binary files a/art/game/box_3x2_111-011_g.png and /dev/null differ diff --git a/art/game/box_3x2_111-011_r.png b/art/game/box_3x2_111-011_r.png deleted file mode 100644 index d93d3f7..0000000 Binary files a/art/game/box_3x2_111-011_r.png and /dev/null differ diff --git a/art/game/box_3x2_111-100.meta b/art/game/box_3x2_111-100.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_111-100.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_111-100_b.png b/art/game/box_3x2_111-100_b.png deleted file mode 100644 index 3244a3c..0000000 Binary files a/art/game/box_3x2_111-100_b.png and /dev/null differ diff --git a/art/game/box_3x2_111-100_g.png b/art/game/box_3x2_111-100_g.png deleted file mode 100644 index d7f664b..0000000 Binary files a/art/game/box_3x2_111-100_g.png and /dev/null differ diff --git a/art/game/box_3x2_111-100_r.png b/art/game/box_3x2_111-100_r.png deleted file mode 100644 index eb456d4..0000000 Binary files a/art/game/box_3x2_111-100_r.png and /dev/null differ diff --git a/art/game/box_3x2_111-101.meta b/art/game/box_3x2_111-101.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_111-101.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_111-101_b.png b/art/game/box_3x2_111-101_b.png deleted file mode 100644 index 6047159..0000000 Binary files a/art/game/box_3x2_111-101_b.png and /dev/null differ diff --git a/art/game/box_3x2_111-101_g.png b/art/game/box_3x2_111-101_g.png deleted file mode 100644 index e52f10d..0000000 Binary files a/art/game/box_3x2_111-101_g.png and /dev/null differ diff --git a/art/game/box_3x2_111-101_r.png b/art/game/box_3x2_111-101_r.png deleted file mode 100644 index 4135dd0..0000000 Binary files a/art/game/box_3x2_111-101_r.png and /dev/null differ diff --git a/art/game/box_3x2_111-110.meta b/art/game/box_3x2_111-110.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_111-110.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_111-110_b.png b/art/game/box_3x2_111-110_b.png deleted file mode 100644 index fa34e59..0000000 Binary files a/art/game/box_3x2_111-110_b.png and /dev/null differ diff --git a/art/game/box_3x2_111-110_g.png b/art/game/box_3x2_111-110_g.png deleted file mode 100644 index 955c94e..0000000 Binary files a/art/game/box_3x2_111-110_g.png and /dev/null differ diff --git a/art/game/box_3x2_111-110_r.png b/art/game/box_3x2_111-110_r.png deleted file mode 100644 index 0a00a2d..0000000 Binary files a/art/game/box_3x2_111-110_r.png and /dev/null differ diff --git a/art/game/box_3x2_111-111.meta b/art/game/box_3x2_111-111.meta deleted file mode 100644 index 723fa60..0000000 --- a/art/game/box_3x2_111-111.meta +++ /dev/null @@ -1 +0,0 @@ -{class="moveable"} \ No newline at end of file diff --git a/art/game/box_3x2_111-111_b.png b/art/game/box_3x2_111-111_b.png deleted file mode 100644 index 050cb53..0000000 Binary files a/art/game/box_3x2_111-111_b.png and /dev/null differ diff --git a/art/game/box_3x2_111-111_g.png b/art/game/box_3x2_111-111_g.png deleted file mode 100644 index d294f87..0000000 Binary files a/art/game/box_3x2_111-111_g.png and /dev/null differ diff --git a/art/game/box_3x2_111-111_r.png b/art/game/box_3x2_111-111_r.png deleted file mode 100644 index 56d9ffd..0000000 Binary files a/art/game/box_3x2_111-111_r.png and /dev/null differ diff --git a/art/game/gen_composite_boxes.py b/art/game/gen_composite_boxes.py deleted file mode 100644 index 57d130b..0000000 --- a/art/game/gen_composite_boxes.py +++ /dev/null @@ -1,136 +0,0 @@ -#!/usr/bin/env python3 -"""Generate multi-cell "box" sprites for CHROMA SOLSTICE. - -Each cell is 16x16. A single box has a 1px transparent margin on every edge -(so a 14x14 body inside 16x16). For multi-cell blocks we keep that 1px margin -only on the *outer* silhouette of the block -- edges that could touch other -things in the level -- while cells that are part of the same block stay truly -connected (no seam, no internal margin). - -The per-channel fill is the same concentric-ring format as the shipped -box_r / box_g / box_b: a pixel is decided purely by k, its inset depth -(chebyshev distance in from the nearest outside pixel, minus 1; k==0 is the -margin ring and is always transparent). The three channels each leave their -own gaps so the colors underneath stay visible when drawn additively. - - red ON: k in {1,2} or k>=5 (2px ring, 2px gap, solid core) - green ON: k odd or k>=5 (alternating 1px rings, solid core) - blue ON: k==1 or k>=4 (1px ring, 2px gap, solid core) - -Run from inside art/game/ : python3 gen_composite_boxes.py -""" -from itertools import product -from collections import deque -from PIL import Image - -CELL = 16 - -RULES = { - 'r': lambda k: (1 <= k <= 2) or (k >= 5), - 'g': lambda k: (k >= 5) or (k >= 1 and k % 2 == 1), - 'b': lambda k: (k == 1) or (k >= 4), -} - - -def inset_grid(cells, W, H): - """Return k[y][x] for the W*CELL x H*CELL pixel grid (-1 = outside).""" - Wp, Hp = W * CELL, H * CELL - occ = [[False] * Wp for _ in range(Hp)] - for (cx, cy) in cells: - for y in range(cy * CELL, cy * CELL + CELL): - for x in range(cx * CELL, cx * CELL + CELL): - occ[y][x] = True - - INF = 10 ** 9 - dist = [[INF] * Wp for _ in range(Hp)] - dq = deque() - for y in range(Hp): - for x in range(Wp): - if not occ[y][x]: - dist[y][x] = 0 - dq.append((x, y)) - while dq: # multi-source BFS with chebyshev (8-neighbour) steps - x, y = dq.popleft() - for dy in (-1, 0, 1): - for dx in (-1, 0, 1): - if dx == 0 and dy == 0: - continue - nx, ny = x + dx, y + dy - if 0 <= nx < Wp and 0 <= ny < Hp and dist[ny][nx] > dist[y][x] + 1: - dist[ny][nx] = dist[y][x] + 1 - dq.append((nx, ny)) - - k = [[-1] * Wp for _ in range(Hp)] - for y in range(Hp): - for x in range(Wp): - if occ[y][x]: - # the region beyond the image edge counts as outside too - edged = min(x + 1, Wp - x, y + 1, Hp - y) - k[y][x] = min(dist[y][x], edged) - 1 - return k - - -def render(cells, W, H, channel): - k = inset_grid(cells, W, H) - rule = RULES[channel] - img = Image.new('RGBA', (W * CELL, H * CELL), (0, 0, 0, 0)) - px = img.load() - for y in range(H * CELL): - for x in range(W * CELL): - if k[y][x] >= 0 and rule(k[y][x]): - px[x, y] = (255, 255, 255, 255) - return img - - -def connected(cells): - cells = set(cells) - start = next(iter(cells)) - seen = {start} - stack = [start] - while stack: - x, y = stack.pop() - for dx, dy in ((1, 0), (-1, 0), (0, 1), (0, -1)): - n = (x + dx, y + dy) - if n in cells and n not in seen: - seen.add(n) - stack.append(n) - return len(seen) == len(cells) - - -def enum(W, H): - """All connected polyominoes whose bounding box is exactly W x H.""" - coords = [(x, y) for y in range(H) for x in range(W)] - out = [] - for bits in range(1, 1 << (W * H)): - cells = [coords[i] for i in range(W * H) if bits >> i & 1] - if len(cells) < 2: - continue - xs = [c[0] for c in cells] - ys = [c[1] for c in cells] - if min(xs) != 0 or max(xs) != W - 1 or min(ys) != 0 or max(ys) != H - 1: - continue - if not connected(cells): - continue - out.append(cells) - return out - - -def mask_name(cells, W, H): - rows = [['0'] * W for _ in range(H)] - for x, y in cells: - rows[y][x] = '1' - return '-'.join(''.join(r) for r in rows) - - -BBOXES = [(1, 2), (2, 1), (2, 2), (3, 2), (2, 3)] - -if __name__ == '__main__': - total = 0 - for (W, H) in BBOXES: - for cells in enum(W, H): - mask = mask_name(cells, W, H) - for ch in 'rgb': - fn = 'box_%dx%d_%s_%s.png' % (W, H, mask, ch) - render(cells, W, H, ch).save(fn) - total += 1 - print('wrote %d files' % total) diff --git a/generic_moveable.lua b/generic_moveable.lua index f92ded3..dced70c 100644 --- a/generic_moveable.lua +++ b/generic_moveable.lua @@ -2,15 +2,14 @@ require "entity" GenericMoveable = class("GenericMoveable", Entity) -function GenericMoveable:initialize(x, y, color, sprite, name, cellShape) +function GenericMoveable:initialize(x, y, color, sprite, name) Entity.initialize(self, { name = name, x = x, y = y, color = color, collision = "moveable", - sprite = sprite, - cellShape = cellShape + sprite = sprite }) end diff --git a/generic_unmoveable.lua b/generic_unmoveable.lua index 4c15b44..7ab390e 100644 --- a/generic_unmoveable.lua +++ b/generic_unmoveable.lua @@ -2,14 +2,13 @@ require "entity" GenericUnmoveable = class("GenericUnmoveable", Entity) -function GenericUnmoveable:initialize(x, y, color, sprite, cellShape) +function GenericUnmoveable:initialize(x, y, color, sprite) Entity.initialize(self, { x = x, y = y, color = color, collision = "unmoveable", - sprite = sprite, - cellShape = cellShape + sprite = sprite }) end diff --git a/level_editor/editor.lua b/level_editor/editor.lua index 524b9a5..a6603c5 100644 --- a/level_editor/editor.lua +++ b/level_editor/editor.lua @@ -178,6 +178,7 @@ local function rebuildAssetSearchButtons() end table.sort(names) for index, asset in ipairs(names) do + if index > 8 then break end local sprites = {} for color, location in pairs(gameAssets[asset].sprites) do sprites[color] = love.graphics.newImage(location) end table.insert(assetSearchButtons, createUIElement{ diff --git a/level_editor/object_attributes.lua b/level_editor/object_attributes.lua index 71f0a64..2ab6257 100644 --- a/level_editor/object_attributes.lua +++ b/level_editor/object_attributes.lua @@ -43,14 +43,10 @@ function getAllAssets() local sprite = topFolder .. "/" .. folder .. "/" .. fileToAnalyze globalAssetProperties[name].sprites[color] = sprite - -- Precompute the occupied-cell shape once per asset/colour and - -- cache it here; entities share this table by reference so - -- collision never rescans pixels at runtime. Keyed per colour - -- (each channel leaves its own gaps) rather than reset per file. - globalAssetProperties[name].cells = globalAssetProperties[name].cells or {} - if not globalAssetProperties[name].cells[color] or reanalyzeCells then + if not globalAssetProperties[name].cells or reanalyzeCells then + globalAssetProperties[name].cells = {} globalAssetProperties[name].cells[color] = getCellsFromSprite(sprite) - end + end end end end diff --git a/room.lua b/room.lua index 69c1314..99d0478 100644 --- a/room.lua +++ b/room.lua @@ -570,15 +570,10 @@ function Room:createEntity(class, color, x, y) self:setActiveColor(color, true) elseif props and props.sprites and props.sprites[color] then local sprite = loadSprite(props.sprites[color]) - -- Reuse the cell shape precomputed by getAllAssets (nil/empty falls back - -- to the full sprite rectangle inside Entity), so an L/U/notched block - -- collides on its real cells and its gaps read as empty space. - local cellShape = props.cells and props.cells[color] - if cellShape and #cellShape == 0 then cellShape = nil end if behavior == "moveable" then - entity = GenericMoveable:new(x, y, color, sprite, class, cellShape) + entity = GenericMoveable:new(x, y, color, sprite, class) else - entity = GenericUnmoveable:new(x, y, color, sprite, cellShape) + entity = GenericUnmoveable:new(x, y, color, sprite) end self:registerCollidable(entity, {color}) end