morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,382 Commits 3 Branches 10 Tags
a5efed83b96cc9f05e43c036e188c475a5054385
Commit Graph

2382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CaitSith2
ba224535dc Actually count recognized checks for the total. 2021-01-22 05:51:11 -08:00
CaitSith2
6095cfc586 If any shop shuffle slots are defined, define ALL of them to avoid information leakage. 2021-01-22 05:40:50 -08:00
CaitSith2
f02715f988 Merge branch 'main' into multishop 2021-01-22 04:40:32 -08:00
CaitSith2
6163ddd374 Use names listed in Regions.lookup_name_to_id for location names. 2021-01-22 04:40:09 -08:00
CaitSith2
ecf05dc29e Base rom update 2021-01-21 23:05:34 -08:00
Fabian Dill
1d2f7efe46 sort shops explicitly 2021-01-22 07:51:09 +01:00
CaitSith2
bd4e062d8d Revert "Store region/item name/id maps in multidata" 
This reverts commit 6f1fc2ad4e.
 2021-01-21 22:45:21 -08:00
CaitSith2
d32acd37a8 Merge branch 'main' into multishop 2021-01-21 22:45:12 -08:00
CaitSith2
8d63e13ca7 Revert "Multidata is now able to provide items/location IDs to server." 
This reverts commit f47a85d435.
 2021-01-21 22:43:07 -08:00
CaitSith2
67119f8858 Revert "Get remaining things for better client/server interactions." 
This reverts commit 6c1d3cb60d.
 2021-01-21 22:41:19 -08:00
CaitSith2
6f1fc2ad4e Store region/item name/id maps in multidata 2021-01-21 19:38:41 -08:00
CaitSith2
e2be997866 Merge branch 'main' into multishop 2021-01-21 17:01:45 -08:00
CaitSith2
6c1d3cb60d Get remaining things for better client/server interactions. 2021-01-21 16:57:31 -08:00
CaitSith2
d3915ba41f Server side location ids such as cheat console no longer listed as missing. 2021-01-21 16:55:40 -08:00
CaitSith2
f47a85d435 Multidata is now able to provide items/location IDs to server. 2021-01-21 16:23:56 -08:00
CaitSith2
91eacf495b Multidata is now able to provide items/location IDs to server. 2021-01-21 16:23:29 -08:00
CaitSith2
aa22653bfc Fix for servers that don't return checked items. 2021-01-21 16:22:15 -08:00
CaitSith2
8754c63d4e client/server changes 
* Server now includes checked locations as a separate list.
* If client connects to a server that sends checked checks, client can now give accurate information on checked locations, and not show "New Check: seed-unknown-location (total/216)" and instead accurately show "New check: 'seed-known-location' (total_checked/seed_total)"
/missing now accurately reports what was previously checked.
* client now attempts to translate "Unknown Location ID: 'ID'" into an actual location, if server is unaware of the location, but the client is.
 2021-01-21 16:21:51 -08:00
Fabian Dill
7ce9278123 Use shutil.move instead of os.replace, for compatibility 2021-01-21 23:58:30 +01:00
Fabian Dill
c604dfe509 move networks commands to [str, Optional[dict]] across the board 
and some other updates
PrintHTML is an experiment and is unlikely the solution I'll go with
 2021-01-21 23:37:58 +01:00
CaitSith2
60afd0112c Update basepatch 2021-01-21 12:41:14 -08:00
CaitSith2
14fb89043e Merge remote-tracking branch 'pepperpow/multishop-all' into multishop 2021-01-21 12:31:19 -08:00
pepperpow
2ce6343859 Changed isnot statement 2021-01-21 04:39:33 -06:00
CaitSith2
0992959bc8 Fix for servers that don't return checked items. 2021-01-21 00:12:53 -08:00
CaitSith2
dbd99c31ad client/server changes 
* Server now includes checked locations as a separate list.
* If client connects to a server that sends checked checks, client can now give accurate information on checked locations, and not show "New Check: seed-unknown-location (total/216)" and instead accurately show "New check: 'seed-known-location' (total_checked/seed_total)"
/missing now accurately reports what was previously checked.
* client now attempts to translate "Unknown Location ID: 'ID'" into an actual location, if server is unaware of the location, but the client is.
 2021-01-20 20:58:07 -08:00
Fabian Dill
670b8b4b11 Merge branch 'main' into breaking_changes 
# Conflicts:
#	MultiClient.py
#	WebUI.py
 2021-01-21 05:36:16 +01:00
Fabian Dill
2833d99eda only print new check once in web ui 2021-01-21 05:34:45 +01:00
CaitSith2
f87da18ead Fix coding error 2021-01-20 13:02:34 -08:00
pepperpow
62435c8349 Added overworld bee trap disguises, shop indicators and new shop items 2021-01-20 04:22:26 -06:00
CaitSith2
dfc64266b9 Fix missed instances of ctx.ui_node.log_info 2021-01-20 00:30:54 -08:00
Fabian Dill
15b949d780 Merge branch 'main' into multishop 2021-01-20 03:19:38 +01:00
Fabian Dill
dc9456f79a fix PyYAML version name to not trigger module updater 2021-01-20 03:18:46 +01:00
Fabian Dill
4b2a9b3e87 unroll unneeded inner generator expression 2021-01-20 03:17:51 +01:00
Fabian Dill
2e32ab152e Merge branch 'main' into multishop 
# Conflicts:
#	MultiClient.py
 2021-01-20 03:17:08 +01:00
Fabian Dill
c5c64f846e update PyYAML 2021-01-20 03:13:17 +01:00
Fabian Dill
c8616a6fe4 update prompt toolkit 2021-01-19 07:00:17 +01:00
Fabian Dill
276d49981e Convert WebUI to logging.Handler subclass 2021-01-19 06:37:35 +01:00
Fabian Dill
3f4df40ed1 optimize some things that really don't matter 2021-01-19 06:03:44 +01:00
Fabian Dill
7e18f93a3a copy shop slots to new world 2021-01-19 01:03:32 +01:00
Fabian Dill
b775bfa916 Merge branch 'main' into multishop 2021-01-19 01:02:57 +01:00
Fabian Dill
e2075686c2 fix ItemPlando defaults 2021-01-19 01:02:03 +01:00
Fabian Dill
2b730ab1d4 Merge branch 'main' into multishop 2021-01-18 22:30:05 +01:00
Fabian Dill
4fb8067b5e document item plando force parameter 2021-01-18 05:07:53 +01:00
Fabian Dill
b2d7229dde type shop as Shop 2021-01-18 04:53:02 +01:00
Fabian Dill
478e1f3a82 General coding pass on Shops 2021-01-18 04:48:20 +01:00
Fabian Dill
a67d657882 Shopswap with higher spheres as well 2021-01-17 23:17:14 +01:00
Fabian Dill
ba07da6bba Change ShopShuffle to operate within current Sphere 2021-01-17 22:58:52 +01:00
Fabian Dill
f4281f81f5 Merge branch 'main' into multishop 2021-01-17 22:08:43 +01:00
Fabian Dill
a87a79eb00 remove some duplicate code 2021-01-17 22:08:28 +01:00
Fabian Dill
0286a81755 plando world false is default 2021-01-17 21:42:28 +01:00