Commit Graph

  • 14fb89043e Merge remote-tracking branch 'pepperpow/multishop-all' into multishop CaitSith2 2021-01-21 12:31:19 -0800
  • 2ce6343859 Changed isnot statement pepperpow 2021-01-21 04:39:33 -0600
  • 0992959bc8 Fix for servers that don't return checked items. CaitSith2 2021-01-21 00:12:53 -0800
  • dbd99c31ad client/server changes CaitSith2 2021-01-20 20:58:07 -0800
  • 670b8b4b11 Merge branch 'main' into breaking_changes Fabian Dill 2021-01-21 05:36:16 +0100
  • 2833d99eda only print new check once in web ui Fabian Dill 2021-01-21 05:34:45 +0100
  • f87da18ead Fix coding error CaitSith2 2021-01-20 13:02:34 -0800
  • 62435c8349 Added overworld bee trap disguises, shop indicators and new shop items pepperpow 2021-01-20 04:22:01 -0600
  • dfc64266b9 Fix missed instances of ctx.ui_node.log_info CaitSith2 2021-01-20 00:30:54 -0800
  • 15b949d780 Merge branch 'main' into multishop Fabian Dill 2021-01-20 03:19:38 +0100
  • dc9456f79a fix PyYAML version name to not trigger module updater Fabian Dill 2021-01-20 03:18:46 +0100
  • 4b2a9b3e87 unroll unneeded inner generator expression Fabian Dill 2021-01-20 03:17:51 +0100
  • 2e32ab152e Merge branch 'main' into multishop Fabian Dill 2021-01-20 03:17:08 +0100
  • c5c64f846e update PyYAML Fabian Dill 2021-01-20 03:13:17 +0100
  • c8616a6fe4 update prompt toolkit Fabian Dill 2021-01-19 07:00:17 +0100
  • 276d49981e Convert WebUI to logging.Handler subclass Fabian Dill 2021-01-19 06:37:35 +0100
  • 3f4df40ed1 optimize some things that really don't matter Fabian Dill 2021-01-19 06:03:44 +0100
  • 7e18f93a3a copy shop slots to new world Fabian Dill 2021-01-19 01:03:32 +0100
  • b775bfa916 Merge branch 'main' into multishop Fabian Dill 2021-01-19 01:02:57 +0100
  • e2075686c2 fix ItemPlando defaults Fabian Dill 2021-01-19 01:02:03 +0100
  • 2b730ab1d4 Merge branch 'main' into multishop Fabian Dill 2021-01-18 22:30:05 +0100
  • 4fb8067b5e document item plando force parameter Fabian Dill 2021-01-18 05:07:53 +0100
  • b2d7229dde type shop as Shop Fabian Dill 2021-01-18 04:53:02 +0100
  • 478e1f3a82 General coding pass on Shops Fabian Dill 2021-01-18 04:48:20 +0100
  • a67d657882 Shopswap with higher spheres as well Fabian Dill 2021-01-17 23:17:14 +0100
  • ba07da6bba Change ShopShuffle to operate within current Sphere Fabian Dill 2021-01-17 22:58:52 +0100
  • f4281f81f5 Merge branch 'main' into multishop Fabian Dill 2021-01-17 22:08:43 +0100
  • a87a79eb00 remove some duplicate code Fabian Dill 2021-01-17 22:08:28 +0100
  • 0286a81755 plando world false is default Fabian Dill 2021-01-17 21:42:28 +0100
  • 26314f7c13 Document Connection Plando and show where Connection Plando Errors come from Fabian Dill 2021-01-17 18:28:10 +0100
  • 446893c504 Document Item Plando Fabian Dill 2021-01-17 17:58:58 +0100
  • 5693d8f414 name lint to lint Fabian Dill 2021-01-17 06:59:46 +0100
  • 9d692e070e split github workflows Fabian Dill 2021-01-17 06:58:54 +0100
  • 7333a15f1f handle merge conflicts after plando update Fabian Dill 2021-01-17 06:54:38 +0100
  • 514cd19367 Merge branch 'main' into breaking_changes Fabian Dill 2021-01-17 06:50:25 +0100
  • 3b5ba161de first two plando modules documented Fabian Dill 2021-01-17 02:15:46 +0100
  • 51692e7668 Merge remote-tracking branch 'origin/multishop' into multishop Fabian Dill 2021-01-16 02:23:33 +0100
  • f3e686ba9a Move Shop related stuff to a Shops module Fabian Dill 2021-01-16 02:23:23 +0100
  • 0c1b679100 Whoops, fix for backwards cherry-pick CaitSith2 2021-01-15 17:07:18 -0800
  • 94b56d10f5 Add shops / old man cave to multidata CaitSith2 2021-01-15 17:04:50 -0800
  • 65fa39df95
    Update weightedSettings.json (#162) Fischfilet89 2021-01-16 00:38:55 +0100
  • 25330bd730 Fix displaying Race Seeds Fabian Dill 2021-01-16 00:32:52 +0100
  • f046ca806c Merge branch 'main' into multishop CaitSith2 2021-01-15 10:17:27 -0800
  • 97a5f412a8 remove take_any_locs in-place modifications Fabian Dill 2021-01-15 19:13:22 +0100
  • 10a4a89c5f Merge branch 'main' into multishop CaitSith2 2021-01-15 01:41:36 -0800
  • 6427d246a2 Fix Take-Any caves being non deterministic CaitSith2 2021-01-15 01:32:51 -0800
  • 5afe44f9cb use multidata locations to get missing checks (in server) Fabian Dill 2021-01-15 03:22:56 +0100
  • 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 +0100
  • fd888d9e31
    Update MSU spanish tutorial (#161) Edos512 2021-01-13 22:35:49 +0100
  • 082a7b7e41 Merge branch 'main' into multishop CaitSith2 2021-01-13 10:40:52 -0800
  • 7bb115de72 Fix bug with placements always being empty. CaitSith2 2021-01-13 10:40:23 -0800
  • 67731d9e53 Merge branch 'main' into multishop Fabian Dill 2021-01-13 15:00:19 +0100
  • 85bef9d15e Remove a missed instance of Skull Woods - Pinball Room special handling Fabian Dill 2021-01-13 15:00:00 +0100
  • 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 +0100
  • c0cdeef67a Optimize fulfills_accessibility by pruning to relevant locations Fabian Dill 2021-01-13 14:27:17 +0100
  • 9aea7fa113 Update wording on host game page Chris Wilson 2021-01-12 21:09:59 -0500
  • 32c5ee53e5 Test both item swap rules Fabian Dill 2021-01-13 02:41:29 +0100
  • 51003275d4 Minor size adjustment to "Stream Safe MSU Packs" header Chris Wilson 2021-01-11 23:05:06 -0500
  • 4880d12654 Re-worded the MSU tutorial to be more technically correct. Chris Wilson 2021-01-11 23:03:54 -0500
  • 092fde54fd Add a list of stream-safe MSU packs to the MSU-1 tutorial Chris Wilson 2021-01-11 19:59:27 -0500
  • a879e3fc8b use computed goal names for open_pyramid, just in case Fabian Dill 2021-01-11 20:45:59 +0100
  • 0978daba69 Make sure shop slots obey accessibility rules. Fabian Dill 2021-01-11 19:56:18 +0100
  • 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 +0100
  • 322feb37f0 remove removed shop locations from relevant caches Fabian Dill 2021-01-11 04:06:25 +0100
  • 3a99aedf89 safer failure in case of no more candidate swaps Fabian Dill 2021-01-11 02:55:32 +0100
  • f47fafe7e3 remove empty shopslots from regions Fabian Dill 2021-01-11 02:48:57 +0100
  • 6ab2caf37b Take Any cave locations now known by MultiClient. CaitSith2 2021-01-10 17:42:58 -0800
  • d214a1f596 Re-insert un-filled capacity upgrades back into the shop. CaitSith2 2021-01-10 11:24:13 -0800
  • f12259dd7d Simplify ShopSlot Shuffling Fabian Dill 2021-01-10 19:23:57 +0100
  • 52d5b96435 optimize price conditions Fabian Dill 2021-01-10 16:01:04 +0100
  • 3df7c360ef mark todo Fabian Dill 2021-01-10 15:52:04 +0100
  • 36123308a6 Refine Shop Item Candidate picking Fabian Dill 2021-01-10 15:50:18 +0100
  • d8e5d0e4fc Merge branch 'main' into multishop CaitSith2 2021-01-10 05:57:19 -0800
  • 10b7c83f1d Just use locations in the multidata, not static IDs, for forfeits Fabian Dill 2021-01-10 14:50:38 +0100
  • a8475c38b2 Merge branch 'multishop-all' into multishop CaitSith2 2021-01-10 05:38:54 -0800
  • a4bb67d90a Merge branch 'main' into multishop Fabian Dill 2021-01-10 12:52:41 +0100
  • 233e9e6208 expand forfeit to forfeit out anything that is in multidata, so forfeits works with not yet implemented locations Fabian Dill 2021-01-10 12:52:23 +0100
  • 2442a255cf
    Merge pull request #159 from ScootyPuffJr1/main Fabian Dill 2021-01-10 12:38:39 +0100
  • 4250004f11 Added Shop ID constant and forfeit values pepperpow 2021-01-10 05:11:45 -0600
  • 6d28978480 Prevent shop slots rebalancing each other + dungeon item criteria pepperpow 2021-01-10 03:33:28 -0600
  • 1848e5e8bc Whoops, need this block to actually send items. CaitSith2 2021-01-09 22:37:59 -0800
  • c4b4ec8fba No longer need the safety checks. CaitSith2 2021-01-09 18:52:52 -0800
  • 575966ce32
    Update Text.py ScootyPuffJr1 2021-01-09 19:25:19 -0500
  • 03552ecf12 remove duplicate Shop name in location names Fabian Dill 2021-01-09 22:48:03 +0100
  • 00d1f272e8 set reasonable upper bounds for shop_shuffle_slots Fabian Dill 2021-01-09 22:37:57 +0100
  • 166594a52b remove potion_shop_shuffle from example yaml Fabian Dill 2021-01-09 19:41:54 +0100
  • 2a0d1962f1 Tag version required for sending items out of shops Fabian Dill 2021-01-09 18:11:24 +0100
  • 857e9f4dcd add w shop_shuffle to CLI Fabian Dill 2021-01-09 18:04:14 +0100
  • 9fcb317aca convert potion_shop_shuffle into 'w' shop_shuffle flag Fabian Dill 2021-01-09 17:53:38 +0100
  • aed763c58f make potion_shop_shuffle more consistent in type use Fabian Dill 2021-01-09 17:29:31 +0100
  • e36c6e97c1 Merge remote-tracking branch 'pepper/multishop-all' into multishop Fabian Dill 2021-01-09 16:03:59 +0100
  • eea4cb5815 Make sure yamls that specify key drop plando locations don't fail. CaitSith2 2021-01-08 06:37:23 -0800
  • 48812ad296 Fix bug regarding silent failed plando. CaitSith2 2021-01-08 06:35:12 -0800
  • ae687e5bae consistency changes with difficulties for ice rod hunt. CaitSith2 2021-01-07 23:04:33 -0800
  • 8116407b88 Add Ice Rod Hunt goal CaitSith2 2021-01-07 12:36:39 -0800
  • 37cf2e1ac4 speed up local item fill, by sorting by world once instead of up to twice per player Fabian Dill 2021-01-07 12:43:11 +0100
  • 113efa8f02 Fix bugs that prevent seed rolling from continuing if too many plando items are placed. CaitSith2 2021-01-06 11:13:22 -0800
  • 07f97887d1 Fix bug with boss plandomizer CaitSith2 2021-01-06 11:12:23 -0800
  • ad5363c6bc Merge branch 'main' of https://github.com/Berserker66/MultiWorld-Utilities into main CaitSith2 2021-01-06 09:56:01 -0800
  • 3d13ab749e Allow specifying multiple items and locations to fill at once. CaitSith2 2021-01-06 09:55:16 -0800