Commit Graph

2086 Commits

Author SHA1 Message Date
Fabian Dill
8ddb1ab614 create per-team enemizer calls 2021-01-27 02:39:12 +01:00
Fabian Dill
7531bb9d11 improve enemizer logging 2021-01-27 02:32:38 +01:00
Chris Wilson
bee6e87615 Merge branch 'main' of https://github.com/berserker66/MultiWorld-Utilities into main 2021-01-26 18:29:43 -05:00
Chris Wilson
5f4a1636aa Fix certain settings not being set properly on the weighted settings page. 2021-01-26 18:29:23 -05:00
CaitSith2
eb1c4313a8 Fix root cause of items not being placed into locations 2021-01-26 13:11:43 -08:00
CaitSith2
c88d9b4339 Additional fixes for Ice Rod Hunt 2021-01-26 07:06:57 -08:00
Fabian Dill
1275e49073 also fix typo in rom.py 2021-01-26 01:46:13 +01:00
Fabian Dill
e081d219c5 Merge pull request #166 from StructuralMike/main
Fix one text target misspelling.
2021-01-26 01:45:33 +01:00
StructuralMike
38a8d1e604 Fix one text target misspelling.
entrace -> entrance
2021-01-26 01:36:24 +01:00
Chris Wilson
761f798f39 Fix formatting in Plando tutorial 2021-01-24 21:31:33 -05:00
Chris Wilson
635d04f6ec Update Player Settings and Weighted Settings pages on website to reflect new possible settings.
- Also fix a bug caused by the website settings always forcing options to lowercase
2021-01-24 21:14:58 -05:00
CaitSith2
5c427f5e3e Add Ice rod hunt to player settings and weighted settings. 2021-01-24 14:52:42 -08:00
Fabian Dill
6e3ca3cc39 add misery_mire_medallion and turtle_rock_medallion to sample yaml 2021-01-24 22:41:58 +01:00
Fabian Dill
9386a9c220 Update Menus 2021-01-24 21:58:26 +01:00
Fabian Dill
a6dad66b59 Merge branch 'multishop' 2021-01-24 20:30:52 +01:00
Fabian Dill
441fa3e5db Allow Plando'ing Dungeon Prizes
There be dragons beyond this point.
2021-01-24 08:26:39 +01:00
CaitSith2
2a5115bc91 Good Bee shop item now fills bottles. 2021-01-23 11:59:32 -08:00
CaitSith2
5b223c3d9f Update base rom. 2021-01-22 15:33:58 -08:00
Fabian Dill
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
CaitSith2
a2eb666ae9 Shop location sram offsets now fully static. 2021-01-22 07:08:50 -08:00
CaitSith2
50888eaa6b Merge branch 'main' into multishop 2021-01-22 05:51:52 -08:00
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
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
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