6e3ca3cc39
add misery_mire_medallion and turtle_rock_medallion to sample yaml
2021-01-24 22:41:58 +01:00
9386a9c220
Update Menus
2021-01-24 21:58:26 +01:00
a6dad66b59
Merge branch 'multishop'
2021-01-24 20:30:52 +01:00
441fa3e5db
Allow Plando'ing Dungeon Prizes
...
There be dragons beyond this point.
2021-01-24 08:26:39 +01:00
2a5115bc91
Good Bee shop item now fills bottles.
2021-01-23 11:59:32 -08:00
5b223c3d9f
Update base rom.
2021-01-22 15:33:58 -08:00
1385fb1894
add test for unique sram offsets for shops
...
doubles as a way to print them out for debugging
2021-01-22 20:53:48 +01:00
a2eb666ae9
Shop location sram offsets now fully static.
2021-01-22 07:08:50 -08:00
50888eaa6b
Merge branch 'main' into multishop
2021-01-22 05:51:52 -08:00
ba224535dc
Actually count recognized checks for the total.
2021-01-22 05:51:11 -08:00
6095cfc586
If any shop shuffle slots are defined, define ALL of them to avoid information leakage.
2021-01-22 05:40:50 -08:00
f02715f988
Merge branch 'main' into multishop
2021-01-22 04:40:32 -08:00
6163ddd374
Use names listed in Regions.lookup_name_to_id for location names.
2021-01-22 04:40:09 -08:00
ecf05dc29e
Base rom update
2021-01-21 23:05:34 -08:00
1d2f7efe46
sort shops explicitly
2021-01-22 07:51:09 +01:00
bd4e062d8d
Revert "Store region/item name/id maps in multidata"
...
This reverts commit 6f1fc2ad4e
2021-01-21 22:45:21 -08:00
d32acd37a8
Merge branch 'main' into multishop
2021-01-21 22:45:12 -08:00
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
67119f8858
Revert "Get remaining things for better client/server interactions."
...
This reverts commit 6c1d3cb60d
2021-01-21 22:41:19 -08:00
6f1fc2ad4e
Store region/item name/id maps in multidata
2021-01-21 19:38:41 -08:00
e2be997866
Merge branch 'main' into multishop
2021-01-21 17:01:45 -08:00
6c1d3cb60d
Get remaining things for better client/server interactions.
2021-01-21 16:57:31 -08:00
d3915ba41f
Server side location ids such as cheat console no longer listed as missing.
2021-01-21 16:55:40 -08:00
f47a85d435
Multidata is now able to provide items/location IDs to server.
2021-01-21 16:23:56 -08:00
91eacf495b
Multidata is now able to provide items/location IDs to server.
2021-01-21 16:23:29 -08:00
aa22653bfc
Fix for servers that don't return checked items.
2021-01-21 16:22:15 -08:00
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
7ce9278123
Use shutil.move instead of os.replace, for compatibility
2021-01-21 23:58:30 +01:00
60afd0112c
Update basepatch
2021-01-21 12:41:14 -08:00
14fb89043e
Merge remote-tracking branch 'pepperpow/multishop-all' into multishop
2021-01-21 12:31:19 -08:00
2ce6343859
Changed isnot statement
2021-01-21 04:39:33 -06:00
0992959bc8
Fix for servers that don't return checked items.
2021-01-21 00:12:53 -08:00
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
2833d99eda
only print new check once in web ui
2021-01-21 05:34:45 +01:00
f87da18ead
Fix coding error
2021-01-20 13:02:34 -08:00
62435c8349
Added overworld bee trap disguises, shop indicators and new shop items
2021-01-20 04:22:26 -06:00
dfc64266b9
Fix missed instances of ctx.ui_node.log_info
2021-01-20 00:30:54 -08:00
15b949d780
Merge branch 'main' into multishop
2021-01-20 03:19:38 +01:00
dc9456f79a
fix PyYAML version name to not trigger module updater
2021-01-20 03:18:46 +01:00
4b2a9b3e87
unroll unneeded inner generator expression
2021-01-20 03:17:51 +01:00
2e32ab152e
Merge branch 'main' into multishop
...
# Conflicts:
# MultiClient.py
2021-01-20 03:17:08 +01:00
c5c64f846e
update PyYAML
2021-01-20 03:13:17 +01:00
c8616a6fe4
update prompt toolkit
2021-01-19 07:00:17 +01:00
276d49981e
Convert WebUI to logging.Handler subclass
2021-01-19 06:37:35 +01:00
3f4df40ed1
optimize some things that really don't matter
2021-01-19 06:03:44 +01:00
7e18f93a3a
copy shop slots to new world
2021-01-19 01:03:32 +01:00
b775bfa916
Merge branch 'main' into multishop
2021-01-19 01:02:57 +01:00
e2075686c2
fix ItemPlando defaults
2021-01-19 01:02:03 +01:00
2b730ab1d4
Merge branch 'main' into multishop
2021-01-18 22:30:05 +01:00
4fb8067b5e
document item plando force parameter
2021-01-18 05:07:53 +01:00
Fabian Dill
CaitSith2
pepperpow