diff --git a/conquest/data/assets/simple/blank.jpg b/conquest/data/assets/simple/blank.jpg deleted file mode 100644 index f8f4f07..0000000 Binary files a/conquest/data/assets/simple/blank.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/blank.png b/conquest/data/assets/simple/blank.png new file mode 100644 index 0000000..7615888 Binary files /dev/null and b/conquest/data/assets/simple/blank.png differ diff --git a/conquest/data/assets/simple/data.json b/conquest/data/assets/simple/data.json index 56a4c69..f6d40c5 100644 --- a/conquest/data/assets/simple/data.json +++ b/conquest/data/assets/simple/data.json @@ -1,4 +1,655 @@ { - "region_max": 70, - "extension": "jpg" + "custom": false, + "name": "simple", + "region_max": 88, + "regions": { + "2": { + "center": [ + 1030.9767960951142, + 258.80115620533564 + ], + "data": {}, + "weight": 225392 + }, + "3": { + "center": [ + 514.636452074392, + 197.86140200286124 + ], + "data": {}, + "weight": 17475 + }, + "4": { + "center": [ + 709.3251219942383, + 162.21529778352638 + ], + "data": {}, + "weight": 17009 + }, + "5": { + "center": [ + 583.5378187356008, + 222.75059549377173 + ], + "data": {}, + "weight": 25609 + }, + "6": { + "center": [ + 194.45946632781872, + 105.65946632782166 + ], + "data": {}, + "weight": 3931 + }, + "8": { + "center": [ + 1232.1610572487114, + 382.88387952945607 + ], + "data": {}, + "weight": 27126 + }, + "9": { + "center": [ + 278.7560975609756, + 197.35365853658536 + ], + "data": {}, + "weight": 82 + }, + "11": { + "center": [ + 335.8222222222222, + 251.57777777777778 + ], + "data": {}, + "weight": 45 + }, + "12": { + "center": [ + 647.9027777777778, + 258.65277777777777 + ], + "data": {}, + "weight": 72 + }, + "13": { + "center": [ + 742.0529436679374, + 291.996611605252 + ], + "data": {}, + "weight": 2361 + }, + "14": { + "center": [ + 690.8490566037735, + 290.9622641509434 + ], + "data": {}, + "weight": 53 + }, + "15": { + "center": [ + 264.98358442296757, + 432.52750142126206 + ], + "data": {}, + "weight": 14072 + }, + "16": { + "center": [ + 692.6752136752136, + 306.37606837606836 + ], + "data": {}, + "weight": 117 + }, + "17": { + "center": [ + 738.3423885187084, + 343.96565863659663 + ], + "data": {}, + "weight": 3902 + }, + "19": { + "center": [ + 632.0666666666667, + 337.30833333333334 + ], + "data": {}, + "weight": 120 + }, + "20": { + "center": [ + 476.58692098092644, + 376.9901907356948 + ], + "data": {}, + "weight": 1835 + }, + "21": { + "center": [ + 508.8333333333333, + 347.8333333333333 + ], + "data": {}, + "weight": 6 + }, + "22": { + "center": [ + 812.6754793724579, + 432.6480970366066 + ], + "data": {}, + "weight": 13768 + }, + "23": { + "center": [ + 730.1709302325581, + 390.0220930232558 + ], + "data": {}, + "weight": 4300 + }, + "24": { + "center": [ + 166.31724820588963, + 429.8866617173967 + ], + "data": {}, + "weight": 4041 + }, + "25": { + "center": [ + 204.20026702269692, + 392.958611481976 + ], + "data": {}, + "weight": 749 + }, + "26": { + "center": [ + 519.6675257731958, + 396.71907216494844 + ], + "data": {}, + "weight": 388 + }, + "27": { + "center": [ + 493.03973509933775, + 403.4370860927152 + ], + "data": {}, + "weight": 151 + }, + "28": { + "center": [ + 689.9814814814815, + 412.84143518518516 + ], + "data": {}, + "weight": 864 + }, + "29": { + "center": [ + 575.0555555555555, + 409.6666666666667 + ], + "data": {}, + "weight": 18 + }, + "30": { + "center": [ + 513.3181818181819, + 418.89772727272725 + ], + "data": {}, + "weight": 88 + }, + "31": { + "center": [ + 486.5474575007456, + 536.8682150313152 + ], + "data": {}, + "weight": 26824 + }, + "32": { + "center": [ + 663.693367084263, + 495.89994851553115 + ], + "data": {}, + "weight": 23308 + }, + "34": { + "center": [ + 548.030303030303, + 427.969696969697 + ], + "data": {}, + "weight": 33 + }, + "35": { + "center": [ + 901.9156040684694, + 551.7384023815431 + ], + "data": {}, + "weight": 40310 + }, + "36": { + "center": [ + 397.74015748031496, + 490.0506186726659 + ], + "data": {}, + "weight": 2667 + }, + "38": { + "center": [ + 372.89043133366386, + 540.2855726326227 + ], + "data": {}, + "weight": 2017 + }, + "39": { + "center": [ + 311.4621158406885, + 665.9395369306374 + ], + "data": {}, + "weight": 40901 + }, + "40": { + "center": [ + 586.3870641738251, + 574.192353040256 + ], + "data": {}, + "weight": 5937 + }, + "41": { + "center": [ + 397.12389380530976, + 570.7256637168142 + ], + "data": {}, + "weight": 113 + }, + "42": { + "center": [ + 673.7706876456876, + 601.6515151515151 + ], + "data": {}, + "weight": 3432 + }, + "43": { + "center": [ + 865.4168564920274, + 620.0205011389521 + ], + "data": {}, + "weight": 2195 + }, + "44": { + "center": [ + 801.2870426409904, + 677.8407702888583 + ], + "data": {}, + "weight": 18175 + }, + "45": { + "center": [ + 564.5897065897066, + 643.5622895622896 + ], + "data": {}, + "weight": 6237 + }, + "46": { + "center": [ + 677.1197960917588, + 650.8493344661568 + ], + "data": {}, + "weight": 7062 + }, + "47": { + "center": [ + 431.4708656113169, + 667.5887504210172 + ], + "data": {}, + "weight": 2969 + }, + "48": { + "center": [ + 1250.7977528089887, + 681.6762830245976 + ], + "data": {}, + "weight": 3293 + }, + "49": { + "center": [ + 1174.1646474060267, + 670.8216837527183 + ], + "data": {}, + "weight": 3219 + }, + "50": { + "center": [ + 461.6, + 658.8 + ], + "data": {}, + "weight": 5 + }, + "51": { + "center": [ + 519.3289419514203, + 775.6991560312886 + ], + "data": {}, + "weight": 19432 + }, + "52": { + "center": [ + 578.2303448275862, + 691.4724137931034 + ], + "data": {}, + "weight": 1450 + }, + "53": { + "center": [ + 614.4514498536845, + 720.4248470337856 + ], + "data": {}, + "weight": 3759 + }, + "54": { + "center": [ + 716.7499115044247, + 741.7646017699115 + ], + "data": {}, + "weight": 5650 + }, + "55": { + "center": [ + 1215.797829036635, + 712.2204884667572 + ], + "data": {}, + "weight": 1474 + }, + "56": { + "center": [ + 1044.1268059855522, + 828.6860595115239 + ], + "data": {}, + "weight": 46512 + }, + "57": { + "center": [ + 1256.0081237911024, + 771.9969052224371 + ], + "data": {}, + "weight": 5170 + }, + "58": { + "center": [ + 151.37325043462886, + 834.8114742021982 + ], + "data": {}, + "weight": 33937 + }, + "59": { + "center": [ + 648.6024126046283, + 751.0792712949286 + ], + "data": {}, + "weight": 4062 + }, + "60": { + "center": [ + 820.7071472964574, + 774.4052206339342 + ], + "data": {}, + "weight": 8045 + }, + "61": { + "center": [ + 52.40762902019446, + 829.6200448765894 + ], + "data": {}, + "weight": 5348 + }, + "62": { + "center": [ + 685.6505894962487, + 792.6162915326903 + ], + "data": {}, + "weight": 933 + }, + "63": { + "center": [ + 723.8527131782946, + 794.4315245478036 + ], + "data": {}, + "weight": 774 + }, + "64": { + "center": [ + 875.3777932960894, + 809.7248603351956 + ], + "data": {}, + "weight": 1432 + }, + "65": { + "center": [ + 274.27272727272725, + 790.2727272727273 + ], + "data": {}, + "weight": 11 + }, + "66": { + "center": [ + 1229.2454147363076, + 905.302595671765 + ], + "data": {}, + "weight": 15757 + }, + "67": { + "center": [ + 442.9921568627451, + 821.1078431372549 + ], + "data": {}, + "weight": 510 + }, + "68": { + "center": [ + 744.9600912200684, + 823.7434435575826 + ], + "data": {}, + "weight": 1754 + }, + "69": { + "center": [ + 707.5842259006816, + 843.8855890944499 + ], + "data": {}, + "weight": 2054 + }, + "70": { + "center": [ + 770.4600266489007, + 872.6480679546969 + ], + "data": {}, + "weight": 6004 + }, + "71": { + "center": [ + 1140.8888210761875, + 913.4141999796562 + ], + "data": {}, + "weight": 9831 + }, + "72": { + "center": [ + 437.87113702623907, + 885.2793002915452 + ], + "data": {}, + "weight": 1715 + }, + "73": { + "center": [ + 289.6280991735537, + 884.4586776859504 + ], + "data": {}, + "weight": 242 + }, + "74": { + "center": [ + 317.4782608695652, + 878.3913043478261 + ], + "data": {}, + "weight": 23 + }, + "75": { + "center": [ + 252.66666666666666, + 900.5833333333334 + ], + "data": {}, + "weight": 12 + }, + "76": { + "center": [ + 770.4202363367799, + 951.0620384047268 + ], + "data": {}, + "weight": 1354 + }, + "77": { + "center": [ + 1036.821052631579, + 956.780701754386 + ], + "data": {}, + "weight": 570 + }, + "78": { + "center": [ + 1096.8165829145728, + 966.9321608040201 + ], + "data": {}, + "weight": 398 + }, + "79": { + "center": [ + 564.3683911313246, + 968.1762364980102 + ], + "data": {}, + "weight": 1759 + }, + "80": { + "center": [ + 86.2921168467387, + 1003.7855142056823 + ], + "data": {}, + "weight": 4998 + }, + "81": { + "center": [ + 1132.5381136950905, + 997.7952196382429 + ], + "data": {}, + "weight": 1548 + }, + "82": { + "center": [ + 292.2210751850409, + 1002.706661472536 + ], + "data": {}, + "weight": 10268 + }, + "83": { + "center": [ + 447.68573905504985, + 1002.9076723016905 + ], + "data": {}, + "weight": 2307 + }, + "84": { + "center": [ + 1209.567589090185, + 1005.3663149512244 + ], + "data": {}, + "weight": 5023 + }, + "85": { + "center": [ + 1088.2470588235294, + 1007.3882352941176 + ], + "data": {}, + "weight": 170 + }, + "86": { + "center": [ + 842.2038043478261, + 1009.4103260869565 + ], + "data": {}, + "weight": 368 + }, + "87": { + "center": [ + 1091.9545454545455, + 1017.3181818181819 + ], + "data": {}, + "weight": 44 + } + } } \ No newline at end of file diff --git a/conquest/data/assets/simple/masks/1.jpg b/conquest/data/assets/simple/masks/1.jpg deleted file mode 100644 index 084384b..0000000 Binary files a/conquest/data/assets/simple/masks/1.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/1.png b/conquest/data/assets/simple/masks/1.png new file mode 100644 index 0000000..88550bc Binary files /dev/null and b/conquest/data/assets/simple/masks/1.png differ diff --git a/conquest/data/assets/simple/masks/10.jpg b/conquest/data/assets/simple/masks/10.jpg deleted file mode 100644 index 078f526..0000000 Binary files a/conquest/data/assets/simple/masks/10.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/10.png b/conquest/data/assets/simple/masks/10.png new file mode 100644 index 0000000..aab1022 Binary files /dev/null and b/conquest/data/assets/simple/masks/10.png differ diff --git a/conquest/data/assets/simple/masks/11.jpg b/conquest/data/assets/simple/masks/11.jpg deleted file mode 100644 index 7d8092e..0000000 Binary files a/conquest/data/assets/simple/masks/11.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/11.png b/conquest/data/assets/simple/masks/11.png new file mode 100644 index 0000000..cb0b7b7 Binary files /dev/null and b/conquest/data/assets/simple/masks/11.png differ diff --git a/conquest/data/assets/simple/masks/12.jpg b/conquest/data/assets/simple/masks/12.jpg deleted file mode 100644 index 89ef52a..0000000 Binary files a/conquest/data/assets/simple/masks/12.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/12.png b/conquest/data/assets/simple/masks/12.png new file mode 100644 index 0000000..4002e3d Binary files /dev/null and b/conquest/data/assets/simple/masks/12.png differ diff --git a/conquest/data/assets/simple/masks/13.jpg b/conquest/data/assets/simple/masks/13.jpg deleted file mode 100644 index d5bcf44..0000000 Binary files a/conquest/data/assets/simple/masks/13.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/13.png b/conquest/data/assets/simple/masks/13.png new file mode 100644 index 0000000..bc582c8 Binary files /dev/null and b/conquest/data/assets/simple/masks/13.png differ diff --git a/conquest/data/assets/simple/masks/14.jpg b/conquest/data/assets/simple/masks/14.jpg deleted file mode 100644 index 86a7c01..0000000 Binary files a/conquest/data/assets/simple/masks/14.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/14.png b/conquest/data/assets/simple/masks/14.png new file mode 100644 index 0000000..2a54648 Binary files /dev/null and b/conquest/data/assets/simple/masks/14.png differ diff --git a/conquest/data/assets/simple/masks/15.jpg b/conquest/data/assets/simple/masks/15.jpg deleted file mode 100644 index b18a720..0000000 Binary files a/conquest/data/assets/simple/masks/15.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/15.png b/conquest/data/assets/simple/masks/15.png new file mode 100644 index 0000000..4caad8d Binary files /dev/null and b/conquest/data/assets/simple/masks/15.png differ diff --git a/conquest/data/assets/simple/masks/16.jpg b/conquest/data/assets/simple/masks/16.jpg deleted file mode 100644 index 1de9ab3..0000000 Binary files a/conquest/data/assets/simple/masks/16.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/16.png b/conquest/data/assets/simple/masks/16.png new file mode 100644 index 0000000..22a1c84 Binary files /dev/null and b/conquest/data/assets/simple/masks/16.png differ diff --git a/conquest/data/assets/simple/masks/17.jpg b/conquest/data/assets/simple/masks/17.jpg deleted file mode 100644 index 6f428bd..0000000 Binary files a/conquest/data/assets/simple/masks/17.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/17.png b/conquest/data/assets/simple/masks/17.png new file mode 100644 index 0000000..cff4883 Binary files /dev/null and b/conquest/data/assets/simple/masks/17.png differ diff --git a/conquest/data/assets/simple/masks/18.jpg b/conquest/data/assets/simple/masks/18.jpg deleted file mode 100644 index c3f13cc..0000000 Binary files a/conquest/data/assets/simple/masks/18.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/18.png b/conquest/data/assets/simple/masks/18.png new file mode 100644 index 0000000..9886860 Binary files /dev/null and b/conquest/data/assets/simple/masks/18.png differ diff --git a/conquest/data/assets/simple/masks/19.jpg b/conquest/data/assets/simple/masks/19.jpg deleted file mode 100644 index bf9ec38..0000000 Binary files a/conquest/data/assets/simple/masks/19.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/19.png b/conquest/data/assets/simple/masks/19.png new file mode 100644 index 0000000..76f73f2 Binary files /dev/null and b/conquest/data/assets/simple/masks/19.png differ diff --git a/conquest/data/assets/simple/masks/2.jpg b/conquest/data/assets/simple/masks/2.jpg deleted file mode 100644 index 6edd658..0000000 Binary files a/conquest/data/assets/simple/masks/2.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/2.png b/conquest/data/assets/simple/masks/2.png new file mode 100644 index 0000000..4f30fe2 Binary files /dev/null and b/conquest/data/assets/simple/masks/2.png differ diff --git a/conquest/data/assets/simple/masks/20.jpg b/conquest/data/assets/simple/masks/20.jpg deleted file mode 100644 index 39fac15..0000000 Binary files a/conquest/data/assets/simple/masks/20.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/20.png b/conquest/data/assets/simple/masks/20.png new file mode 100644 index 0000000..624ff71 Binary files /dev/null and b/conquest/data/assets/simple/masks/20.png differ diff --git a/conquest/data/assets/simple/masks/21.jpg b/conquest/data/assets/simple/masks/21.jpg deleted file mode 100644 index a6f2d88..0000000 Binary files a/conquest/data/assets/simple/masks/21.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/21.png b/conquest/data/assets/simple/masks/21.png new file mode 100644 index 0000000..f75f006 Binary files /dev/null and b/conquest/data/assets/simple/masks/21.png differ diff --git a/conquest/data/assets/simple/masks/22.jpg b/conquest/data/assets/simple/masks/22.jpg deleted file mode 100644 index a4c8057..0000000 Binary files a/conquest/data/assets/simple/masks/22.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/22.png b/conquest/data/assets/simple/masks/22.png new file mode 100644 index 0000000..4aa37d6 Binary files /dev/null and b/conquest/data/assets/simple/masks/22.png differ diff --git a/conquest/data/assets/simple/masks/23.jpg b/conquest/data/assets/simple/masks/23.jpg deleted file mode 100644 index 3229d3e..0000000 Binary files a/conquest/data/assets/simple/masks/23.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/23.png b/conquest/data/assets/simple/masks/23.png new file mode 100644 index 0000000..543e714 Binary files /dev/null and b/conquest/data/assets/simple/masks/23.png differ diff --git a/conquest/data/assets/simple/masks/24.jpg b/conquest/data/assets/simple/masks/24.jpg deleted file mode 100644 index 413bf4a..0000000 Binary files a/conquest/data/assets/simple/masks/24.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/24.png b/conquest/data/assets/simple/masks/24.png new file mode 100644 index 0000000..4e38a2c Binary files /dev/null and b/conquest/data/assets/simple/masks/24.png differ diff --git a/conquest/data/assets/simple/masks/25.jpg b/conquest/data/assets/simple/masks/25.jpg deleted file mode 100644 index c040946..0000000 Binary files a/conquest/data/assets/simple/masks/25.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/25.png b/conquest/data/assets/simple/masks/25.png new file mode 100644 index 0000000..b0b1250 Binary files /dev/null and b/conquest/data/assets/simple/masks/25.png differ diff --git a/conquest/data/assets/simple/masks/26.jpg b/conquest/data/assets/simple/masks/26.jpg deleted file mode 100644 index 232b004..0000000 Binary files a/conquest/data/assets/simple/masks/26.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/26.png b/conquest/data/assets/simple/masks/26.png new file mode 100644 index 0000000..97b48c4 Binary files /dev/null and b/conquest/data/assets/simple/masks/26.png differ diff --git a/conquest/data/assets/simple/masks/27.jpg b/conquest/data/assets/simple/masks/27.jpg deleted file mode 100644 index c8229a3..0000000 Binary files a/conquest/data/assets/simple/masks/27.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/27.png b/conquest/data/assets/simple/masks/27.png new file mode 100644 index 0000000..534e4b1 Binary files /dev/null and b/conquest/data/assets/simple/masks/27.png differ diff --git a/conquest/data/assets/simple/masks/28.jpg b/conquest/data/assets/simple/masks/28.jpg deleted file mode 100644 index d5484a1..0000000 Binary files a/conquest/data/assets/simple/masks/28.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/28.png b/conquest/data/assets/simple/masks/28.png new file mode 100644 index 0000000..5f31160 Binary files /dev/null and b/conquest/data/assets/simple/masks/28.png differ diff --git a/conquest/data/assets/simple/masks/29.jpg b/conquest/data/assets/simple/masks/29.jpg deleted file mode 100644 index 0f138f6..0000000 Binary files a/conquest/data/assets/simple/masks/29.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/29.png b/conquest/data/assets/simple/masks/29.png new file mode 100644 index 0000000..16b9abd Binary files /dev/null and b/conquest/data/assets/simple/masks/29.png differ diff --git a/conquest/data/assets/simple/masks/3.jpg b/conquest/data/assets/simple/masks/3.jpg deleted file mode 100644 index 112d1b0..0000000 Binary files a/conquest/data/assets/simple/masks/3.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/3.png b/conquest/data/assets/simple/masks/3.png new file mode 100644 index 0000000..060e560 Binary files /dev/null and b/conquest/data/assets/simple/masks/3.png differ diff --git a/conquest/data/assets/simple/masks/30.jpg b/conquest/data/assets/simple/masks/30.jpg deleted file mode 100644 index b04de09..0000000 Binary files a/conquest/data/assets/simple/masks/30.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/30.png b/conquest/data/assets/simple/masks/30.png new file mode 100644 index 0000000..18939e1 Binary files /dev/null and b/conquest/data/assets/simple/masks/30.png differ diff --git a/conquest/data/assets/simple/masks/31.jpg b/conquest/data/assets/simple/masks/31.jpg deleted file mode 100644 index 90812e7..0000000 Binary files a/conquest/data/assets/simple/masks/31.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/31.png b/conquest/data/assets/simple/masks/31.png new file mode 100644 index 0000000..9499ea5 Binary files /dev/null and b/conquest/data/assets/simple/masks/31.png differ diff --git a/conquest/data/assets/simple/masks/32.jpg b/conquest/data/assets/simple/masks/32.jpg deleted file mode 100644 index fd12574..0000000 Binary files a/conquest/data/assets/simple/masks/32.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/32.png b/conquest/data/assets/simple/masks/32.png new file mode 100644 index 0000000..e5b8f43 Binary files /dev/null and b/conquest/data/assets/simple/masks/32.png differ diff --git a/conquest/data/assets/simple/masks/33.jpg b/conquest/data/assets/simple/masks/33.jpg deleted file mode 100644 index 87704c5..0000000 Binary files a/conquest/data/assets/simple/masks/33.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/33.png b/conquest/data/assets/simple/masks/33.png new file mode 100644 index 0000000..2272aba Binary files /dev/null and b/conquest/data/assets/simple/masks/33.png differ diff --git a/conquest/data/assets/simple/masks/34.jpg b/conquest/data/assets/simple/masks/34.jpg deleted file mode 100644 index 1c610df..0000000 Binary files a/conquest/data/assets/simple/masks/34.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/34.png b/conquest/data/assets/simple/masks/34.png new file mode 100644 index 0000000..7e9e2b9 Binary files /dev/null and b/conquest/data/assets/simple/masks/34.png differ diff --git a/conquest/data/assets/simple/masks/35.jpg b/conquest/data/assets/simple/masks/35.jpg deleted file mode 100644 index e86c726..0000000 Binary files a/conquest/data/assets/simple/masks/35.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/35.png b/conquest/data/assets/simple/masks/35.png new file mode 100644 index 0000000..c87f26a Binary files /dev/null and b/conquest/data/assets/simple/masks/35.png differ diff --git a/conquest/data/assets/simple/masks/36.jpg b/conquest/data/assets/simple/masks/36.jpg deleted file mode 100644 index 7f4ad3d..0000000 Binary files a/conquest/data/assets/simple/masks/36.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/36.png b/conquest/data/assets/simple/masks/36.png new file mode 100644 index 0000000..b74ecf6 Binary files /dev/null and b/conquest/data/assets/simple/masks/36.png differ diff --git a/conquest/data/assets/simple/masks/37.jpg b/conquest/data/assets/simple/masks/37.jpg deleted file mode 100644 index c8b6b87..0000000 Binary files a/conquest/data/assets/simple/masks/37.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/37.png b/conquest/data/assets/simple/masks/37.png new file mode 100644 index 0000000..135de2b Binary files /dev/null and b/conquest/data/assets/simple/masks/37.png differ diff --git a/conquest/data/assets/simple/masks/38.jpg b/conquest/data/assets/simple/masks/38.jpg deleted file mode 100644 index 6fcd5a6..0000000 Binary files a/conquest/data/assets/simple/masks/38.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/38.png b/conquest/data/assets/simple/masks/38.png new file mode 100644 index 0000000..3146666 Binary files /dev/null and b/conquest/data/assets/simple/masks/38.png differ diff --git a/conquest/data/assets/simple/masks/39.jpg b/conquest/data/assets/simple/masks/39.jpg deleted file mode 100644 index 455f0e5..0000000 Binary files a/conquest/data/assets/simple/masks/39.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/39.png b/conquest/data/assets/simple/masks/39.png new file mode 100644 index 0000000..11eeec6 Binary files /dev/null and b/conquest/data/assets/simple/masks/39.png differ diff --git a/conquest/data/assets/simple/masks/4.jpg b/conquest/data/assets/simple/masks/4.jpg deleted file mode 100644 index b77cc24..0000000 Binary files a/conquest/data/assets/simple/masks/4.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/4.png b/conquest/data/assets/simple/masks/4.png new file mode 100644 index 0000000..901d567 Binary files /dev/null and b/conquest/data/assets/simple/masks/4.png differ diff --git a/conquest/data/assets/simple/masks/40.jpg b/conquest/data/assets/simple/masks/40.jpg deleted file mode 100644 index 5692661..0000000 Binary files a/conquest/data/assets/simple/masks/40.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/40.png b/conquest/data/assets/simple/masks/40.png new file mode 100644 index 0000000..57271d3 Binary files /dev/null and b/conquest/data/assets/simple/masks/40.png differ diff --git a/conquest/data/assets/simple/masks/41.jpg b/conquest/data/assets/simple/masks/41.jpg deleted file mode 100644 index f0e3972..0000000 Binary files a/conquest/data/assets/simple/masks/41.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/41.png b/conquest/data/assets/simple/masks/41.png new file mode 100644 index 0000000..525048a Binary files /dev/null and b/conquest/data/assets/simple/masks/41.png differ diff --git a/conquest/data/assets/simple/masks/42.jpg b/conquest/data/assets/simple/masks/42.jpg deleted file mode 100644 index b41a652..0000000 Binary files a/conquest/data/assets/simple/masks/42.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/42.png b/conquest/data/assets/simple/masks/42.png new file mode 100644 index 0000000..ab63d7d Binary files /dev/null and b/conquest/data/assets/simple/masks/42.png differ diff --git a/conquest/data/assets/simple/masks/43.jpg b/conquest/data/assets/simple/masks/43.jpg deleted file mode 100644 index 463c17f..0000000 Binary files a/conquest/data/assets/simple/masks/43.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/43.png b/conquest/data/assets/simple/masks/43.png new file mode 100644 index 0000000..79ac316 Binary files /dev/null and b/conquest/data/assets/simple/masks/43.png differ diff --git a/conquest/data/assets/simple/masks/44.jpg b/conquest/data/assets/simple/masks/44.jpg deleted file mode 100644 index b2da82b..0000000 Binary files a/conquest/data/assets/simple/masks/44.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/44.png b/conquest/data/assets/simple/masks/44.png new file mode 100644 index 0000000..645bf69 Binary files /dev/null and b/conquest/data/assets/simple/masks/44.png differ diff --git a/conquest/data/assets/simple/masks/45.jpg b/conquest/data/assets/simple/masks/45.jpg deleted file mode 100644 index fdeca1c..0000000 Binary files a/conquest/data/assets/simple/masks/45.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/45.png b/conquest/data/assets/simple/masks/45.png new file mode 100644 index 0000000..5a2011f Binary files /dev/null and b/conquest/data/assets/simple/masks/45.png differ diff --git a/conquest/data/assets/simple/masks/46.jpg b/conquest/data/assets/simple/masks/46.jpg deleted file mode 100644 index 6da7ec6..0000000 Binary files a/conquest/data/assets/simple/masks/46.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/46.png b/conquest/data/assets/simple/masks/46.png new file mode 100644 index 0000000..5bb837f Binary files /dev/null and b/conquest/data/assets/simple/masks/46.png differ diff --git a/conquest/data/assets/simple/masks/47.jpg b/conquest/data/assets/simple/masks/47.jpg deleted file mode 100644 index 4e7a2a4..0000000 Binary files a/conquest/data/assets/simple/masks/47.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/47.png b/conquest/data/assets/simple/masks/47.png new file mode 100644 index 0000000..256b115 Binary files /dev/null and b/conquest/data/assets/simple/masks/47.png differ diff --git a/conquest/data/assets/simple/masks/48.jpg b/conquest/data/assets/simple/masks/48.jpg deleted file mode 100644 index 87223f7..0000000 Binary files a/conquest/data/assets/simple/masks/48.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/48.png b/conquest/data/assets/simple/masks/48.png new file mode 100644 index 0000000..86b6422 Binary files /dev/null and b/conquest/data/assets/simple/masks/48.png differ diff --git a/conquest/data/assets/simple/masks/49.jpg b/conquest/data/assets/simple/masks/49.jpg deleted file mode 100644 index d749cae..0000000 Binary files a/conquest/data/assets/simple/masks/49.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/49.png b/conquest/data/assets/simple/masks/49.png new file mode 100644 index 0000000..3cd4c43 Binary files /dev/null and b/conquest/data/assets/simple/masks/49.png differ diff --git a/conquest/data/assets/simple/masks/5.jpg b/conquest/data/assets/simple/masks/5.jpg deleted file mode 100644 index c392916..0000000 Binary files a/conquest/data/assets/simple/masks/5.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/5.png b/conquest/data/assets/simple/masks/5.png new file mode 100644 index 0000000..b4e3498 Binary files /dev/null and b/conquest/data/assets/simple/masks/5.png differ diff --git a/conquest/data/assets/simple/masks/50.jpg b/conquest/data/assets/simple/masks/50.jpg deleted file mode 100644 index 514a67f..0000000 Binary files a/conquest/data/assets/simple/masks/50.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/50.png b/conquest/data/assets/simple/masks/50.png new file mode 100644 index 0000000..ac713a9 Binary files /dev/null and b/conquest/data/assets/simple/masks/50.png differ diff --git a/conquest/data/assets/simple/masks/51.jpg b/conquest/data/assets/simple/masks/51.jpg deleted file mode 100644 index c928321..0000000 Binary files a/conquest/data/assets/simple/masks/51.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/51.png b/conquest/data/assets/simple/masks/51.png new file mode 100644 index 0000000..b792d32 Binary files /dev/null and b/conquest/data/assets/simple/masks/51.png differ diff --git a/conquest/data/assets/simple/masks/52.jpg b/conquest/data/assets/simple/masks/52.jpg deleted file mode 100644 index 9321238..0000000 Binary files a/conquest/data/assets/simple/masks/52.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/52.png b/conquest/data/assets/simple/masks/52.png new file mode 100644 index 0000000..93217f1 Binary files /dev/null and b/conquest/data/assets/simple/masks/52.png differ diff --git a/conquest/data/assets/simple/masks/53.jpg b/conquest/data/assets/simple/masks/53.jpg deleted file mode 100644 index 4b36e75..0000000 Binary files a/conquest/data/assets/simple/masks/53.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/53.png b/conquest/data/assets/simple/masks/53.png new file mode 100644 index 0000000..b3dff67 Binary files /dev/null and b/conquest/data/assets/simple/masks/53.png differ diff --git a/conquest/data/assets/simple/masks/54.jpg b/conquest/data/assets/simple/masks/54.jpg deleted file mode 100644 index b592522..0000000 Binary files a/conquest/data/assets/simple/masks/54.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/54.png b/conquest/data/assets/simple/masks/54.png new file mode 100644 index 0000000..2e85181 Binary files /dev/null and b/conquest/data/assets/simple/masks/54.png differ diff --git a/conquest/data/assets/simple/masks/55.jpg b/conquest/data/assets/simple/masks/55.jpg deleted file mode 100644 index 5bed3a8..0000000 Binary files a/conquest/data/assets/simple/masks/55.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/55.png b/conquest/data/assets/simple/masks/55.png new file mode 100644 index 0000000..bde2e3f Binary files /dev/null and b/conquest/data/assets/simple/masks/55.png differ diff --git a/conquest/data/assets/simple/masks/56.jpg b/conquest/data/assets/simple/masks/56.jpg deleted file mode 100644 index 627473c..0000000 Binary files a/conquest/data/assets/simple/masks/56.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/56.png b/conquest/data/assets/simple/masks/56.png new file mode 100644 index 0000000..d717ecc Binary files /dev/null and b/conquest/data/assets/simple/masks/56.png differ diff --git a/conquest/data/assets/simple/masks/57.jpg b/conquest/data/assets/simple/masks/57.jpg deleted file mode 100644 index 6e0e1e4..0000000 Binary files a/conquest/data/assets/simple/masks/57.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/57.png b/conquest/data/assets/simple/masks/57.png new file mode 100644 index 0000000..92d4500 Binary files /dev/null and b/conquest/data/assets/simple/masks/57.png differ diff --git a/conquest/data/assets/simple/masks/58.jpg b/conquest/data/assets/simple/masks/58.jpg deleted file mode 100644 index 47e98fe..0000000 Binary files a/conquest/data/assets/simple/masks/58.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/58.png b/conquest/data/assets/simple/masks/58.png new file mode 100644 index 0000000..0e58ea7 Binary files /dev/null and b/conquest/data/assets/simple/masks/58.png differ diff --git a/conquest/data/assets/simple/masks/59.jpg b/conquest/data/assets/simple/masks/59.jpg deleted file mode 100644 index f23e469..0000000 Binary files a/conquest/data/assets/simple/masks/59.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/59.png b/conquest/data/assets/simple/masks/59.png new file mode 100644 index 0000000..0cc4934 Binary files /dev/null and b/conquest/data/assets/simple/masks/59.png differ diff --git a/conquest/data/assets/simple/masks/6.jpg b/conquest/data/assets/simple/masks/6.jpg deleted file mode 100644 index 95eb45f..0000000 Binary files a/conquest/data/assets/simple/masks/6.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/6.png b/conquest/data/assets/simple/masks/6.png new file mode 100644 index 0000000..948f1b8 Binary files /dev/null and b/conquest/data/assets/simple/masks/6.png differ diff --git a/conquest/data/assets/simple/masks/60.jpg b/conquest/data/assets/simple/masks/60.jpg deleted file mode 100644 index c1b149e..0000000 Binary files a/conquest/data/assets/simple/masks/60.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/60.png b/conquest/data/assets/simple/masks/60.png new file mode 100644 index 0000000..451e49f Binary files /dev/null and b/conquest/data/assets/simple/masks/60.png differ diff --git a/conquest/data/assets/simple/masks/61.jpg b/conquest/data/assets/simple/masks/61.jpg deleted file mode 100644 index e343d5d..0000000 Binary files a/conquest/data/assets/simple/masks/61.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/61.png b/conquest/data/assets/simple/masks/61.png new file mode 100644 index 0000000..af09c8c Binary files /dev/null and b/conquest/data/assets/simple/masks/61.png differ diff --git a/conquest/data/assets/simple/masks/62.jpg b/conquest/data/assets/simple/masks/62.jpg deleted file mode 100644 index 413a5ad..0000000 Binary files a/conquest/data/assets/simple/masks/62.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/62.png b/conquest/data/assets/simple/masks/62.png new file mode 100644 index 0000000..e8da124 Binary files /dev/null and b/conquest/data/assets/simple/masks/62.png differ diff --git a/conquest/data/assets/simple/masks/63.jpg b/conquest/data/assets/simple/masks/63.jpg deleted file mode 100644 index f03435f..0000000 Binary files a/conquest/data/assets/simple/masks/63.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/63.png b/conquest/data/assets/simple/masks/63.png new file mode 100644 index 0000000..fc5e25c Binary files /dev/null and b/conquest/data/assets/simple/masks/63.png differ diff --git a/conquest/data/assets/simple/masks/64.jpg b/conquest/data/assets/simple/masks/64.jpg deleted file mode 100644 index 59e80fe..0000000 Binary files a/conquest/data/assets/simple/masks/64.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/64.png b/conquest/data/assets/simple/masks/64.png new file mode 100644 index 0000000..d3bc1ba Binary files /dev/null and b/conquest/data/assets/simple/masks/64.png differ diff --git a/conquest/data/assets/simple/masks/65.jpg b/conquest/data/assets/simple/masks/65.jpg deleted file mode 100644 index fd2cb0d..0000000 Binary files a/conquest/data/assets/simple/masks/65.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/65.png b/conquest/data/assets/simple/masks/65.png new file mode 100644 index 0000000..fee599c Binary files /dev/null and b/conquest/data/assets/simple/masks/65.png differ diff --git a/conquest/data/assets/simple/masks/66.jpg b/conquest/data/assets/simple/masks/66.jpg deleted file mode 100644 index 2ac9dda..0000000 Binary files a/conquest/data/assets/simple/masks/66.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/66.png b/conquest/data/assets/simple/masks/66.png new file mode 100644 index 0000000..d09d5fe Binary files /dev/null and b/conquest/data/assets/simple/masks/66.png differ diff --git a/conquest/data/assets/simple/masks/67.jpg b/conquest/data/assets/simple/masks/67.jpg deleted file mode 100644 index e2ebdc9..0000000 Binary files a/conquest/data/assets/simple/masks/67.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/67.png b/conquest/data/assets/simple/masks/67.png new file mode 100644 index 0000000..56eacfc Binary files /dev/null and b/conquest/data/assets/simple/masks/67.png differ diff --git a/conquest/data/assets/simple/masks/68.jpg b/conquest/data/assets/simple/masks/68.jpg deleted file mode 100644 index 535e506..0000000 Binary files a/conquest/data/assets/simple/masks/68.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/68.png b/conquest/data/assets/simple/masks/68.png new file mode 100644 index 0000000..1f4d185 Binary files /dev/null and b/conquest/data/assets/simple/masks/68.png differ diff --git a/conquest/data/assets/simple/masks/69.jpg b/conquest/data/assets/simple/masks/69.jpg deleted file mode 100644 index 6b1d010..0000000 Binary files a/conquest/data/assets/simple/masks/69.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/69.png b/conquest/data/assets/simple/masks/69.png new file mode 100644 index 0000000..fb5e378 Binary files /dev/null and b/conquest/data/assets/simple/masks/69.png differ diff --git a/conquest/data/assets/simple/masks/7.jpg b/conquest/data/assets/simple/masks/7.jpg deleted file mode 100644 index a0202b0..0000000 Binary files a/conquest/data/assets/simple/masks/7.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/7.png b/conquest/data/assets/simple/masks/7.png new file mode 100644 index 0000000..0687d06 Binary files /dev/null and b/conquest/data/assets/simple/masks/7.png differ diff --git a/conquest/data/assets/simple/masks/70.jpg b/conquest/data/assets/simple/masks/70.jpg deleted file mode 100644 index a1716af..0000000 Binary files a/conquest/data/assets/simple/masks/70.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/70.png b/conquest/data/assets/simple/masks/70.png new file mode 100644 index 0000000..47d070d Binary files /dev/null and b/conquest/data/assets/simple/masks/70.png differ diff --git a/conquest/data/assets/simple/masks/71.png b/conquest/data/assets/simple/masks/71.png new file mode 100644 index 0000000..abad7dd Binary files /dev/null and b/conquest/data/assets/simple/masks/71.png differ diff --git a/conquest/data/assets/simple/masks/72.png b/conquest/data/assets/simple/masks/72.png new file mode 100644 index 0000000..8be0786 Binary files /dev/null and b/conquest/data/assets/simple/masks/72.png differ diff --git a/conquest/data/assets/simple/masks/73.png b/conquest/data/assets/simple/masks/73.png new file mode 100644 index 0000000..f3381f1 Binary files /dev/null and b/conquest/data/assets/simple/masks/73.png differ diff --git a/conquest/data/assets/simple/masks/74.png b/conquest/data/assets/simple/masks/74.png new file mode 100644 index 0000000..0159deb Binary files /dev/null and b/conquest/data/assets/simple/masks/74.png differ diff --git a/conquest/data/assets/simple/masks/75.png b/conquest/data/assets/simple/masks/75.png new file mode 100644 index 0000000..6c9f965 Binary files /dev/null and b/conquest/data/assets/simple/masks/75.png differ diff --git a/conquest/data/assets/simple/masks/76.png b/conquest/data/assets/simple/masks/76.png new file mode 100644 index 0000000..820ad50 Binary files /dev/null and b/conquest/data/assets/simple/masks/76.png differ diff --git a/conquest/data/assets/simple/masks/77.png b/conquest/data/assets/simple/masks/77.png new file mode 100644 index 0000000..96fcb7a Binary files /dev/null and b/conquest/data/assets/simple/masks/77.png differ diff --git a/conquest/data/assets/simple/masks/78.png b/conquest/data/assets/simple/masks/78.png new file mode 100644 index 0000000..07114d6 Binary files /dev/null and b/conquest/data/assets/simple/masks/78.png differ diff --git a/conquest/data/assets/simple/masks/79.png b/conquest/data/assets/simple/masks/79.png new file mode 100644 index 0000000..83403ce Binary files /dev/null and b/conquest/data/assets/simple/masks/79.png differ diff --git a/conquest/data/assets/simple/masks/8.jpg b/conquest/data/assets/simple/masks/8.jpg deleted file mode 100644 index 647c649..0000000 Binary files a/conquest/data/assets/simple/masks/8.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/8.png b/conquest/data/assets/simple/masks/8.png new file mode 100644 index 0000000..59cb06b Binary files /dev/null and b/conquest/data/assets/simple/masks/8.png differ diff --git a/conquest/data/assets/simple/masks/80.png b/conquest/data/assets/simple/masks/80.png new file mode 100644 index 0000000..1e8b089 Binary files /dev/null and b/conquest/data/assets/simple/masks/80.png differ diff --git a/conquest/data/assets/simple/masks/81.png b/conquest/data/assets/simple/masks/81.png new file mode 100644 index 0000000..483d36b Binary files /dev/null and b/conquest/data/assets/simple/masks/81.png differ diff --git a/conquest/data/assets/simple/masks/82.png b/conquest/data/assets/simple/masks/82.png new file mode 100644 index 0000000..bdfafd1 Binary files /dev/null and b/conquest/data/assets/simple/masks/82.png differ diff --git a/conquest/data/assets/simple/masks/83.png b/conquest/data/assets/simple/masks/83.png new file mode 100644 index 0000000..b255481 Binary files /dev/null and b/conquest/data/assets/simple/masks/83.png differ diff --git a/conquest/data/assets/simple/masks/84.png b/conquest/data/assets/simple/masks/84.png new file mode 100644 index 0000000..0ea8697 Binary files /dev/null and b/conquest/data/assets/simple/masks/84.png differ diff --git a/conquest/data/assets/simple/masks/85.png b/conquest/data/assets/simple/masks/85.png new file mode 100644 index 0000000..13e1759 Binary files /dev/null and b/conquest/data/assets/simple/masks/85.png differ diff --git a/conquest/data/assets/simple/masks/86.png b/conquest/data/assets/simple/masks/86.png new file mode 100644 index 0000000..040a279 Binary files /dev/null and b/conquest/data/assets/simple/masks/86.png differ diff --git a/conquest/data/assets/simple/masks/87.png b/conquest/data/assets/simple/masks/87.png new file mode 100644 index 0000000..32051f3 Binary files /dev/null and b/conquest/data/assets/simple/masks/87.png differ diff --git a/conquest/data/assets/simple/masks/9.jpg b/conquest/data/assets/simple/masks/9.jpg deleted file mode 100644 index 3bafeda..0000000 Binary files a/conquest/data/assets/simple/masks/9.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/masks/9.png b/conquest/data/assets/simple/masks/9.png new file mode 100644 index 0000000..aadd798 Binary files /dev/null and b/conquest/data/assets/simple/masks/9.png differ diff --git a/conquest/data/assets/simple/numbered.jpg b/conquest/data/assets/simple/numbered.jpg deleted file mode 100644 index 228e9bb..0000000 Binary files a/conquest/data/assets/simple/numbered.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/numbers.jpg b/conquest/data/assets/simple/numbers.jpg deleted file mode 100644 index de87fd7..0000000 Binary files a/conquest/data/assets/simple/numbers.jpg and /dev/null differ diff --git a/conquest/data/assets/simple/numbers.png b/conquest/data/assets/simple/numbers.png index 2f72371..22f54c8 100644 Binary files a/conquest/data/assets/simple/numbers.png and b/conquest/data/assets/simple/numbers.png differ diff --git a/conquest/regioner.py b/conquest/regioner.py index c7cf506..a18965a 100644 --- a/conquest/regioner.py +++ b/conquest/regioner.py @@ -174,7 +174,7 @@ class ConquestMap: ) def _img_combine_masks(self, mask_list: List[int]): - if not mask_list: + if not mask_list or len(mask_list) < 2: return False, None, None if not self.blank_path().exists(): @@ -190,7 +190,10 @@ class ConquestMap: eliminated_masks = [] for mask_num in mask_list: - if lowest_num is None or mask_num < lowest_num: + if lowest_num is None: + lowest_num = mask_num + elif mask_num < lowest_num: + eliminated_masks.append(lowest_num) lowest_num = mask_num else: eliminated_masks.append(mask_num)