diff --git a/equip/amu_1_32.jpg b/equip/amu_1_32.jpg deleted file mode 100644 index 00371f9..0000000 Binary files a/equip/amu_1_32.jpg and /dev/null differ diff --git a/equip/amu_2_32.jpg b/equip/amu_2_32.jpg deleted file mode 100644 index 2ac45e9..0000000 Binary files a/equip/amu_2_32.jpg and /dev/null differ diff --git a/equip/amu_3_32.jpg b/equip/amu_3_32.jpg deleted file mode 100644 index 17feef2..0000000 Binary files a/equip/amu_3_32.jpg and /dev/null differ diff --git a/equip/amu_4_32.jpg b/equip/amu_4_32.jpg deleted file mode 100644 index 3f09e11..0000000 Binary files a/equip/amu_4_32.jpg and /dev/null differ diff --git a/equip/amu_5_32.jpg b/equip/amu_5_32.jpg deleted file mode 100644 index ad67dd8..0000000 Binary files a/equip/amu_5_32.jpg and /dev/null differ diff --git a/equip/amu_e2_32.jpg b/equip/amu_e2_32.jpg deleted file mode 100644 index ccca41c..0000000 Binary files a/equip/amu_e2_32.jpg and /dev/null differ diff --git a/equip/amu_e_32.jpg b/equip/amu_e_32.jpg deleted file mode 100644 index 3cd9359..0000000 Binary files a/equip/amu_e_32.jpg and /dev/null differ diff --git a/equip/amus/amu_1_32-mask.png b/equip/amus/amu_1_32-mask.png new file mode 100644 index 0000000..3b104ed Binary files /dev/null and b/equip/amus/amu_1_32-mask.png differ diff --git a/equip/amus/amu_1_32.jpg b/equip/amus/amu_1_32.jpg new file mode 100644 index 0000000..f02278c Binary files /dev/null and b/equip/amus/amu_1_32.jpg differ diff --git a/equip/amus/amu_1_32.png b/equip/amus/amu_1_32.png new file mode 100644 index 0000000..f526401 Binary files /dev/null and b/equip/amus/amu_1_32.png differ diff --git a/equip/amus/amu_2_32-mask.png b/equip/amus/amu_2_32-mask.png new file mode 100644 index 0000000..643c187 Binary files /dev/null and b/equip/amus/amu_2_32-mask.png differ diff --git a/equip/amus/amu_2_32.jpg b/equip/amus/amu_2_32.jpg new file mode 100644 index 0000000..9007306 Binary files /dev/null and b/equip/amus/amu_2_32.jpg differ diff --git a/equip/amus/amu_2_32.png b/equip/amus/amu_2_32.png new file mode 100644 index 0000000..5f0838b Binary files /dev/null and b/equip/amus/amu_2_32.png differ diff --git a/equip/amus/amu_3_32-mask.png b/equip/amus/amu_3_32-mask.png new file mode 100644 index 0000000..faf6062 Binary files /dev/null and b/equip/amus/amu_3_32-mask.png differ diff --git a/equip/amus/amu_3_32.jpg b/equip/amus/amu_3_32.jpg new file mode 100644 index 0000000..b161af7 Binary files /dev/null and b/equip/amus/amu_3_32.jpg differ diff --git a/equip/amus/amu_3_32.png b/equip/amus/amu_3_32.png new file mode 100644 index 0000000..5bd1e5e Binary files /dev/null and b/equip/amus/amu_3_32.png differ diff --git a/equip/amus/amu_4_32-mask.png b/equip/amus/amu_4_32-mask.png new file mode 100644 index 0000000..e41c431 Binary files /dev/null and b/equip/amus/amu_4_32-mask.png differ diff --git a/equip/amus/amu_4_32.jpg b/equip/amus/amu_4_32.jpg new file mode 100644 index 0000000..6cbfd9e Binary files /dev/null and b/equip/amus/amu_4_32.jpg differ diff --git a/equip/amus/amu_4_32.png b/equip/amus/amu_4_32.png new file mode 100644 index 0000000..b1dd5d4 Binary files /dev/null and b/equip/amus/amu_4_32.png differ diff --git a/equip/amus/amu_5_32-mask.png b/equip/amus/amu_5_32-mask.png new file mode 100644 index 0000000..21e9073 Binary files /dev/null and b/equip/amus/amu_5_32-mask.png differ diff --git a/equip/amus/amu_5_32.jpg b/equip/amus/amu_5_32.jpg new file mode 100644 index 0000000..947f24d Binary files /dev/null and b/equip/amus/amu_5_32.jpg differ diff --git a/equip/amus/amu_5_32.png b/equip/amus/amu_5_32.png new file mode 100644 index 0000000..767c9ae Binary files /dev/null and b/equip/amus/amu_5_32.png differ diff --git a/equip/amus/amu_6_32-mask.png b/equip/amus/amu_6_32-mask.png new file mode 100644 index 0000000..458cb51 Binary files /dev/null and b/equip/amus/amu_6_32-mask.png differ diff --git a/equip/amu_6_32.jpg b/equip/amus/amu_6_32.jpg similarity index 100% rename from equip/amu_6_32.jpg rename to equip/amus/amu_6_32.jpg diff --git a/equip/amus/amu_6_32.png b/equip/amus/amu_6_32.png new file mode 100644 index 0000000..dcca79f Binary files /dev/null and b/equip/amus/amu_6_32.png differ diff --git a/equip/amus/amu_7_32-mask.png b/equip/amus/amu_7_32-mask.png new file mode 100644 index 0000000..f6762c9 Binary files /dev/null and b/equip/amus/amu_7_32-mask.png differ diff --git a/equip/amu_7_32.jpg b/equip/amus/amu_7_32.jpg similarity index 100% rename from equip/amu_7_32.jpg rename to equip/amus/amu_7_32.jpg diff --git a/equip/amus/amu_7_32.png b/equip/amus/amu_7_32.png new file mode 100644 index 0000000..4e7ee76 Binary files /dev/null and b/equip/amus/amu_7_32.png differ diff --git a/equip/bag_1_32.jpg b/equip/bag_1_32.jpg deleted file mode 100644 index 9c9eb5a..0000000 Binary files a/equip/bag_1_32.jpg and /dev/null differ diff --git a/equip/bag_2_32.jpg b/equip/bag_2_32.jpg deleted file mode 100644 index e493f14..0000000 Binary files a/equip/bag_2_32.jpg and /dev/null differ diff --git a/equip/bag_3_32.jpg b/equip/bag_3_32.jpg deleted file mode 100644 index 2a4376c..0000000 Binary files a/equip/bag_3_32.jpg and /dev/null differ diff --git a/equip/bag_4_32.jpg b/equip/bag_4_32.jpg deleted file mode 100644 index 389a2e6..0000000 Binary files a/equip/bag_4_32.jpg and /dev/null differ diff --git a/equip/bag_5_32.jpg b/equip/bag_5_32.jpg deleted file mode 100644 index 8c80c39..0000000 Binary files a/equip/bag_5_32.jpg and /dev/null differ diff --git a/equip/bag_6_32.jpg b/equip/bag_6_32.jpg deleted file mode 100644 index d1b3a27..0000000 Binary files a/equip/bag_6_32.jpg and /dev/null differ diff --git a/equip/bag_7_32.jpg b/equip/bag_7_32.jpg deleted file mode 100644 index a92400c..0000000 Binary files a/equip/bag_7_32.jpg and /dev/null differ diff --git a/equip/bags/bag_1_32-mask.png b/equip/bags/bag_1_32-mask.png new file mode 100644 index 0000000..6b99b2c Binary files /dev/null and b/equip/bags/bag_1_32-mask.png differ diff --git a/equip/bags/bag_1_32.jpg b/equip/bags/bag_1_32.jpg new file mode 100644 index 0000000..1d4797d Binary files /dev/null and b/equip/bags/bag_1_32.jpg differ diff --git a/equip/bags/bag_1_32.png b/equip/bags/bag_1_32.png new file mode 100644 index 0000000..a350f5d Binary files /dev/null and b/equip/bags/bag_1_32.png differ diff --git a/equip/bags/bag_2_32-mask.png b/equip/bags/bag_2_32-mask.png new file mode 100644 index 0000000..8ac19bf Binary files /dev/null and b/equip/bags/bag_2_32-mask.png differ diff --git a/equip/bags/bag_2_32.jpg b/equip/bags/bag_2_32.jpg new file mode 100644 index 0000000..75e0306 Binary files /dev/null and b/equip/bags/bag_2_32.jpg differ diff --git a/equip/bags/bag_2_32.png b/equip/bags/bag_2_32.png new file mode 100644 index 0000000..3ff512d Binary files /dev/null and b/equip/bags/bag_2_32.png differ diff --git a/equip/bags/bag_3_32-mask.png b/equip/bags/bag_3_32-mask.png new file mode 100644 index 0000000..70bfa61 Binary files /dev/null and b/equip/bags/bag_3_32-mask.png differ diff --git a/equip/bags/bag_3_32.jpg b/equip/bags/bag_3_32.jpg new file mode 100644 index 0000000..fc22813 Binary files /dev/null and b/equip/bags/bag_3_32.jpg differ diff --git a/equip/bags/bag_3_32.png b/equip/bags/bag_3_32.png new file mode 100644 index 0000000..4158111 Binary files /dev/null and b/equip/bags/bag_3_32.png differ diff --git a/equip/bags/bag_4_32-mask.png b/equip/bags/bag_4_32-mask.png new file mode 100644 index 0000000..b34a589 Binary files /dev/null and b/equip/bags/bag_4_32-mask.png differ diff --git a/equip/bags/bag_4_32.jpg b/equip/bags/bag_4_32.jpg new file mode 100644 index 0000000..aeb0c52 Binary files /dev/null and b/equip/bags/bag_4_32.jpg differ diff --git a/equip/bags/bag_4_32.png b/equip/bags/bag_4_32.png new file mode 100644 index 0000000..367e175 Binary files /dev/null and b/equip/bags/bag_4_32.png differ diff --git a/equip/bags/bag_5_32-mask.png b/equip/bags/bag_5_32-mask.png new file mode 100644 index 0000000..f19dd03 Binary files /dev/null and b/equip/bags/bag_5_32-mask.png differ diff --git a/equip/bags/bag_5_32.jpg b/equip/bags/bag_5_32.jpg new file mode 100644 index 0000000..4210ab0 Binary files /dev/null and b/equip/bags/bag_5_32.jpg differ diff --git a/equip/bags/bag_5_32.png b/equip/bags/bag_5_32.png new file mode 100644 index 0000000..a1353d3 Binary files /dev/null and b/equip/bags/bag_5_32.png differ diff --git a/equip/bags/bag_6_32-mask.png b/equip/bags/bag_6_32-mask.png new file mode 100644 index 0000000..3296ffe Binary files /dev/null and b/equip/bags/bag_6_32-mask.png differ diff --git a/equip/bags/bag_6_32.jpg b/equip/bags/bag_6_32.jpg new file mode 100644 index 0000000..51ad6db Binary files /dev/null and b/equip/bags/bag_6_32.jpg differ diff --git a/equip/bags/bag_6_32.png b/equip/bags/bag_6_32.png new file mode 100644 index 0000000..2fef111 Binary files /dev/null and b/equip/bags/bag_6_32.png differ diff --git a/equip/bags/bag_7_32-mask.png b/equip/bags/bag_7_32-mask.png new file mode 100644 index 0000000..43c7274 Binary files /dev/null and b/equip/bags/bag_7_32-mask.png differ diff --git a/equip/bags/bag_7_32.jpg b/equip/bags/bag_7_32.jpg new file mode 100644 index 0000000..55548ed Binary files /dev/null and b/equip/bags/bag_7_32.jpg differ diff --git a/equip/bags/bag_7_32.png b/equip/bags/bag_7_32.png new file mode 100644 index 0000000..f8388e5 Binary files /dev/null and b/equip/bags/bag_7_32.png differ diff --git a/equip/bags/test_screen.jpg b/equip/bags/test_screen.jpg new file mode 100644 index 0000000..abb7786 Binary files /dev/null and b/equip/bags/test_screen.jpg differ diff --git a/equip/book_7_32.jpg b/equip/book_7_32.jpg deleted file mode 100644 index 613e70c..0000000 Binary files a/equip/book_7_32.jpg and /dev/null differ diff --git a/equip/books/book_1_32-mask.png b/equip/books/book_1_32-mask.png new file mode 100644 index 0000000..f05c785 Binary files /dev/null and b/equip/books/book_1_32-mask.png differ diff --git a/equip/book_1_32.jpg b/equip/books/book_1_32.jpg similarity index 100% rename from equip/book_1_32.jpg rename to equip/books/book_1_32.jpg diff --git a/equip/books/book_1_32.png b/equip/books/book_1_32.png new file mode 100644 index 0000000..98976cd Binary files /dev/null and b/equip/books/book_1_32.png differ diff --git a/equip/books/book_2_32-mask.png b/equip/books/book_2_32-mask.png new file mode 100644 index 0000000..88ae54d Binary files /dev/null and b/equip/books/book_2_32-mask.png differ diff --git a/equip/book_2_32.jpg b/equip/books/book_2_32.jpg similarity index 100% rename from equip/book_2_32.jpg rename to equip/books/book_2_32.jpg diff --git a/equip/books/book_2_32.png b/equip/books/book_2_32.png new file mode 100644 index 0000000..910dfb4 Binary files /dev/null and b/equip/books/book_2_32.png differ diff --git a/equip/books/book_3_32-mask.png b/equip/books/book_3_32-mask.png new file mode 100644 index 0000000..4fc133a Binary files /dev/null and b/equip/books/book_3_32-mask.png differ diff --git a/equip/book_3_32.jpg b/equip/books/book_3_32.jpg similarity index 100% rename from equip/book_3_32.jpg rename to equip/books/book_3_32.jpg diff --git a/equip/books/book_3_32.png b/equip/books/book_3_32.png new file mode 100644 index 0000000..a4eff60 Binary files /dev/null and b/equip/books/book_3_32.png differ diff --git a/equip/books/book_4_32-mask.png b/equip/books/book_4_32-mask.png new file mode 100644 index 0000000..cc7f26f Binary files /dev/null and b/equip/books/book_4_32-mask.png differ diff --git a/equip/book_4_32.jpg b/equip/books/book_4_32.jpg similarity index 100% rename from equip/book_4_32.jpg rename to equip/books/book_4_32.jpg diff --git a/equip/books/book_4_32.png b/equip/books/book_4_32.png new file mode 100644 index 0000000..96fffcf Binary files /dev/null and b/equip/books/book_4_32.png differ diff --git a/equip/books/book_5_32-mask.png b/equip/books/book_5_32-mask.png new file mode 100644 index 0000000..8bd4ae5 Binary files /dev/null and b/equip/books/book_5_32-mask.png differ diff --git a/equip/book_5_32.jpg b/equip/books/book_5_32.jpg similarity index 100% rename from equip/book_5_32.jpg rename to equip/books/book_5_32.jpg diff --git a/equip/books/book_5_32.png b/equip/books/book_5_32.png new file mode 100644 index 0000000..1ed5e57 Binary files /dev/null and b/equip/books/book_5_32.png differ diff --git a/equip/books/book_6_32-mask.png b/equip/books/book_6_32-mask.png new file mode 100644 index 0000000..298958b Binary files /dev/null and b/equip/books/book_6_32-mask.png differ diff --git a/equip/book_6_32.jpg b/equip/books/book_6_32.jpg similarity index 100% rename from equip/book_6_32.jpg rename to equip/books/book_6_32.jpg diff --git a/equip/books/book_6_32.png b/equip/books/book_6_32.png new file mode 100644 index 0000000..d6bba6d Binary files /dev/null and b/equip/books/book_6_32.png differ diff --git a/equip/books/book_7_32-mask.png b/equip/books/book_7_32-mask.png new file mode 100644 index 0000000..190b0e2 Binary files /dev/null and b/equip/books/book_7_32-mask.png differ diff --git a/equip/books/book_7_32.jpg b/equip/books/book_7_32.jpg new file mode 100644 index 0000000..ff7d779 Binary files /dev/null and b/equip/books/book_7_32.jpg differ diff --git a/equip/books/book_7_32.png b/equip/books/book_7_32.png new file mode 100644 index 0000000..7815161 Binary files /dev/null and b/equip/books/book_7_32.png differ diff --git a/equip/books/book_8_32-mask.png b/equip/books/book_8_32-mask.png new file mode 100644 index 0000000..067cb6a Binary files /dev/null and b/equip/books/book_8_32-mask.png differ diff --git a/equip/books/book_8_32.jpg b/equip/books/book_8_32.jpg new file mode 100644 index 0000000..e647b08 Binary files /dev/null and b/equip/books/book_8_32.jpg differ diff --git a/equip/books/book_8_32.png b/equip/books/book_8_32.png new file mode 100644 index 0000000..19f0ec4 Binary files /dev/null and b/equip/books/book_8_32.png differ diff --git a/equip/chest_1_32-removebg-preview.png b/equip/chest_1_32-removebg-preview.png deleted file mode 100644 index f20c4d3..0000000 Binary files a/equip/chest_1_32-removebg-preview.png and /dev/null differ diff --git a/equip/chest_2_32.jpg b/equip/chest_2_32.jpg deleted file mode 100644 index 0759d06..0000000 Binary files a/equip/chest_2_32.jpg and /dev/null differ diff --git a/equip/chests/chest_1_32-mask.png b/equip/chests/chest_1_32-mask.png new file mode 100644 index 0000000..d700ccc Binary files /dev/null and b/equip/chests/chest_1_32-mask.png differ diff --git a/equip/chest_1_32.jpg b/equip/chests/chest_1_32.jpg similarity index 100% rename from equip/chest_1_32.jpg rename to equip/chests/chest_1_32.jpg diff --git a/equip/chests/chest_1_32.png b/equip/chests/chest_1_32.png new file mode 100644 index 0000000..a614d1e Binary files /dev/null and b/equip/chests/chest_1_32.png differ diff --git a/equip/chests/chest_2_32-mask.png b/equip/chests/chest_2_32-mask.png new file mode 100644 index 0000000..fd2a12d Binary files /dev/null and b/equip/chests/chest_2_32-mask.png differ diff --git a/equip/chests/chest_2_32.jpg b/equip/chests/chest_2_32.jpg new file mode 100644 index 0000000..b1ddde5 Binary files /dev/null and b/equip/chests/chest_2_32.jpg differ diff --git a/equip/chests/chest_2_32.png b/equip/chests/chest_2_32.png new file mode 100644 index 0000000..705cec8 Binary files /dev/null and b/equip/chests/chest_2_32.png differ diff --git a/equip/chests/chest_3_32-mask.png b/equip/chests/chest_3_32-mask.png new file mode 100644 index 0000000..a248047 Binary files /dev/null and b/equip/chests/chest_3_32-mask.png differ diff --git a/equip/chest_3_32.jpg b/equip/chests/chest_3_32.jpg similarity index 100% rename from equip/chest_3_32.jpg rename to equip/chests/chest_3_32.jpg diff --git a/equip/chests/chest_3_32.png b/equip/chests/chest_3_32.png new file mode 100644 index 0000000..71bc94e Binary files /dev/null and b/equip/chests/chest_3_32.png differ diff --git a/equip/chest_4_32.jpg b/equip/chests/chest_4_32.jpg similarity index 100% rename from equip/chest_4_32.jpg rename to equip/chests/chest_4_32.jpg diff --git a/equip/coins/coin_1_32-mask.png b/equip/coins/coin_1_32-mask.png new file mode 100644 index 0000000..7b2d747 Binary files /dev/null and b/equip/coins/coin_1_32-mask.png differ diff --git a/equip/coin_1_32.jpg b/equip/coins/coin_1_32.jpg similarity index 100% rename from equip/coin_1_32.jpg rename to equip/coins/coin_1_32.jpg diff --git a/equip/coins/coin_1_32.png b/equip/coins/coin_1_32.png new file mode 100644 index 0000000..2c35ea7 Binary files /dev/null and b/equip/coins/coin_1_32.png differ diff --git a/equip/coins/coin_2_32-mask.png b/equip/coins/coin_2_32-mask.png new file mode 100644 index 0000000..545de6b Binary files /dev/null and b/equip/coins/coin_2_32-mask.png differ diff --git a/equip/coin_2_32.jpg b/equip/coins/coin_2_32.jpg similarity index 100% rename from equip/coin_2_32.jpg rename to equip/coins/coin_2_32.jpg diff --git a/equip/coins/coin_2_32.png b/equip/coins/coin_2_32.png new file mode 100644 index 0000000..4ce6e15 Binary files /dev/null and b/equip/coins/coin_2_32.png differ diff --git a/equip/coins/coin_3_32-mask.png b/equip/coins/coin_3_32-mask.png new file mode 100644 index 0000000..536eae0 Binary files /dev/null and b/equip/coins/coin_3_32-mask.png differ diff --git a/equip/coin_3_32.jpg b/equip/coins/coin_3_32.jpg similarity index 100% rename from equip/coin_3_32.jpg rename to equip/coins/coin_3_32.jpg diff --git a/equip/coins/coin_3_32.png b/equip/coins/coin_3_32.png new file mode 100644 index 0000000..1cc765d Binary files /dev/null and b/equip/coins/coin_3_32.png differ diff --git a/equip/coins/coin_4_32-mask.png b/equip/coins/coin_4_32-mask.png new file mode 100644 index 0000000..dfc766b Binary files /dev/null and b/equip/coins/coin_4_32-mask.png differ diff --git a/equip/coin_4_32.jpg b/equip/coins/coin_4_32.jpg similarity index 100% rename from equip/coin_4_32.jpg rename to equip/coins/coin_4_32.jpg diff --git a/equip/coins/coin_4_32.png b/equip/coins/coin_4_32.png new file mode 100644 index 0000000..d3c74de Binary files /dev/null and b/equip/coins/coin_4_32.png differ diff --git a/equip/coins/coin_5_32-mask.png b/equip/coins/coin_5_32-mask.png new file mode 100644 index 0000000..a849b73 Binary files /dev/null and b/equip/coins/coin_5_32-mask.png differ diff --git a/equip/coin_5_32.jpg b/equip/coins/coin_5_32.jpg similarity index 100% rename from equip/coin_5_32.jpg rename to equip/coins/coin_5_32.jpg diff --git a/equip/coins/coin_5_32.png b/equip/coins/coin_5_32.png new file mode 100644 index 0000000..5e85889 Binary files /dev/null and b/equip/coins/coin_5_32.png differ diff --git a/equip/emitters/amu_e2_32-mask.png b/equip/emitters/amu_e2_32-mask.png new file mode 100644 index 0000000..f6f48c0 Binary files /dev/null and b/equip/emitters/amu_e2_32-mask.png differ diff --git a/equip/emitters/amu_e2_32.jpg b/equip/emitters/amu_e2_32.jpg new file mode 100644 index 0000000..5d27dd4 Binary files /dev/null and b/equip/emitters/amu_e2_32.jpg differ diff --git a/equip/emitters/amu_e2_32.png b/equip/emitters/amu_e2_32.png new file mode 100644 index 0000000..29bae1c Binary files /dev/null and b/equip/emitters/amu_e2_32.png differ diff --git a/equip/emitters/amu_e_32-mask.png b/equip/emitters/amu_e_32-mask.png new file mode 100644 index 0000000..b4a796d Binary files /dev/null and b/equip/emitters/amu_e_32-mask.png differ diff --git a/equip/emitters/amu_e_32.jpg b/equip/emitters/amu_e_32.jpg new file mode 100644 index 0000000..7841afa Binary files /dev/null and b/equip/emitters/amu_e_32.jpg differ diff --git a/equip/emitters/amu_e_32.png b/equip/emitters/amu_e_32.png new file mode 100644 index 0000000..204a6b3 Binary files /dev/null and b/equip/emitters/amu_e_32.png differ diff --git a/equip/emitters/main_e1_32-mask.png b/equip/emitters/main_e1_32-mask.png new file mode 100644 index 0000000..568b943 Binary files /dev/null and b/equip/emitters/main_e1_32-mask.png differ diff --git a/equip/main_e1_32.jpg b/equip/emitters/main_e1_32.jpg similarity index 100% rename from equip/main_e1_32.jpg rename to equip/emitters/main_e1_32.jpg diff --git a/equip/emitters/main_e1_32.png b/equip/emitters/main_e1_32.png new file mode 100644 index 0000000..5f7a63d Binary files /dev/null and b/equip/emitters/main_e1_32.png differ diff --git a/equip/emitters/main_e2_32-mask.png b/equip/emitters/main_e2_32-mask.png new file mode 100644 index 0000000..f6f8be3 Binary files /dev/null and b/equip/emitters/main_e2_32-mask.png differ diff --git a/equip/emitters/main_e2_32.jpg b/equip/emitters/main_e2_32.jpg new file mode 100644 index 0000000..b173b9a Binary files /dev/null and b/equip/emitters/main_e2_32.jpg differ diff --git a/equip/emitters/main_e2_32.png b/equip/emitters/main_e2_32.png new file mode 100644 index 0000000..45cb7ee Binary files /dev/null and b/equip/emitters/main_e2_32.png differ diff --git a/equip/emitters/mush_e2_32-mask.png b/equip/emitters/mush_e2_32-mask.png new file mode 100644 index 0000000..325a244 Binary files /dev/null and b/equip/emitters/mush_e2_32-mask.png differ diff --git a/equip/emitters/mush_e2_32.jpg b/equip/emitters/mush_e2_32.jpg new file mode 100644 index 0000000..9729c5d Binary files /dev/null and b/equip/emitters/mush_e2_32.jpg differ diff --git a/equip/emitters/mush_e2_32.png b/equip/emitters/mush_e2_32.png new file mode 100644 index 0000000..ebee39c Binary files /dev/null and b/equip/emitters/mush_e2_32.png differ diff --git a/equip/emitters/mush_e_32-mask.png b/equip/emitters/mush_e_32-mask.png new file mode 100644 index 0000000..bee0e55 Binary files /dev/null and b/equip/emitters/mush_e_32-mask.png differ diff --git a/equip/emitters/mush_e_32.jpg b/equip/emitters/mush_e_32.jpg new file mode 100644 index 0000000..e7d9085 Binary files /dev/null and b/equip/emitters/mush_e_32.jpg differ diff --git a/equip/emitters/mush_e_32.png b/equip/emitters/mush_e_32.png new file mode 100644 index 0000000..c78f5f2 Binary files /dev/null and b/equip/emitters/mush_e_32.png differ diff --git a/equip/emitters/ring_e1_32-mask.png b/equip/emitters/ring_e1_32-mask.png new file mode 100644 index 0000000..17616f7 Binary files /dev/null and b/equip/emitters/ring_e1_32-mask.png differ diff --git a/equip/emitters/ring_e1_32.jpg b/equip/emitters/ring_e1_32.jpg new file mode 100644 index 0000000..037fca2 Binary files /dev/null and b/equip/emitters/ring_e1_32.jpg differ diff --git a/equip/emitters/ring_e1_32.png b/equip/emitters/ring_e1_32.png new file mode 100644 index 0000000..21b9ab9 Binary files /dev/null and b/equip/emitters/ring_e1_32.png differ diff --git a/equip/emitters/ring_e2_32-mask.png b/equip/emitters/ring_e2_32-mask.png new file mode 100644 index 0000000..f27e843 Binary files /dev/null and b/equip/emitters/ring_e2_32-mask.png differ diff --git a/equip/emitters/ring_e2_32.jpg b/equip/emitters/ring_e2_32.jpg new file mode 100644 index 0000000..824a6ac Binary files /dev/null and b/equip/emitters/ring_e2_32.jpg differ diff --git a/equip/emitters/ring_e2_32.png b/equip/emitters/ring_e2_32.png new file mode 100644 index 0000000..5ca3a7f Binary files /dev/null and b/equip/emitters/ring_e2_32.png differ diff --git a/equip/emitters/staff_e1_32-mask.png b/equip/emitters/staff_e1_32-mask.png new file mode 100644 index 0000000..b151946 Binary files /dev/null and b/equip/emitters/staff_e1_32-mask.png differ diff --git a/equip/emitters/staff_e1_32.jpg b/equip/emitters/staff_e1_32.jpg new file mode 100644 index 0000000..01bd19c Binary files /dev/null and b/equip/emitters/staff_e1_32.jpg differ diff --git a/equip/emitters/staff_e1_32.png b/equip/emitters/staff_e1_32.png new file mode 100644 index 0000000..856c416 Binary files /dev/null and b/equip/emitters/staff_e1_32.png differ diff --git a/equip/emitters/staff_e2_32-mask.png b/equip/emitters/staff_e2_32-mask.png new file mode 100644 index 0000000..f22f742 Binary files /dev/null and b/equip/emitters/staff_e2_32-mask.png differ diff --git a/equip/emitters/staff_e2_32.jpg b/equip/emitters/staff_e2_32.jpg new file mode 100644 index 0000000..d992e86 Binary files /dev/null and b/equip/emitters/staff_e2_32.jpg differ diff --git a/equip/emitters/staff_e2_32.png b/equip/emitters/staff_e2_32.png new file mode 100644 index 0000000..f8cdd31 Binary files /dev/null and b/equip/emitters/staff_e2_32.png differ diff --git a/equip/emitters/sword_e1_32-mask.png b/equip/emitters/sword_e1_32-mask.png new file mode 100644 index 0000000..905f3ea Binary files /dev/null and b/equip/emitters/sword_e1_32-mask.png differ diff --git a/equip/sword_e1_32.jpg b/equip/emitters/sword_e1_32.jpg similarity index 100% rename from equip/sword_e1_32.jpg rename to equip/emitters/sword_e1_32.jpg diff --git a/equip/emitters/sword_e1_32.png b/equip/emitters/sword_e1_32.png new file mode 100644 index 0000000..627c12f Binary files /dev/null and b/equip/emitters/sword_e1_32.png differ diff --git a/equip/emitters/sword_e2_32-mask.png b/equip/emitters/sword_e2_32-mask.png new file mode 100644 index 0000000..ee8c99e Binary files /dev/null and b/equip/emitters/sword_e2_32-mask.png differ diff --git a/equip/emitters/sword_e2_32.jpg b/equip/emitters/sword_e2_32.jpg new file mode 100644 index 0000000..648c93b Binary files /dev/null and b/equip/emitters/sword_e2_32.jpg differ diff --git a/equip/emitters/sword_e2_32.png b/equip/emitters/sword_e2_32.png new file mode 100644 index 0000000..38d4ae5 Binary files /dev/null and b/equip/emitters/sword_e2_32.png differ diff --git a/equip/emitters/wand_e1_32-mask.png b/equip/emitters/wand_e1_32-mask.png new file mode 100644 index 0000000..ad1613e Binary files /dev/null and b/equip/emitters/wand_e1_32-mask.png differ diff --git a/equip/emitters/wand_e1_32.jpg b/equip/emitters/wand_e1_32.jpg new file mode 100644 index 0000000..8e79658 Binary files /dev/null and b/equip/emitters/wand_e1_32.jpg differ diff --git a/equip/emitters/wand_e1_32.png b/equip/emitters/wand_e1_32.png new file mode 100644 index 0000000..8adfbe7 Binary files /dev/null and b/equip/emitters/wand_e1_32.png differ diff --git a/equip/emitters/wand_e2_32-mask.png b/equip/emitters/wand_e2_32-mask.png new file mode 100644 index 0000000..6e44e74 Binary files /dev/null and b/equip/emitters/wand_e2_32-mask.png differ diff --git a/equip/emitters/wand_e2_32.jpg b/equip/emitters/wand_e2_32.jpg new file mode 100644 index 0000000..7be26f9 Binary files /dev/null and b/equip/emitters/wand_e2_32.jpg differ diff --git a/equip/emitters/wand_e2_32.png b/equip/emitters/wand_e2_32.png new file mode 100644 index 0000000..663cbed Binary files /dev/null and b/equip/emitters/wand_e2_32.png differ diff --git a/equip/keys/key_1_32-mask.png b/equip/keys/key_1_32-mask.png new file mode 100644 index 0000000..abe1ce9 Binary files /dev/null and b/equip/keys/key_1_32-mask.png differ diff --git a/equip/key_1_32.jpg b/equip/keys/key_1_32.jpg similarity index 100% rename from equip/key_1_32.jpg rename to equip/keys/key_1_32.jpg diff --git a/equip/keys/key_1_32.png b/equip/keys/key_1_32.png new file mode 100644 index 0000000..9ed7716 Binary files /dev/null and b/equip/keys/key_1_32.png differ diff --git a/equip/keys/key_2_32-mask.png b/equip/keys/key_2_32-mask.png new file mode 100644 index 0000000..fe94270 Binary files /dev/null and b/equip/keys/key_2_32-mask.png differ diff --git a/equip/key_2_32.jpg b/equip/keys/key_2_32.jpg similarity index 100% rename from equip/key_2_32.jpg rename to equip/keys/key_2_32.jpg diff --git a/equip/keys/key_2_32.png b/equip/keys/key_2_32.png new file mode 100644 index 0000000..5b7bf08 Binary files /dev/null and b/equip/keys/key_2_32.png differ diff --git a/equip/keys/key_3_32-mask.png b/equip/keys/key_3_32-mask.png new file mode 100644 index 0000000..e4f8346 Binary files /dev/null and b/equip/keys/key_3_32-mask.png differ diff --git a/equip/key_3_32.jpg b/equip/keys/key_3_32.jpg similarity index 100% rename from equip/key_3_32.jpg rename to equip/keys/key_3_32.jpg diff --git a/equip/keys/key_3_32.png b/equip/keys/key_3_32.png new file mode 100644 index 0000000..2f1d628 Binary files /dev/null and b/equip/keys/key_3_32.png differ diff --git a/equip/keys/key_4_32-mask.png b/equip/keys/key_4_32-mask.png new file mode 100644 index 0000000..77253f3 Binary files /dev/null and b/equip/keys/key_4_32-mask.png differ diff --git a/equip/key_4_32.jpg b/equip/keys/key_4_32.jpg similarity index 100% rename from equip/key_4_32.jpg rename to equip/keys/key_4_32.jpg diff --git a/equip/keys/key_4_32.png b/equip/keys/key_4_32.png new file mode 100644 index 0000000..8b35e95 Binary files /dev/null and b/equip/keys/key_4_32.png differ diff --git a/equip/main_e2_32.jpg b/equip/main_e2_32.jpg deleted file mode 100644 index c4301dc..0000000 Binary files a/equip/main_e2_32.jpg and /dev/null differ diff --git a/equip/main_pane2l.jpg b/equip/main_pane2l.jpg new file mode 100644 index 0000000..a28fc28 Binary files /dev/null and b/equip/main_pane2l.jpg differ diff --git a/equip/main_pane2l.png b/equip/main_pane2l.png new file mode 100644 index 0000000..2e8b290 Binary files /dev/null and b/equip/main_pane2l.png differ diff --git a/equip/mush_1_32.jpg b/equip/mush_1_32.jpg deleted file mode 100644 index caee857..0000000 Binary files a/equip/mush_1_32.jpg and /dev/null differ diff --git a/equip/mush_2_32.jpg b/equip/mush_2_32.jpg deleted file mode 100644 index 6e2e828..0000000 Binary files a/equip/mush_2_32.jpg and /dev/null differ diff --git a/equip/mush_3_32.jpg b/equip/mush_3_32.jpg deleted file mode 100644 index 54e3bb1..0000000 Binary files a/equip/mush_3_32.jpg and /dev/null differ diff --git a/equip/mush_4_32.jpg b/equip/mush_4_32.jpg deleted file mode 100644 index f40d10c..0000000 Binary files a/equip/mush_4_32.jpg and /dev/null differ diff --git a/equip/mush_5_32.jpg b/equip/mush_5_32.jpg deleted file mode 100644 index c8cb9d6..0000000 Binary files a/equip/mush_5_32.jpg and /dev/null differ diff --git a/equip/mush_6_32.jpg b/equip/mush_6_32.jpg deleted file mode 100644 index 3dbb47c..0000000 Binary files a/equip/mush_6_32.jpg and /dev/null differ diff --git a/equip/mush_7_32.jpg b/equip/mush_7_32.jpg deleted file mode 100644 index 3b4d6bc..0000000 Binary files a/equip/mush_7_32.jpg and /dev/null differ diff --git a/equip/mush_e2_32.jpg b/equip/mush_e2_32.jpg deleted file mode 100644 index 4b081eb..0000000 Binary files a/equip/mush_e2_32.jpg and /dev/null differ diff --git a/equip/mush_e_32.jpg b/equip/mush_e_32.jpg deleted file mode 100644 index 7b1b06a..0000000 Binary files a/equip/mush_e_32.jpg and /dev/null differ diff --git a/equip/mushrooms/mush_1_32-mask.png b/equip/mushrooms/mush_1_32-mask.png new file mode 100644 index 0000000..83b29f0 Binary files /dev/null and b/equip/mushrooms/mush_1_32-mask.png differ diff --git a/equip/mushrooms/mush_1_32.jpg b/equip/mushrooms/mush_1_32.jpg new file mode 100644 index 0000000..40209c0 Binary files /dev/null and b/equip/mushrooms/mush_1_32.jpg differ diff --git a/equip/mushrooms/mush_1_32.png b/equip/mushrooms/mush_1_32.png new file mode 100644 index 0000000..171f3f4 Binary files /dev/null and b/equip/mushrooms/mush_1_32.png differ diff --git a/equip/mushrooms/mush_2_32-mask.png b/equip/mushrooms/mush_2_32-mask.png new file mode 100644 index 0000000..232844d Binary files /dev/null and b/equip/mushrooms/mush_2_32-mask.png differ diff --git a/equip/mushrooms/mush_2_32.jpg b/equip/mushrooms/mush_2_32.jpg new file mode 100644 index 0000000..668b5ef Binary files /dev/null and b/equip/mushrooms/mush_2_32.jpg differ diff --git a/equip/mushrooms/mush_2_32.png b/equip/mushrooms/mush_2_32.png new file mode 100644 index 0000000..b63899a Binary files /dev/null and b/equip/mushrooms/mush_2_32.png differ diff --git a/equip/mushrooms/mush_3_32-mask.png b/equip/mushrooms/mush_3_32-mask.png new file mode 100644 index 0000000..7585966 Binary files /dev/null and b/equip/mushrooms/mush_3_32-mask.png differ diff --git a/equip/mushrooms/mush_3_32.jpg b/equip/mushrooms/mush_3_32.jpg new file mode 100644 index 0000000..094bf98 Binary files /dev/null and b/equip/mushrooms/mush_3_32.jpg differ diff --git a/equip/mushrooms/mush_3_32.png b/equip/mushrooms/mush_3_32.png new file mode 100644 index 0000000..36cebb9 Binary files /dev/null and b/equip/mushrooms/mush_3_32.png differ diff --git a/equip/mushrooms/mush_4_32-mask.png b/equip/mushrooms/mush_4_32-mask.png new file mode 100644 index 0000000..d439cad Binary files /dev/null and b/equip/mushrooms/mush_4_32-mask.png differ diff --git a/equip/mushrooms/mush_4_32.jpg b/equip/mushrooms/mush_4_32.jpg new file mode 100644 index 0000000..4ec5793 Binary files /dev/null and b/equip/mushrooms/mush_4_32.jpg differ diff --git a/equip/mushrooms/mush_4_32.png b/equip/mushrooms/mush_4_32.png new file mode 100644 index 0000000..ed26f50 Binary files /dev/null and b/equip/mushrooms/mush_4_32.png differ diff --git a/equip/mushrooms/mush_5_32-mask.png b/equip/mushrooms/mush_5_32-mask.png new file mode 100644 index 0000000..39541d6 Binary files /dev/null and b/equip/mushrooms/mush_5_32-mask.png differ diff --git a/equip/mushrooms/mush_5_32.jpg b/equip/mushrooms/mush_5_32.jpg new file mode 100644 index 0000000..fc5744a Binary files /dev/null and b/equip/mushrooms/mush_5_32.jpg differ diff --git a/equip/mushrooms/mush_5_32.png b/equip/mushrooms/mush_5_32.png new file mode 100644 index 0000000..d0c7274 Binary files /dev/null and b/equip/mushrooms/mush_5_32.png differ diff --git a/equip/mushrooms/mush_6_32-mask.png b/equip/mushrooms/mush_6_32-mask.png new file mode 100644 index 0000000..fc6d31a Binary files /dev/null and b/equip/mushrooms/mush_6_32-mask.png differ diff --git a/equip/mushrooms/mush_6_32.jpg b/equip/mushrooms/mush_6_32.jpg new file mode 100644 index 0000000..91a8a5e Binary files /dev/null and b/equip/mushrooms/mush_6_32.jpg differ diff --git a/equip/mushrooms/mush_6_32.png b/equip/mushrooms/mush_6_32.png new file mode 100644 index 0000000..0550a11 Binary files /dev/null and b/equip/mushrooms/mush_6_32.png differ diff --git a/equip/mushrooms/mush_7_32-mask.png b/equip/mushrooms/mush_7_32-mask.png new file mode 100644 index 0000000..eee7e1f Binary files /dev/null and b/equip/mushrooms/mush_7_32-mask.png differ diff --git a/equip/mushrooms/mush_7_32.jpg b/equip/mushrooms/mush_7_32.jpg new file mode 100644 index 0000000..de7ab15 Binary files /dev/null and b/equip/mushrooms/mush_7_32.jpg differ diff --git a/equip/mushrooms/mush_7_32.png b/equip/mushrooms/mush_7_32.png new file mode 100644 index 0000000..c15c1cb Binary files /dev/null and b/equip/mushrooms/mush_7_32.png differ diff --git a/equip/mushrooms/mush_8_32-mask.png b/equip/mushrooms/mush_8_32-mask.png new file mode 100644 index 0000000..af55a98 Binary files /dev/null and b/equip/mushrooms/mush_8_32-mask.png differ diff --git a/equip/mush_8_32.jpg b/equip/mushrooms/mush_8_32.jpg similarity index 100% rename from equip/mush_8_32.jpg rename to equip/mushrooms/mush_8_32.jpg diff --git a/equip/mushrooms/mush_8_32.png b/equip/mushrooms/mush_8_32.png new file mode 100644 index 0000000..2de64ef Binary files /dev/null and b/equip/mushrooms/mush_8_32.png differ diff --git a/equip/mushrooms/panel_test.jpg b/equip/mushrooms/panel_test.jpg new file mode 100644 index 0000000..e53acc8 Binary files /dev/null and b/equip/mushrooms/panel_test.jpg differ diff --git a/equip/pot_1_32.jpg b/equip/pot_1_32.jpg deleted file mode 100644 index 24a0a73..0000000 Binary files a/equip/pot_1_32.jpg and /dev/null differ diff --git a/equip/pot_2_32.jpg b/equip/pot_2_32.jpg deleted file mode 100644 index 8e1a694..0000000 Binary files a/equip/pot_2_32.jpg and /dev/null differ diff --git a/equip/pot_3_32.jpg b/equip/pot_3_32.jpg deleted file mode 100644 index 8cb0252..0000000 Binary files a/equip/pot_3_32.jpg and /dev/null differ diff --git a/equip/pot_4_32.jpg b/equip/pot_4_32.jpg deleted file mode 100644 index d58979e..0000000 Binary files a/equip/pot_4_32.jpg and /dev/null differ diff --git a/equip/pot_5_32.jpg b/equip/pot_5_32.jpg deleted file mode 100644 index d7fd5a5..0000000 Binary files a/equip/pot_5_32.jpg and /dev/null differ diff --git a/equip/pot_6_32.jpg b/equip/pot_6_32.jpg deleted file mode 100644 index 92b2339..0000000 Binary files a/equip/pot_6_32.jpg and /dev/null differ diff --git a/equip/pots/pot_1_32-mask.png b/equip/pots/pot_1_32-mask.png new file mode 100644 index 0000000..1aabdd4 Binary files /dev/null and b/equip/pots/pot_1_32-mask.png differ diff --git a/equip/pots/pot_1_32.jpg b/equip/pots/pot_1_32.jpg new file mode 100644 index 0000000..f0a7c1d Binary files /dev/null and b/equip/pots/pot_1_32.jpg differ diff --git a/equip/pots/pot_1_32.png b/equip/pots/pot_1_32.png new file mode 100644 index 0000000..2e3cd38 Binary files /dev/null and b/equip/pots/pot_1_32.png differ diff --git a/equip/pots/pot_2_32-mask.png b/equip/pots/pot_2_32-mask.png new file mode 100644 index 0000000..0e03308 Binary files /dev/null and b/equip/pots/pot_2_32-mask.png differ diff --git a/equip/pots/pot_2_32.jpg b/equip/pots/pot_2_32.jpg new file mode 100644 index 0000000..0daec7b Binary files /dev/null and b/equip/pots/pot_2_32.jpg differ diff --git a/equip/pots/pot_2_32.png b/equip/pots/pot_2_32.png new file mode 100644 index 0000000..cb0c32b Binary files /dev/null and b/equip/pots/pot_2_32.png differ diff --git a/equip/pots/pot_3_32-mask.png b/equip/pots/pot_3_32-mask.png new file mode 100644 index 0000000..272e686 Binary files /dev/null and b/equip/pots/pot_3_32-mask.png differ diff --git a/equip/pots/pot_3_32.jpg b/equip/pots/pot_3_32.jpg new file mode 100644 index 0000000..c3eabca Binary files /dev/null and b/equip/pots/pot_3_32.jpg differ diff --git a/equip/pots/pot_3_32.png b/equip/pots/pot_3_32.png new file mode 100644 index 0000000..a57b585 Binary files /dev/null and b/equip/pots/pot_3_32.png differ diff --git a/equip/pots/pot_4_32-mask.png b/equip/pots/pot_4_32-mask.png new file mode 100644 index 0000000..0169e18 Binary files /dev/null and b/equip/pots/pot_4_32-mask.png differ diff --git a/equip/pots/pot_4_32.jpg b/equip/pots/pot_4_32.jpg new file mode 100644 index 0000000..7ca34e1 Binary files /dev/null and b/equip/pots/pot_4_32.jpg differ diff --git a/equip/pots/pot_4_32.png b/equip/pots/pot_4_32.png new file mode 100644 index 0000000..8782822 Binary files /dev/null and b/equip/pots/pot_4_32.png differ diff --git a/equip/pots/pot_5_32-mask.png b/equip/pots/pot_5_32-mask.png new file mode 100644 index 0000000..eedf229 Binary files /dev/null and b/equip/pots/pot_5_32-mask.png differ diff --git a/equip/pots/pot_5_32.jpg b/equip/pots/pot_5_32.jpg new file mode 100644 index 0000000..8f13e9b Binary files /dev/null and b/equip/pots/pot_5_32.jpg differ diff --git a/equip/pots/pot_5_32.png b/equip/pots/pot_5_32.png new file mode 100644 index 0000000..0a153a9 Binary files /dev/null and b/equip/pots/pot_5_32.png differ diff --git a/equip/pots/pot_6_32-mask.png b/equip/pots/pot_6_32-mask.png new file mode 100644 index 0000000..f3c1ee8 Binary files /dev/null and b/equip/pots/pot_6_32-mask.png differ diff --git a/equip/pots/pot_6_32.jpg b/equip/pots/pot_6_32.jpg new file mode 100644 index 0000000..d322280 Binary files /dev/null and b/equip/pots/pot_6_32.jpg differ diff --git a/equip/pots/pot_6_32.png b/equip/pots/pot_6_32.png new file mode 100644 index 0000000..90952ff Binary files /dev/null and b/equip/pots/pot_6_32.png differ diff --git a/equip/pots/test_screen.jpg b/equip/pots/test_screen.jpg new file mode 100644 index 0000000..a17d1ba Binary files /dev/null and b/equip/pots/test_screen.jpg differ diff --git a/equip/rings/ring_1_32-mask.png b/equip/rings/ring_1_32-mask.png new file mode 100644 index 0000000..d461b78 Binary files /dev/null and b/equip/rings/ring_1_32-mask.png differ diff --git a/equip/rings/ring_1_32.jpg b/equip/rings/ring_1_32.jpg new file mode 100644 index 0000000..5a6f775 Binary files /dev/null and b/equip/rings/ring_1_32.jpg differ diff --git a/equip/rings/ring_1_32.png b/equip/rings/ring_1_32.png new file mode 100644 index 0000000..13142a1 Binary files /dev/null and b/equip/rings/ring_1_32.png differ diff --git a/equip/rings/ring_2_32-mask.png b/equip/rings/ring_2_32-mask.png new file mode 100644 index 0000000..5dde91a Binary files /dev/null and b/equip/rings/ring_2_32-mask.png differ diff --git a/equip/rings/ring_2_32.jpg b/equip/rings/ring_2_32.jpg new file mode 100644 index 0000000..1be0573 Binary files /dev/null and b/equip/rings/ring_2_32.jpg differ diff --git a/equip/rings/ring_2_32.png b/equip/rings/ring_2_32.png new file mode 100644 index 0000000..0a1dfbb Binary files /dev/null and b/equip/rings/ring_2_32.png differ diff --git a/equip/rings/ring_3_32-mask.png b/equip/rings/ring_3_32-mask.png new file mode 100644 index 0000000..b36f479 Binary files /dev/null and b/equip/rings/ring_3_32-mask.png differ diff --git a/equip/rings/ring_3_32.jpg b/equip/rings/ring_3_32.jpg new file mode 100644 index 0000000..96fb120 Binary files /dev/null and b/equip/rings/ring_3_32.jpg differ diff --git a/equip/rings/ring_3_32.png b/equip/rings/ring_3_32.png new file mode 100644 index 0000000..8b66e6b Binary files /dev/null and b/equip/rings/ring_3_32.png differ diff --git a/equip/rings/ring_4_32-mask.png b/equip/rings/ring_4_32-mask.png new file mode 100644 index 0000000..b9027a8 Binary files /dev/null and b/equip/rings/ring_4_32-mask.png differ diff --git a/equip/rings/ring_4_32.jpg b/equip/rings/ring_4_32.jpg new file mode 100644 index 0000000..9108776 Binary files /dev/null and b/equip/rings/ring_4_32.jpg differ diff --git a/equip/rings/ring_4_32.png b/equip/rings/ring_4_32.png new file mode 100644 index 0000000..b6478f3 Binary files /dev/null and b/equip/rings/ring_4_32.png differ diff --git a/equip/rings/ring_5_32-mask.png b/equip/rings/ring_5_32-mask.png new file mode 100644 index 0000000..dcfccf6 Binary files /dev/null and b/equip/rings/ring_5_32-mask.png differ diff --git a/equip/rings/ring_5_32.jpg b/equip/rings/ring_5_32.jpg new file mode 100644 index 0000000..f1df1e6 Binary files /dev/null and b/equip/rings/ring_5_32.jpg differ diff --git a/equip/rings/ring_5_32.png b/equip/rings/ring_5_32.png new file mode 100644 index 0000000..2898a07 Binary files /dev/null and b/equip/rings/ring_5_32.png differ diff --git a/equip/rings/test_screen.jpg b/equip/rings/test_screen.jpg new file mode 100644 index 0000000..4e5f478 Binary files /dev/null and b/equip/rings/test_screen.jpg differ diff --git a/equip/runes/rune_1_32-mask.png b/equip/runes/rune_1_32-mask.png new file mode 100644 index 0000000..29a144b Binary files /dev/null and b/equip/runes/rune_1_32-mask.png differ diff --git a/equip/rune_1_32.jpg b/equip/runes/rune_1_32.jpg similarity index 100% rename from equip/rune_1_32.jpg rename to equip/runes/rune_1_32.jpg diff --git a/equip/runes/rune_1_32.png b/equip/runes/rune_1_32.png new file mode 100644 index 0000000..d5b28bd Binary files /dev/null and b/equip/runes/rune_1_32.png differ diff --git a/equip/runes/rune_2_32-mask.png b/equip/runes/rune_2_32-mask.png new file mode 100644 index 0000000..9a94255 Binary files /dev/null and b/equip/runes/rune_2_32-mask.png differ diff --git a/equip/rune_2_32.jpg b/equip/runes/rune_2_32.jpg similarity index 100% rename from equip/rune_2_32.jpg rename to equip/runes/rune_2_32.jpg diff --git a/equip/runes/rune_2_32.png b/equip/runes/rune_2_32.png new file mode 100644 index 0000000..0b327a3 Binary files /dev/null and b/equip/runes/rune_2_32.png differ diff --git a/equip/staff_e1_32.jpg b/equip/staff_e1_32.jpg deleted file mode 100644 index 716ca31..0000000 Binary files a/equip/staff_e1_32.jpg and /dev/null differ diff --git a/equip/staff_e2_32.jpg b/equip/staff_e2_32.jpg deleted file mode 100644 index d7a68e7..0000000 Binary files a/equip/staff_e2_32.jpg and /dev/null differ diff --git a/equip/staffs/staff_1_32-mask.png b/equip/staffs/staff_1_32-mask.png new file mode 100644 index 0000000..7eb745f Binary files /dev/null and b/equip/staffs/staff_1_32-mask.png differ diff --git a/equip/staff_1_32.jpg b/equip/staffs/staff_1_32.jpg similarity index 100% rename from equip/staff_1_32.jpg rename to equip/staffs/staff_1_32.jpg diff --git a/equip/staffs/staff_1_32.png b/equip/staffs/staff_1_32.png new file mode 100644 index 0000000..fee0da9 Binary files /dev/null and b/equip/staffs/staff_1_32.png differ diff --git a/equip/staffs/staff_2_32-mask.png b/equip/staffs/staff_2_32-mask.png new file mode 100644 index 0000000..5837eff Binary files /dev/null and b/equip/staffs/staff_2_32-mask.png differ diff --git a/equip/staff_2_32.jpg b/equip/staffs/staff_2_32.jpg similarity index 100% rename from equip/staff_2_32.jpg rename to equip/staffs/staff_2_32.jpg diff --git a/equip/staffs/staff_2_32.png b/equip/staffs/staff_2_32.png new file mode 100644 index 0000000..a5d63a4 Binary files /dev/null and b/equip/staffs/staff_2_32.png differ diff --git a/equip/staffs/staff_3_32-mask.png b/equip/staffs/staff_3_32-mask.png new file mode 100644 index 0000000..1b8b2b4 Binary files /dev/null and b/equip/staffs/staff_3_32-mask.png differ diff --git a/equip/staff_3_32.jpg b/equip/staffs/staff_3_32.jpg similarity index 100% rename from equip/staff_3_32.jpg rename to equip/staffs/staff_3_32.jpg diff --git a/equip/staffs/staff_3_32.png b/equip/staffs/staff_3_32.png new file mode 100644 index 0000000..b2d43be Binary files /dev/null and b/equip/staffs/staff_3_32.png differ diff --git a/equip/staffs/staff_4_32-mask.png b/equip/staffs/staff_4_32-mask.png new file mode 100644 index 0000000..bf468fd Binary files /dev/null and b/equip/staffs/staff_4_32-mask.png differ diff --git a/equip/staff_4_32.jpg b/equip/staffs/staff_4_32.jpg similarity index 100% rename from equip/staff_4_32.jpg rename to equip/staffs/staff_4_32.jpg diff --git a/equip/staffs/staff_4_32.png b/equip/staffs/staff_4_32.png new file mode 100644 index 0000000..37199ad Binary files /dev/null and b/equip/staffs/staff_4_32.png differ diff --git a/equip/sword_e2_32.jpg b/equip/sword_e2_32.jpg deleted file mode 100644 index 04b58e0..0000000 Binary files a/equip/sword_e2_32.jpg and /dev/null differ diff --git a/equip/swords/sword_1_32-mask.png b/equip/swords/sword_1_32-mask.png new file mode 100644 index 0000000..f9fa3b5 Binary files /dev/null and b/equip/swords/sword_1_32-mask.png differ diff --git a/equip/sword_1_32.jpg b/equip/swords/sword_1_32.jpg similarity index 100% rename from equip/sword_1_32.jpg rename to equip/swords/sword_1_32.jpg diff --git a/equip/swords/sword_1_32.png b/equip/swords/sword_1_32.png new file mode 100644 index 0000000..e27d756 Binary files /dev/null and b/equip/swords/sword_1_32.png differ diff --git a/equip/swords/sword_2_32-mask.png b/equip/swords/sword_2_32-mask.png new file mode 100644 index 0000000..0417646 Binary files /dev/null and b/equip/swords/sword_2_32-mask.png differ diff --git a/equip/sword_2_32.jpg b/equip/swords/sword_2_32.jpg similarity index 100% rename from equip/sword_2_32.jpg rename to equip/swords/sword_2_32.jpg diff --git a/equip/swords/sword_2_32.png b/equip/swords/sword_2_32.png new file mode 100644 index 0000000..cd9029e Binary files /dev/null and b/equip/swords/sword_2_32.png differ diff --git a/equip/swords/sword_3_32-mask.png b/equip/swords/sword_3_32-mask.png new file mode 100644 index 0000000..a8b2157 Binary files /dev/null and b/equip/swords/sword_3_32-mask.png differ diff --git a/equip/sword_3_32.jpg b/equip/swords/sword_3_32.jpg similarity index 100% rename from equip/sword_3_32.jpg rename to equip/swords/sword_3_32.jpg diff --git a/equip/swords/sword_3_32.png b/equip/swords/sword_3_32.png new file mode 100644 index 0000000..d430478 Binary files /dev/null and b/equip/swords/sword_3_32.png differ diff --git a/equip/swords/sword_4_32-mask.png b/equip/swords/sword_4_32-mask.png new file mode 100644 index 0000000..c6853f5 Binary files /dev/null and b/equip/swords/sword_4_32-mask.png differ diff --git a/equip/sword_4_32.jpg b/equip/swords/sword_4_32.jpg similarity index 100% rename from equip/sword_4_32.jpg rename to equip/swords/sword_4_32.jpg diff --git a/equip/swords/sword_4_32.png b/equip/swords/sword_4_32.png new file mode 100644 index 0000000..5ba3dc1 Binary files /dev/null and b/equip/swords/sword_4_32.png differ diff --git a/equip/swords/sword_5_32-mask.png b/equip/swords/sword_5_32-mask.png new file mode 100644 index 0000000..dffd305 Binary files /dev/null and b/equip/swords/sword_5_32-mask.png differ diff --git a/equip/sword_5_32.jpg b/equip/swords/sword_5_32.jpg similarity index 100% rename from equip/sword_5_32.jpg rename to equip/swords/sword_5_32.jpg diff --git a/equip/swords/sword_5_32.png b/equip/swords/sword_5_32.png new file mode 100644 index 0000000..4047ad5 Binary files /dev/null and b/equip/swords/sword_5_32.png differ diff --git a/equip/wands/wand_1_32-mask.png b/equip/wands/wand_1_32-mask.png new file mode 100644 index 0000000..38cb99e Binary files /dev/null and b/equip/wands/wand_1_32-mask.png differ diff --git a/equip/wands/wand_1_32.jpg b/equip/wands/wand_1_32.jpg new file mode 100644 index 0000000..4afcbf4 Binary files /dev/null and b/equip/wands/wand_1_32.jpg differ diff --git a/equip/wands/wand_1_32.png b/equip/wands/wand_1_32.png new file mode 100644 index 0000000..771904f Binary files /dev/null and b/equip/wands/wand_1_32.png differ diff --git a/equip/wands/wand_2_32-mask.png b/equip/wands/wand_2_32-mask.png new file mode 100644 index 0000000..97e2877 Binary files /dev/null and b/equip/wands/wand_2_32-mask.png differ diff --git a/equip/wands/wand_2_32.jpg b/equip/wands/wand_2_32.jpg new file mode 100644 index 0000000..1e343b3 Binary files /dev/null and b/equip/wands/wand_2_32.jpg differ diff --git a/equip/wands/wand_2_32.png b/equip/wands/wand_2_32.png new file mode 100644 index 0000000..8b76ab9 Binary files /dev/null and b/equip/wands/wand_2_32.png differ diff --git a/equip/wands/wand_3_32-mask.png b/equip/wands/wand_3_32-mask.png new file mode 100644 index 0000000..4ce838d Binary files /dev/null and b/equip/wands/wand_3_32-mask.png differ diff --git a/equip/wands/wand_3_32.jpg b/equip/wands/wand_3_32.jpg new file mode 100644 index 0000000..ad700f7 Binary files /dev/null and b/equip/wands/wand_3_32.jpg differ diff --git a/equip/wands/wand_3_32.png b/equip/wands/wand_3_32.png new file mode 100644 index 0000000..62f8d18 Binary files /dev/null and b/equip/wands/wand_3_32.png differ diff --git a/equip/wands/wand_4_32-mask.png b/equip/wands/wand_4_32-mask.png new file mode 100644 index 0000000..caf86e6 Binary files /dev/null and b/equip/wands/wand_4_32-mask.png differ diff --git a/equip/wands/wand_4_32.jpg b/equip/wands/wand_4_32.jpg new file mode 100644 index 0000000..f9281ca Binary files /dev/null and b/equip/wands/wand_4_32.jpg differ diff --git a/equip/wands/wand_4_32.png b/equip/wands/wand_4_32.png new file mode 100644 index 0000000..e020e71 Binary files /dev/null and b/equip/wands/wand_4_32.png differ diff --git a/equipment_main.py b/equipment_main.py index 2e8c3d7..e4d62ee 100644 --- a/equipment_main.py +++ b/equipment_main.py @@ -13,11 +13,14 @@ EMITTER_MUSH = "mushroom" EMITTER_AMU = "amulett" EMITTER_SWORD = "sword" EMITTER_STAFF = "staff" +EMITTER_WAND = "wand" +EMITTER_RING = "ring" +HSV_DEFAULT = HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0) def run(): - EMITTER_TO_USE = EMITTER_STAFF - + EMITTER_TO_USE = EMITTER_RING + SPAWN_COUNT = 1 # initialize the user-class config = UserConfigs() @@ -32,38 +35,50 @@ def run(): # capture_window = cv.VideoCapture("snip_slam.mp4") video_mode = True + # initialize the StunVision class vision_stun = Vision() loop_time = time() needles = [] - hsv = [] + hsvs = [] + tresholds = [] + masks = [] + if EMITTER_TO_USE == EMITTER_MUSH: - include_books(needles, hsv) - include_mushs(needles, hsv) - include_pots(needles, hsv) - include_bags(needles, hsv) + include_books(needles, hsvs, tresholds, masks) + include_mushs(needles, hsvs, tresholds, masks) + include_pots(needles, hsvs, tresholds, masks) + include_bags(needles, hsvs, tresholds, masks) elif EMITTER_TO_USE == EMITTER_AMU: - include_books(needles, hsv) - include_amus(needles, hsv) - include_bags(needles, hsv) + include_books(needles, hsvs, tresholds, masks) + include_amus(needles, hsvs, tresholds, masks) + include_bags(needles, hsvs, tresholds, masks) elif EMITTER_TO_USE == EMITTER_MAIN: - include_books(needles, hsv) - include_chests(needles, hsv) - include_keys(needles, hsv) - include_pots(needles, hsv) - include_bags(needles, hsv) - include_coins(needles, hsv) - #include_runes(needles, hsv) + include_books(needles, hsvs, tresholds, masks) + include_chests(needles, hsvs, tresholds, masks) + include_keys(needles, hsvs, tresholds, masks) + include_pots(needles, hsvs, tresholds, masks) + include_bags(needles, hsvs, tresholds, masks) + include_coins(needles, hsvs, tresholds, masks) + include_runes(needles, hsvs, tresholds, masks) elif EMITTER_TO_USE == EMITTER_SWORD: - include_books(needles, hsv) - include_swords(needles, hsv) - include_bags(needles, hsv) + include_books(needles, hsvs, tresholds, masks) + include_swords(needles, hsvs, tresholds, masks) + include_bags(needles, hsvs, tresholds, masks) elif EMITTER_TO_USE == EMITTER_STAFF: - include_books(needles, hsv) - include_staffs(needles, hsv) - include_bags(needles, hsv) + include_books(needles, hsvs, tresholds, masks) + include_staffs(needles, hsvs, tresholds, masks) + include_bags(needles, hsvs, tresholds, masks) + elif EMITTER_TO_USE == EMITTER_RING: + #include_books(needles, hsvs, tresholds, masks) + include_rings(needles, hsvs, tresholds, masks) + #include_bags(needles, hsvs, tresholds, masks) + elif EMITTER_TO_USE == EMITTER_WAND: + include_books(needles, hsvs, tresholds, masks) + include_wands(needles, hsvs, tresholds, masks) + include_bags(needles, hsvs, tresholds, masks) pause = True while True: @@ -97,7 +112,7 @@ def run(): if len(spawn_1) == 1: spawn_button_active = True points = vision_stun.get_click_points(spawn_1) - for i in range(0, 15, 1): + for i in range(0, SPAWN_COUNT, 1): click_point(config, points[0][0], points[0][1]) if keyboard.is_pressed('p') == True or pause == True: pause = True @@ -112,17 +127,27 @@ def run(): break continue + cv.waitKey(500) for rer in range(0, len(needles), 1): while True: # do object detection screenshot = capture_window.get_screenshot() - processed_screenshot = vision_stun.apply_hsv_filter(screenshot, hsv[rer]) - processed_needle = vision_stun.apply_hsv_filter(needles[rer], hsv[rer]) - rectangles = vision_stun.find(processed_screenshot, processed_needle, 0.8, 5) + processed_screenshot = vision_stun.apply_hsv_filter(screenshot, hsvs[rer]) + processed_needle = vision_stun.apply_hsv_filter(needles[rer], hsvs[rer]) + trho = 0.8 + mask = None + norm = False + try: + trho = tresholds[rer] + mask = masks[rer] + norm = True + except: + pass + rectangles = vision_stun.find(processed_screenshot, processed_needle, trho, 5, norm, mask) # draw the detection results onto the original image - # output_image = vision_stun.draw_rectangles(processed_screenshot, rectangles) - # cv.imshow("output_image", output_image) - # cv.waitKey(150) + output_image = vision_stun.draw_rectangles(processed_screenshot, rectangles) + cv.imshow("output_image", output_image) + cv.waitKey(150) if len(rectangles) is not 5: break @@ -133,21 +158,21 @@ def run(): points = vision_stun.get_click_points(rectangles) check_and_move_tile(capture_window, vision_stun, config, [70, 70, rectangles[0][0] + 70, rectangles[0][1]], needles[rer], - hsv[rer], + hsvs[rer], points[1], [points[0][0] + 70, points[0][1]]) if keyboard.is_pressed('p') == True or pause == True: pause = True break check_and_move_tile(capture_window, vision_stun, config, [70, 70, rectangles[0][0], rectangles[0][1] + 70], needles[rer], - hsv[rer], + hsvs[rer], points[2], [points[0][0], points[0][1] + 70]) if keyboard.is_pressed('p') == True or pause == True: pause = True break check_and_move_tile(capture_window, vision_stun, config, [70, 70, rectangles[0][0] + 70, rectangles[0][1] + 70], - needles[rer], hsv[rer], + needles[rer], hsvs[rer], points[3], [points[0][0] + 70, points[0][1] + 70]) move_tile(config, points[4], [points[0][0], points[0][1]]) if keyboard.is_pressed('p') == True or pause == True: @@ -159,186 +184,431 @@ def run(): cv.waitKey(150) -def include_chests(needles, hsv): - needles.append(cv.imread("equip/chest_1_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(13, 40, 85, 135, 255, 255, 0, 0, 55, 53)) - #needles.append(cv.imread("equip/chest_1_32-removebg-preview.png", cv.IMREAD_UNCHANGED)) - #hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/chest_2_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(14, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/chest_3_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) +def include_chests(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/chests/chest_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.95) + mask.append(cv.imread("equip/chests/chest_1_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/chests/chest_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.95) + mask.append(cv.imread("equip/chests/chest_2_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/chests/chest_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/chests/chest_3_32-mask.png", cv.IMREAD_COLOR)) + +def include_books(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/books/book_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/books/book_1_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/books/book_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.9) + mask.append(cv.imread("equip/books/book_2_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/books/book_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.87) + mask.append(cv.imread("equip/books/book_3_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/books/book_4_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/books/book_4_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/books/book_5_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/books/book_5_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/books/book_6_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.9) + mask.append(cv.imread("equip/books/book_6_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/books/book_7_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/books/book_7_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/books/book_8_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/books/book_8_32-mask.png", cv.IMREAD_COLOR)) -def include_books(needles, hsv): - needles.append(cv.imread("equip/book_1_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 128, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/book_2_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(49, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/book_3_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 196, 0, 0, 0, 0)) - needles.append(cv.imread("equip/book_4_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 156, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/book_5_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 95, 137, 179, 255, 255, 0, 0, 0, 0)) + +def include_keys(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/keys/key_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/keys/key_1_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/keys/key_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/keys/key_2_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/keys/key_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/keys/key_3_32-mask.png", cv.IMREAD_COLOR)) -def include_keys(needles, hsv): - needles.append(cv.imread("equip/key_1_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/key_2_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/key_3_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) +def include_pots(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/pots/pot_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/pots/pot_1_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/pots/pot_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/pots/pot_2_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/pots/pot_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.94) + mask.append(cv.imread("equip/pots/pot_3_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/pots/pot_4_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/pots/pot_4_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/pots/pot_5_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/pots/pot_5_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/pots/pot_6_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/pots/pot_6_32-mask.png", cv.IMREAD_COLOR)) -def include_pots(needles, hsv): - needles.append(cv.imread("equip/pot_1_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/pot_2_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/pot_3_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/pot_4_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/pot_5_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/pot_6_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) +def include_bags(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/bags/bag_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/bags/bag_1_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/bags/bag_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.88) + mask.append(cv.imread("equip/bags/bag_2_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/bags/bag_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/bags/bag_3_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/bags/bag_4_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/bags/bag_4_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/bags/bag_5_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/bags/bag_5_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/bags/bag_6_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/bags/bag_6_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/bags/bag_7_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/bags/bag_7_32-mask.png", cv.IMREAD_COLOR)) + +def include_coins(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/coins/coin_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/coins/coin_1_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/coins/coin_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/coins/coin_2_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/coins/coin_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/coins/coin_3_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/coins/coin_4_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/coins/coin_4_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/coins/coin_5_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/coins/coin_5_32-mask.png", cv.IMREAD_COLOR)) + +def include_runes(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/runes/rune_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/runes/rune_1_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/runes/rune_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/runes/rune_2_32-mask.png", cv.IMREAD_COLOR)) -def include_bags(needles, hsv): - needles.append(cv.imread("equip/bag_1_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/bag_2_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/bag_3_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/bag_4_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/bag_5_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/bag_6_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) +def include_mushs(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/mushrooms/mush_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/mushrooms/mush_1_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/mushrooms/mush_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/mushrooms/mush_2_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/mushrooms/mush_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/mushrooms/mush_3_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/mushrooms/mush_4_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/mushrooms/mush_4_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/mushrooms/mush_5_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/mushrooms/mush_5_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/mushrooms/mush_6_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/mushrooms/mush_6_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/mushrooms/mush_7_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/mushrooms/mush_7_32-mask.png", cv.IMREAD_COLOR)) + +def include_amus(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/amus/amu_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/amus/amu_1_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/amus/amu_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/amus/amu_2_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/amus/amu_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/amus/amu_3_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/amus/amu_4_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/amus/amu_4_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/amus/amu_5_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/amus/amu_5_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/amus/amu_6_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/amus/amu_6_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/amus/amu_7_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/amus/amu_7_32-mask.png", cv.IMREAD_COLOR)) -def include_coins(needles, hsv): - needles.append(cv.imread("equip/coin_1_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/coin_2_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/coin_3_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/coin_4_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/coin_5_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) +def include_swords(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/swords/sword_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/swords/sword_1_32-mask.png", cv.IMREAD_COLOR)) -def include_runes(needles, hsv): - needles.append(cv.imread("equip/rune_1_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/rune_2_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) + needles.append(cv.imread("equip/swords/sword_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/swords/sword_2_32-mask.png", cv.IMREAD_COLOR)) + needles.append(cv.imread("equip/swords/sword_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/swords/sword_3_32-mask.png", cv.IMREAD_COLOR)) -def include_mushs(needles, hsv): - needles.append(cv.imread("equip/mush_1_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/mush_2_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/mush_3_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/mush_4_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/mush_5_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/mush_6_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/mush_7_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/mush_8_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) + needles.append(cv.imread("equip/swords/sword_4_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/swords/sword_4_32-mask.png", cv.IMREAD_COLOR)) + needles.append(cv.imread("equip/swords/sword_5_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/swords/sword_5_32-mask.png", cv.IMREAD_COLOR)) -def include_amus(needles, hsv): - needles.append(cv.imread("equip/amu_1_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/amu_2_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/amu_3_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/amu_4_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/amu_5_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/amu_6_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/amu_7_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) +def include_staffs(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/staffs/staff_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/staffs/staff_1_32-mask.png", cv.IMREAD_COLOR)) + needles.append(cv.imread("equip/staffs/staff_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/staffs/staff_2_32-mask.png", cv.IMREAD_COLOR)) -def include_swords(needles, hsv): - needles.append(cv.imread("equip/sword_1_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/sword_2_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/sword_3_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/sword_4_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/sword_5_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) + needles.append(cv.imread("equip/staffs/staff_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/staffs/staff_3_32-mask.png", cv.IMREAD_COLOR)) -def include_staffs(needles, hsv): - needles.append(cv.imread("equip/staff_1_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/staff_2_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/staff_3_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - needles.append(cv.imread("equip/staff_4_32.jpg", cv.IMREAD_UNCHANGED)) - hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) - #needles.append(cv.imread("equip/sword_5_32.jpg", cv.IMREAD_UNCHANGED)) - #hsv.append(HsvFilter(0, 0, 0, 179, 255, 255, 0, 0, 0, 0)) + needles.append(cv.imread("equip/staffs/staff_4_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/staffs/staff_4_32-mask.png", cv.IMREAD_COLOR)) + +def include_rings(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/rings/ring_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.92) + mask.append(cv.imread("equip/rings/ring_1_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/rings/ring_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.94) + mask.append(cv.imread("equip/rings/ring_2_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/rings/ring_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/rings/ring_3_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/rings/ring_4_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.91) + mask.append(cv.imread("equip/rings/ring_4_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/rings/ring_5_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/rings/ring_5_32-mask.png", cv.IMREAD_COLOR)) + +def include_wands(needles, hsv, tresh, mask): + needles.append(cv.imread("equip/wands/wand_1_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/wands/wand_1_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/wands/wand_2_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/wands/wand_2_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/wands/wand_3_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/wands/wand_3_32-mask.png", cv.IMREAD_COLOR)) + + needles.append(cv.imread("equip/wands/wand_4_32.jpg", cv.IMREAD_UNCHANGED)) + hsv.append(HSV_DEFAULT) + tresh.append(0.93) + mask.append(cv.imread("equip/wands/wand_4_32-mask.png", cv.IMREAD_COLOR)) def move_tile(conf, point_source, point_dest): offset_left = conf.returnEquipmentWindowPos()[2] offset_down = conf.returnEquipmentWindowPos()[3] pydirectinput.moveTo(point_source[0] + offset_left, point_source[1] + offset_down) pydirectinput.mouseDown() - w = random.randint(1, 100) - cv.waitKey(250 + w) + w = random.randint(1, 50) + cv.waitKey(100 + w) pydirectinput.moveTo(point_dest[0] + offset_left, point_dest[1] + offset_down) pydirectinput.mouseUp() - cv.waitKey(250 + w) + cv.waitKey(500) def find_emitter(emitter_to_use, vis, screen, layer): if emitter_to_use == EMITTER_MUSH: if layer == 0: - return vis.find(screen, cv.imread("equip/mush_e_32.jpg", cv.IMREAD_UNCHANGED), 0.7, 1) + needle = cv.imread("equip/emitters/mush_e_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/mush_e_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.95, 1, True, mask) else: - return vis.find(screen, cv.imread("equip/mush_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.4, 1) + needle = cv.imread("equip/emitters/mush_e2_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/mush_e2_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.96, 1, True, mask) elif emitter_to_use == EMITTER_AMU: if layer == 0: - return vis.find(screen, cv.imread("equip/amu_e_32.jpg", cv.IMREAD_UNCHANGED), 0.7, 1) + needle = cv.imread("equip/emitters/amu_e_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/amu_e_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.95, 1, True, mask) else: - return vis.find(screen, cv.imread("equip/amu_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.4, 1) + needle = cv.imread("equip/emitters/amu_e2_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/amu_e2_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.95, 1, True, mask) elif emitter_to_use == EMITTER_MAIN: if layer == 0: - return vis.find(screen, cv.imread("equip/main_e1_32.jpg", cv.IMREAD_UNCHANGED), 0.8, 1) + needle = cv.imread("equip/emitters/main_e1_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/main_e1_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.95, 1, True, mask) else: - return vis.find(screen, cv.imread("equip/main_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.5, 1) + needle = cv.imread("equip/emitters/main_e2_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/main_e2_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.95, 1, True, mask) elif emitter_to_use == EMITTER_SWORD: if layer == 0: - return vis.find(screen, cv.imread("equip/sword_e1_32.jpg", cv.IMREAD_UNCHANGED), 0.8, 1) + needle = cv.imread("equip/emitters/sword_e1_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/sword_e1_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.95, 1, True, mask) else: - return vis.find(screen, cv.imread("equip/sword_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.7, 1) + needle = cv.imread("equip/emitters/sword_e2_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/sword_e2_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.98, 1, True, mask) elif emitter_to_use == EMITTER_STAFF: if layer == 0: - return vis.find(screen, cv.imread("equip/staff_e1_32.jpg", cv.IMREAD_UNCHANGED), 0.8, 1) + needle = cv.imread("equip/emitters/staff_e1_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/staff_e1_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.95, 1, True, mask) else: - return vis.find(screen, cv.imread("equip/staff_e2_32.jpg", cv.IMREAD_UNCHANGED), 0.7, 1) + needle = cv.imread("equip/emitters/staff_e2_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/staff_e2_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.99, 1, True, mask) + elif emitter_to_use == EMITTER_RING: + if layer == 0: + needle = cv.imread("equip/emitters/ring_e1_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/ring_e1_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.95, 1, True, mask) + else: + needle = cv.imread("equip/emitters/ring_e2_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/ring_e2_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.95, 1, True, mask) + elif emitter_to_use == EMITTER_WAND: + if layer == 0: + needle = cv.imread("equip/emitters/wand_e1_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/wand_e1_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.95, 1, True, mask) + else: + needle = cv.imread("equip/emitters/wand_e2_32.jpg", cv.IMREAD_UNCHANGED) + mask = cv.imread("equip/emitters/wand_e2_32-mask.png", cv.IMREAD_COLOR) + return vis.find(screen, needle, 0.96, 1, True, mask) def check_and_move_tile(capture_win, visio, conf, rect, needl, hsv, point_source, point_dest): screenshot_pos = capture_win.get_screenshot_by_area(rect) diff --git a/vision.py b/vision.py index ebe3a7e..97c956f 100644 --- a/vision.py +++ b/vision.py @@ -27,22 +27,32 @@ class Vision: # TM_CCOEFF, TM_CCOEFF_NORMED, TM_CCORR, TM_CCORR_NORMED, TM_SQDIFF, TM_SQDIFF_NORMED self.method = method - def find(self, haystack_img, needle_img, threshold=0.5, max_results=10): + def find(self, haystack_img, needle_img, threshold=0.5, max_results=10, normalize=False, mask=None): # run the OpenCV algorithm needle_w = needle_img.shape[1] needle_h = needle_img.shape[0] - result = cv.matchTemplate(haystack_img, needle_img, self.method) + + if normalize: + result = cv.matchTemplate(haystack_img, needle_img, cv.TM_CCORR_NORMED, None, mask) + _minVal, _maxVal, minLoc, maxLoc = cv.minMaxLoc(result, None) + cv.normalize(result, result, 0, 1, cv.NORM_MINMAX, -1) + else: + result = cv.matchTemplate(haystack_img, needle_img, self.method) # Get the all the positions from the match result that exceed our threshold locations = np.where(result >= threshold) locations = list(zip(*locations[::-1])) # print(locations) + _minVal, _maxVal, minLoc, maxLoc = cv.minMaxLoc(result, None) # if we found no results, return now. this reshape of the empty array allows us to # concatenate together results without causing an error if not locations: return np.array([], dtype=np.int32).reshape(0, 4) + if len(locations) > 5000: + return np.array([], dtype=np.int32).reshape(0, 4) + # You'll notice a lot of overlapping rectangles get drawn. We can eliminate those redundant # locations by using groupRectangles(). # First we need to create the list of [x, y, w, h] rectangles diff --git a/window_capture.py b/window_capture.py index ae21779..1db7d7f 100644 --- a/window_capture.py +++ b/window_capture.py @@ -49,7 +49,7 @@ class WindowCapture: - def get_screenshot(self): + def get_screenshot(self, drop_alpha_channel = True): # get the window image data wDC = win32gui.GetWindowDC(self.hwnd) dcObj = win32ui.CreateDCFromHandle(wDC) @@ -74,7 +74,8 @@ class WindowCapture: # drop the alpha channel, or cv.matchTemplate() will throw an error like: # error: (-215:Assertion failed) (depth == CV_8U || depth == CV_32F) && type == _templ.type() # && _img.dims() <= 2 in function 'cv::matchTemplate' - img = img[...,:3] + if drop_alpha_channel: + img = img[...,:3] # make image C_CONTIGUOUS to avoid errors that look like: # File ... in draw_rectangles