Commit Graph

  • e081d219c5 Merge pull request #166 from StructuralMike/main Fabian Dill 2021-01-26 01:45:33 +01:00
  • 38a8d1e604 Fix one text target misspelling. StructuralMike 2021-01-26 01:36:24 +01:00
  • 761f798f39 Fix formatting in Plando tutorial Chris Wilson 2021-01-24 21:31:33 -05:00
  • 635d04f6ec Update Player Settings and Weighted Settings pages on website to reflect new possible settings. Chris Wilson 2021-01-24 21:14:58 -05:00
  • 5c427f5e3e Add Ice rod hunt to player settings and weighted settings. CaitSith2 2021-01-24 14:52:42 -08:00
  • 6e3ca3cc39 add misery_mire_medallion and turtle_rock_medallion to sample yaml Fabian Dill 2021-01-24 22:41:58 +01:00
  • 9386a9c220 Update Menus Fabian Dill 2021-01-24 21:58:26 +01:00
  • a6dad66b59 Merge branch 'multishop' Fabian Dill 2021-01-24 20:30:52 +01:00
  • 441fa3e5db Allow Plando'ing Dungeon Prizes There be dragons beyond this point. Fabian Dill 2021-01-24 08:26:39 +01:00
  • 2a5115bc91 Good Bee shop item now fills bottles. CaitSith2 2021-01-23 11:59:32 -08:00
  • 5b223c3d9f Update base rom. CaitSith2 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 Fabian Dill 2021-01-22 20:53:48 +01:00
  • a2eb666ae9 Shop location sram offsets now fully static. CaitSith2 2021-01-22 07:08:50 -08:00
  • 50888eaa6b Merge branch 'main' into multishop CaitSith2 2021-01-22 05:51:52 -08:00
  • ba224535dc Actually count recognized checks for the total. CaitSith2 2021-01-22 05:51:11 -08:00
  • 6095cfc586 If any shop shuffle slots are defined, define ALL of them to avoid information leakage. CaitSith2 2021-01-22 05:40:50 -08:00
  • f02715f988 Merge branch 'main' into multishop CaitSith2 2021-01-22 04:40:32 -08:00
  • 6163ddd374 Use names listed in Regions.lookup_name_to_id for location names. CaitSith2 2021-01-22 04:40:09 -08:00
  • ecf05dc29e Base rom update CaitSith2 2021-01-21 23:05:34 -08:00
  • 1d2f7efe46 sort shops explicitly Fabian Dill 2021-01-22 07:51:09 +01:00
  • bd4e062d8d Revert "Store region/item name/id maps in multidata" CaitSith2 2021-01-21 19:38:41 -08:00
  • d32acd37a8 Merge branch 'main' into multishop CaitSith2 2021-01-21 22:45:12 -08:00
  • 8d63e13ca7 Revert "Multidata is now able to provide items/location IDs to server." CaitSith2 2021-01-21 15:59:28 -08:00
  • 67119f8858 Revert "Get remaining things for better client/server interactions." CaitSith2 2021-01-21 16:57:31 -08:00
  • 6f1fc2ad4e Store region/item name/id maps in multidata CaitSith2 2021-01-21 19:38:41 -08:00
  • e2be997866 Merge branch 'main' into multishop CaitSith2 2021-01-21 17:01:45 -08:00
  • 6c1d3cb60d Get remaining things for better client/server interactions. CaitSith2 2021-01-21 16:57:31 -08:00
  • d3915ba41f Server side location ids such as cheat console no longer listed as missing. CaitSith2 2021-01-21 16:55:40 -08:00
  • f47a85d435 Multidata is now able to provide items/location IDs to server. CaitSith2 2021-01-21 15:59:28 -08:00
  • 91eacf495b Multidata is now able to provide items/location IDs to server. CaitSith2 2021-01-21 15:59:28 -08:00
  • aa22653bfc Fix for servers that don't return checked items. CaitSith2 2021-01-21 00:12:53 -08:00
  • 8754c63d4e client/server changes CaitSith2 2021-01-21 16:21:51 -08:00
  • 7ce9278123 Use shutil.move instead of os.replace, for compatibility Fabian Dill 2021-01-21 23:58:30 +01:00
  • 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 Fabian Dill 2021-01-21 23:37:58 +01:00
  • 60afd0112c Update basepatch CaitSith2 2021-01-21 12:41:14 -08:00
  • 14fb89043e Merge remote-tracking branch 'pepperpow/multishop-all' into multishop CaitSith2 2021-01-21 12:31:19 -08:00
  • 2ce6343859 Changed isnot statement pepperpow 2021-01-21 04:39:33 -06:00
  • 0992959bc8 Fix for servers that don't return checked items. CaitSith2 2021-01-21 00:12:53 -08:00
  • dbd99c31ad client/server changes CaitSith2 2021-01-20 20:58:07 -08:00
  • 670b8b4b11 Merge branch 'main' into breaking_changes Fabian Dill 2021-01-21 05:36:16 +01:00
  • 2833d99eda only print new check once in web ui Fabian Dill 2021-01-21 05:34:45 +01:00
  • f87da18ead Fix coding error CaitSith2 2021-01-20 13:02:34 -08:00
  • 62435c8349 Added overworld bee trap disguises, shop indicators and new shop items pepperpow 2021-01-20 04:22:01 -06:00
  • dfc64266b9 Fix missed instances of ctx.ui_node.log_info CaitSith2 2021-01-20 00:30:54 -08:00
  • 15b949d780 Merge branch 'main' into multishop Fabian Dill 2021-01-20 03:19:38 +01:00
  • dc9456f79a fix PyYAML version name to not trigger module updater Fabian Dill 2021-01-20 03:18:46 +01:00
  • 4b2a9b3e87 unroll unneeded inner generator expression Fabian Dill 2021-01-20 03:17:51 +01:00
  • 2e32ab152e Merge branch 'main' into multishop Fabian Dill 2021-01-20 03:17:08 +01:00
  • c5c64f846e update PyYAML Fabian Dill 2021-01-20 03:13:17 +01:00
  • c8616a6fe4 update prompt toolkit Fabian Dill 2021-01-19 07:00:17 +01:00
  • 276d49981e Convert WebUI to logging.Handler subclass Fabian Dill 2021-01-19 06:37:35 +01:00
  • 3f4df40ed1 optimize some things that really don't matter Fabian Dill 2021-01-19 06:03:44 +01:00
  • 7e18f93a3a copy shop slots to new world Fabian Dill 2021-01-19 01:03:32 +01:00
  • b775bfa916 Merge branch 'main' into multishop Fabian Dill 2021-01-19 01:02:57 +01:00
  • e2075686c2 fix ItemPlando defaults Fabian Dill 2021-01-19 01:02:03 +01:00
  • 2b730ab1d4 Merge branch 'main' into multishop Fabian Dill 2021-01-18 22:30:05 +01:00
  • 4fb8067b5e document item plando force parameter Fabian Dill 2021-01-18 05:07:53 +01:00
  • b2d7229dde type shop as Shop Fabian Dill 2021-01-18 04:53:02 +01:00
  • 478e1f3a82 General coding pass on Shops Fabian Dill 2021-01-18 04:48:20 +01:00
  • a67d657882 Shopswap with higher spheres as well Fabian Dill 2021-01-17 23:17:14 +01:00
  • ba07da6bba Change ShopShuffle to operate within current Sphere Fabian Dill 2021-01-17 22:58:52 +01:00
  • f4281f81f5 Merge branch 'main' into multishop Fabian Dill 2021-01-17 22:08:43 +01:00
  • a87a79eb00 remove some duplicate code Fabian Dill 2021-01-17 22:08:28 +01:00
  • 0286a81755 plando world false is default Fabian Dill 2021-01-17 21:42:28 +01:00
  • 26314f7c13 Document Connection Plando and show where Connection Plando Errors come from Fabian Dill 2021-01-17 18:28:10 +01:00
  • 446893c504 Document Item Plando Fabian Dill 2021-01-17 17:58:58 +01:00
  • 5693d8f414 name lint to lint Fabian Dill 2021-01-17 06:59:46 +01:00
  • 9d692e070e split github workflows Fabian Dill 2021-01-17 06:58:54 +01:00
  • 7333a15f1f handle merge conflicts after plando update Fabian Dill 2021-01-17 06:54:38 +01:00
  • 514cd19367 Merge branch 'main' into breaking_changes Fabian Dill 2021-01-17 06:50:25 +01:00
  • 3b5ba161de first two plando modules documented Fabian Dill 2021-01-17 02:15:46 +01:00
  • 51692e7668 Merge remote-tracking branch 'origin/multishop' into multishop Fabian Dill 2021-01-16 02:23:33 +01:00
  • f3e686ba9a Move Shop related stuff to a Shops module Fabian Dill 2021-01-16 02:23:23 +01:00
  • 0c1b679100 Whoops, fix for backwards cherry-pick CaitSith2 2021-01-15 17:07:18 -08:00
  • 94b56d10f5 Add shops / old man cave to multidata CaitSith2 2021-01-15 17:04:50 -08:00
  • 65fa39df95 Update weightedSettings.json (#162) Fischfilet89 2021-01-16 00:38:55 +01:00
  • 25330bd730 Fix displaying Race Seeds Fabian Dill 2021-01-16 00:32:52 +01:00
  • f046ca806c Merge branch 'main' into multishop CaitSith2 2021-01-15 10:17:27 -08:00
  • 97a5f412a8 remove take_any_locs in-place modifications Fabian Dill 2021-01-15 19:13:22 +01:00
  • 10a4a89c5f Merge branch 'main' into multishop CaitSith2 2021-01-15 01:41:36 -08:00
  • 6427d246a2 Fix Take-Any caves being non deterministic CaitSith2 2021-01-15 01:32:51 -08:00
  • 5afe44f9cb use multidata locations to get missing checks (in server) Fabian Dill 2021-01-15 03:22:56 +01:00
  • d214783932 If due to DR or Plando the world is not fulfilling access rules, default to can_beat_game for Shop Logic Fabian Dill 2021-01-14 00:26:49 +01:00
  • fd888d9e31 Update MSU spanish tutorial (#161) Edos512 2021-01-13 22:35:49 +01:00
  • 082a7b7e41 Merge branch 'main' into multishop CaitSith2 2021-01-13 10:40:52 -08:00
  • 7bb115de72 Fix bug with placements always being empty. CaitSith2 2021-01-13 10:40:23 -08:00
  • 67731d9e53 Merge branch 'main' into multishop Fabian Dill 2021-01-13 15:00:19 +01:00
  • 85bef9d15e Remove a missed instance of Skull Woods - Pinball Room special handling Fabian Dill 2021-01-13 15:00:00 +01:00
  • e8a57a4d24 Change hint for shop items to be "for sale" Lock Dungeon Prizes, as they're not supposed to be moved by any swapping mechanic Fabian Dill 2021-01-13 14:58:40 +01:00
  • c0cdeef67a Optimize fulfills_accessibility by pruning to relevant locations Fabian Dill 2021-01-13 14:27:17 +01:00
  • 9aea7fa113 Update wording on host game page Chris Wilson 2021-01-12 21:09:59 -05:00
  • 32c5ee53e5 Test both item swap rules Fabian Dill 2021-01-13 02:41:29 +01:00
  • 51003275d4 Minor size adjustment to "Stream Safe MSU Packs" header Chris Wilson 2021-01-11 23:05:06 -05:00
  • 4880d12654 Re-worded the MSU tutorial to be more technically correct. Chris Wilson 2021-01-11 23:03:54 -05:00
  • 092fde54fd Add a list of stream-safe MSU packs to the MSU-1 tutorial Chris Wilson 2021-01-11 19:59:27 -05:00
  • a879e3fc8b use computed goal names for open_pyramid, just in case Fabian Dill 2021-01-11 20:45:59 +01:00
  • 0978daba69 Make sure shop slots obey accessibility rules. Fabian Dill 2021-01-11 19:56:18 +01:00
  • 058436e47f shop cleanup and correctly backreference swapped items' locations Also fixes a false reference in progression balancing from 2019 (swapped Location.item.location was not updated) Fabian Dill 2021-01-11 13:35:48 +01:00
  • 322feb37f0 remove removed shop locations from relevant caches Fabian Dill 2021-01-11 04:06:25 +01:00
  • 3a99aedf89 safer failure in case of no more candidate swaps Fabian Dill 2021-01-11 02:55:32 +01:00