Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								32c5ee53e5
								
							
						 | 
						
							
							
								
								Test both item swap rules
							
							
							
							
							
						 | 
						
							2021-01-13 02:41:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Chris Wilson
							
						 | 
						
							
							
							
							
							
								
							
							
								51003275d4
								
							
						 | 
						
							
							
								
								Minor size adjustment to "Stream Safe MSU Packs" header
							
							
							
							
							
						 | 
						
							2021-01-11 23:05:06 -05:00 | 
						
					
				
					
						
							
							
								 
								Chris Wilson
							
						 | 
						
							
							
							
							
							
								
							
							
								4880d12654
								
							
						 | 
						
							
							
								
								Re-worded the MSU tutorial to be more technically correct.
							
							
							
							
							
						 | 
						
							2021-01-11 23:03:54 -05:00 | 
						
					
				
					
						
							
							
								 
								Chris Wilson
							
						 | 
						
							
							
							
							
							
								
							
							
								092fde54fd
								
							
						 | 
						
							
							
								
								Add a list of stream-safe MSU packs to the MSU-1 tutorial
							
							
							
							
							
						 | 
						
							2021-01-11 19:59:27 -05:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								a879e3fc8b
								
							
						 | 
						
							
							
								
								use computed goal names for open_pyramid, just in case
							
							
							
							
							
						 | 
						
							2021-01-11 20:45:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								0978daba69
								
							
						 | 
						
							
							
								
								Make sure shop slots obey accessibility rules.
							
							
							
							
							
							
							
							The way this is checked is quite computationally expensive, should revisit later. 
							
						 | 
						
							2021-01-11 19:56:18 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								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) 
							
						 | 
						
							2021-01-11 13:35:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								322feb37f0
								
							
						 | 
						
							
							
								
								remove removed shop locations from relevant caches
							
							
							
							
							
						 | 
						
							2021-01-11 04:06:25 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								3a99aedf89
								
							
						 | 
						
							
							
								
								safer failure in case of no more candidate swaps
							
							
							
							
							
						 | 
						
							2021-01-11 02:55:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								f47fafe7e3
								
							
						 | 
						
							
							
								
								remove empty shopslots from regions
							
							
							
							
							
						 | 
						
							2021-01-11 02:48:57 +01:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								6ab2caf37b
								
							
						 | 
						
							
							
								
								Take Any cave locations now known by MultiClient.
							
							
							
							
							
						 | 
						
							2021-01-10 17:42:58 -08:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								d214a1f596
								
							
						 | 
						
							
							
								
								Re-insert un-filled capacity upgrades back into the shop.
							
							
							
							
							
						 | 
						
							2021-01-10 11:24:13 -08:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								f12259dd7d
								
							
						 | 
						
							
							
								
								Simplify ShopSlot Shuffling
							
							
							
							
							
						 | 
						
							2021-01-10 19:23:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								52d5b96435
								
							
						 | 
						
							
							
								
								optimize price conditions
							
							
							
							
							
						 | 
						
							2021-01-10 16:01:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								3df7c360ef
								
							
						 | 
						
							
							
								
								mark todo
							
							
							
							
							
						 | 
						
							2021-01-10 15:52:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								36123308a6
								
							
						 | 
						
							
							
								
								Refine Shop Item Candidate picking
							
							
							
							
							
						 | 
						
							2021-01-10 15:50:18 +01:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								d8e5d0e4fc
								
							
						 | 
						
							
							
								
								Merge branch 'main' into multishop
							
							
							
							
							
						 | 
						
							2021-01-10 05:57:19 -08:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								10b7c83f1d
								
							
						 | 
						
							
							
								
								Just use locations in the multidata, not static IDs, for forfeits
							
							
							
							
							
							
							
							Should also work better for *other* games 
							
						 | 
						
							2021-01-10 14:50:38 +01:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								a8475c38b2
								
							
						 | 
						
							
							
								
								Merge branch 'multishop-all' into multishop
							
							
							
							
							
						 | 
						
							2021-01-10 05:38:54 -08:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								a4bb67d90a
								
							
						 | 
						
							
							
								
								Merge branch 'main' into multishop
							
							
							
							
							
						 | 
						
							2021-01-10 12:52:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								233e9e6208
								
							
						 | 
						
							
							
								
								expand forfeit to forfeit out anything that is in multidata, so forfeits works with not yet implemented locations
							
							
							
							
							
						 | 
						
							2021-01-10 12:52:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								2442a255cf
								
							
						 | 
						
							
							
								
								Merge pull request #159 from ScootyPuffJr1/main
							
							
							
							
							
							
							
							Update Text.py 
							
						 | 
						
							2021-01-10 12:38:39 +01:00 | 
						
					
				
					
						
							
							
								 
								pepperpow
							
						 | 
						
							
							
							
							
							
								
							
							
								4250004f11
								
							
						 | 
						
							
							
								
								Added Shop ID constant and forfeit values
							
							
							
							
							
						 | 
						
							2021-01-10 05:11:45 -06:00 | 
						
					
				
					
						
							
							
								 
								pepperpow
							
						 | 
						
							
							
							
							
							
								
							
							
								6d28978480
								
							
						 | 
						
							
							
								
								Prevent shop slots rebalancing each other + dungeon item criteria
							
							
							
							
							
						 | 
						
							2021-01-10 03:33:28 -06:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								1848e5e8bc
								
							
						 | 
						
							
							
								
								Whoops, need this block to actually send items.
							
							
							
							
							
						 | 
						
							2021-01-09 22:38:30 -08:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								c4b4ec8fba
								
							
						 | 
						
							
							
								
								No longer need the safety checks.
							
							
							
							
							
						 | 
						
							2021-01-09 18:53:09 -08:00 | 
						
					
				
					
						
							
							
								 
								ScootyPuffJr1
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								575966ce32
								
							
						 | 
						
							
							
								
								Update Text.py
							
							
							
							
							
							
							
							Change to wording for tavern man 
							
						 | 
						
							2021-01-09 19:25:19 -05:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								03552ecf12
								
							
						 | 
						
							
							
								
								remove duplicate Shop name in location names
							
							
							
							
							
						 | 
						
							2021-01-09 22:48:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								00d1f272e8
								
							
						 | 
						
							
							
								
								set reasonable upper bounds for shop_shuffle_slots
							
							
							
							
							
						 | 
						
							2021-01-09 22:37:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								166594a52b
								
							
						 | 
						
							
							
								
								remove potion_shop_shuffle from example yaml
							
							
							
							
							
						 | 
						
							2021-01-09 19:41:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								2a0d1962f1
								
							
						 | 
						
							
							
								
								Tag version required for sending items out of shops
							
							
							
							
							
						 | 
						
							2021-01-09 18:11:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								857e9f4dcd
								
							
						 | 
						
							
							
								
								add w shop_shuffle to CLI
							
							
							
							
							
						 | 
						
							2021-01-09 18:04:14 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								9fcb317aca
								
							
						 | 
						
							
							
								
								convert potion_shop_shuffle into 'w' shop_shuffle flag
							
							
							
							
							
						 | 
						
							2021-01-09 17:53:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								aed763c58f
								
							
						 | 
						
							
							
								
								make potion_shop_shuffle more consistent in type use
							
							
							
							
							
						 | 
						
							2021-01-09 17:29:31 +01:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								e36c6e97c1
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pepper/multishop-all' into multishop
							
							
							
							
							
							
							
							# Conflicts:
#	EntranceRandomizer.py
#	Rom.py
#	WebHostLib/static/static/playerSettings.json
#	data/basepatch.bmbp 
							
						 | 
						
							2021-01-09 16:03:59 +01:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								eea4cb5815
								
							
						 | 
						
							
							
								
								Make sure yamls that specify key drop plando locations don't fail.
							
							
							
							
							
						 | 
						
							2021-01-08 06:37:23 -08:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								48812ad296
								
							
						 | 
						
							
							
								
								Fix bug regarding silent failed plando.
							
							
							
							
							
						 | 
						
							2021-01-08 06:35:12 -08:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								ae687e5bae
								
							
						 | 
						
							
							
								
								consistency changes with difficulties for ice rod hunt.
							
							
							
							
							
						 | 
						
							2021-01-07 23:05:03 -08:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								8116407b88
								
							
						 | 
						
							
							
								
								Add Ice Rod Hunt goal
							
							
							
							
							
						 | 
						
							2021-01-07 12:49:34 -08:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								37cf2e1ac4
								
							
						 | 
						
							
							
								
								speed up local item fill, by sorting by world once instead of up to twice per player
							
							
							
							
							
						 | 
						
							2021-01-07 12:43:11 +01:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								113efa8f02
								
							
						 | 
						
							
							
								
								Fix bugs that prevent seed rolling from continuing if too many plando items are placed.
							
							
							
							
							
						 | 
						
							2021-01-06 11:13:22 -08:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								07f97887d1
								
							
						 | 
						
							
							
								
								Fix bug with boss plandomizer
							
							
							
							
							
						 | 
						
							2021-01-06 11:12:23 -08:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								ad5363c6bc
								
							
						 | 
						
							
							
								
								Merge branch 'main' of https://github.com/Berserker66/MultiWorld-Utilities into main
							
							
							
							
							
						 | 
						
							2021-01-06 09:56:01 -08:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								3d13ab749e
								
							
						 | 
						
							
							
								
								Allow specifying multiple items and locations to fill at once.
							
							
							
							
							
						 | 
						
							2021-01-06 09:55:16 -08:00 | 
						
					
				
					
						
							
							
								 
								Chris Wilson
							
						 | 
						
							
							
							
							
							
								
							
							
								0160487ca9
								
							
						 | 
						
							
							
								
								Add French MSU-1 tutorial translation by Coxla
							
							
							
							
							
						 | 
						
							2021-01-05 17:20:57 -05:00 | 
						
					
				
					
						
							
							
								 
								Fabian Dill
							
						 | 
						
							
							
							
							
							
								
							
							
								9d7cdc99f1
								
							
						 | 
						
							
							
								
								link spanish tutorial
							
							
							
							
							
						 | 
						
							2021-01-05 22:58:30 +01:00 | 
						
					
				
					
						
							
							
								 
								Edos512
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								bd211fd0b5
								
							
						 | 
						
							
							
								
								Create msu1_es.md (#157)
							
							
							
							
							
							
							
							Subbida de traduccion 
							
						 | 
						
							2021-01-05 21:22:18 +01:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								8ef78cc32a
								
							
						 | 
						
							
							
								
								Add options to allow silent failed plando placements.
							
							
							
							
							
						 | 
						
							2021-01-05 09:56:39 -08:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								2891d575f0
								
							
						 | 
						
							
							
								
								Fix bug where you can force non-local triforce pieces on a local triforce hunt.
							
							
							
							
							
						 | 
						
							2021-01-05 09:56:20 -08:00 | 
						
					
				
					
						
							
							
								 
								CaitSith2
							
						 | 
						
							
							
							
							
							
								
							
							
								a6d53aafb0
								
							
						 | 
						
							
							
								
								Add option to hard require plando item placement.
							
							
							
							
							
						 | 
						
							2021-01-04 13:50:42 -08:00 |