37 Commits

Author SHA1 Message Date
bobloy
2315bd9fc3 The rest converted??? 2021-08-19 17:29:41 -04:00
bobloy
e02c7ba14b beginning of set map 2021-08-09 10:02:08 -04:00
bobloy
3e25c8a13f Saving and loading 2021-07-23 16:02:26 -04:00
bobloy
d987018664 More zoom WIP 2021-07-23 09:27:32 -04:00
bobloy
25e90c350f More progress on switched to ConquestGame class 2021-07-22 17:25:13 -04:00
bobloy
2d0c9e31b3 WIP self.current_map 2021-07-16 11:32:47 -04:00
bobloy
80db00890d Merge branch 'master' into conquest_develop
# Conflicts:
#	conquest/conquest.py
#	conquest/mapmaker.py
2021-07-16 09:28:44 -04:00
bobloy
61fa006e33 QoL fixes 2021-07-16 09:26:06 -04:00
Sourcery AI
0475b18437 'Refactored by Sourcery' 2021-03-18 17:20:04 +00:00
bobloy
4496903663 further WIP 2020-10-07 13:42:50 -04:00
bobloy
4457d51f07 More WIP conquest 2020-10-06 17:36:36 -04:00
bobloy
4cd033bf12 WIP conquest 2020-10-04 17:54:15 -04:00
bobloy
d0445f41c7 Black format update 2020-09-29 17:36:08 -04:00
bobloy
664aa63833 much to do 2020-08-27 17:13:00 -04:00
bobloy
500915b947 Game data is different 2020-08-22 13:26:17 -04:00
bobloy
7574117d9a WIP ConquestGame and per guild saving 2020-08-19 15:57:02 -04:00
bobloy
f0d33f0354 Better mask combination 2020-08-18 21:21:48 -04:00
bobloy
e2e5477661 Better number positioning, better mask combining and generation 2020-08-18 17:02:58 -04:00
bobloy
c3c40c594e More region classification 2020-08-17 16:41:56 -04:00
bobloy
52fc284f5a WIP Classification 2020-08-17 08:17:49 -04:00
bobloy
ef925b1621 Map maker is almost working 2020-08-13 17:33:09 -04:00
bobloy
58ad3fc978 It's actually a maximum 2020-08-13 12:18:31 -04:00
bobloy
07b90c30a0 Don't use os, more mapmaker 2020-08-13 09:48:16 -04:00
bobloy
a1b89c9f9d More map maper and notes on regioner 2020-08-12 17:37:38 -04:00
bobloy
f93986e65f Reorder methods 2020-08-12 15:28:36 -04:00
bobloy
11258d3e76 mapmapker back to conquest.py 2020-08-12 13:16:47 -04:00
bobloy
c02244ceb5
More Conquest Updates (#115)
* Start of map maker, ambiguous file format (probably just jpg and png)

* More map maker WIP

* This isn't dad

* Split mapmaker

* Don't load current map if it doesn't exist

* WIP mapmaker
2020-08-12 11:00:41 -04:00
bobloy
5fff65c7d5 WIP mapmaker 2020-08-12 10:59:52 -04:00
bobloy
8012a20ddb Don't load current map if it doesn't exist 2020-08-12 10:58:51 -04:00
bobloy
3b156d8275 Split mapmaker 2020-08-12 10:03:07 -04:00
bobloy
ae200eb911 This isn't dad 2020-08-12 09:46:07 -04:00
bobloy
03b42b04ef Merge branch 'master' into conquest_develop 2020-08-12 09:42:34 -04:00
bobloy
f944879896 Why tf were so many hidden? 2020-08-12 09:41:41 -04:00
bobloy
42aab1e801 More map maker WIP 2020-08-12 09:38:35 -04:00
bobloy
dc8d314713 Start of map maker, ambiguous file format (probably just jpg and png) 2020-08-11 17:23:42 -04:00
bobloy
11a5a7505b Fix invalid json 2020-08-10 17:48:28 -04:00
bobloy
b9dbad8bd1
Conquest initial (#113)
* Initial files

* Functioning image coloring

* Add more commands, untested

* Add map list, move set to under conquest, and WIP saving map

* ALl masks, mostly working commands

* Unneeded original.jpg

* Rename to simple, WIP numbered

* Use numbers as mask, probably need to switch to png soon

* Save to config, test zoom levels

* Handle zoom properly, save it to json for each map as well

* Move maps to WIP folder

* WIP folder not in data folder

* Info and READMe updates
2020-08-10 17:03:25 -04:00