CaitSith2
							
						 
					 | 
					
						
						
							
						
						94b56d10f5
					 | 
					
						
						
							
							Add shops / old man cave to multidata
						
						
						
						
						
						
					 | 
					
						2021-01-15 17:04:50 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						d214783932
					 | 
					
						
						
							
							If due to DR or Plando the world is not fulfilling access rules, default to can_beat_game for Shop Logic
						
						
						
						
						
						
					 | 
					
						2021-01-14 00:26:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						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 
						
						
					 | 
					
						2021-01-13 14:58:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						32c5ee53e5
					 | 
					
						
						
							
							Test both item swap rules
						
						
						
						
						
						
					 | 
					
						2021-01-13 02:41:29 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						2a0d1962f1
					 | 
					
						
						
							
							Tag version required for sending items out of shops
						
						
						
						
						
						
					 | 
					
						2021-01-09 18:11:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						9fcb317aca
					 | 
					
						
						
							
							convert potion_shop_shuffle into 'w' shop_shuffle flag
						
						
						
						
						
						
					 | 
					
						2021-01-09 17:53:38 +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
							
						 
					 | 
					
						
						
							
						
						2891d575f0
					 | 
					
						
						
							
							Fix bug where you can force non-local triforce pieces on a local triforce hunt.
						
						
						
						
						
						
					 | 
					
						2021-01-05 09:56:20 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						bd86a07115
					 | 
					
						
						
							
							make random world targeting smarter, in only considering possible unfilled locations
						
						
						
						
						
						
					 | 
					
						2021-01-04 15:14:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						c24a376dd0
					 | 
					
						
						
							
							Always check for beatability, ignoring playthrough setting
						
						
						
						
						
						
					 | 
					
						2021-01-04 14:28:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						e7beb80219
					 | 
					
						
						
							
							Allow Mystery setting Misery Mire and Turtle Rock medallions
						
						
						
						
						
						
					 | 
					
						2021-01-02 23:00:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						be162f5b8d
					 | 
					
						
						
							
							Connections Plando Support
						
						
						
						
						
						
					 | 
					
						2021-01-02 22:41:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						07df9b9e80
					 | 
					
						
						
							
							Text Plando Support
						
						
						
						
						
						
					 | 
					
						2021-01-02 16:44:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						f3b6be2b20
					 | 
					
						
						
							
							Item Plando Support
						
						
						
						
						
						
					 | 
					
						2021-01-02 12:49:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						e25a03173b
					 | 
					
						
						
							
							Implement "minimum version" checks into server and clients
						
						
						
						
						
						
					 | 
					
						2020-12-29 19:23:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						62cfa8813f
					 | 
					
						
						
							
							Merge branch 'shop-fill' into multishop-all
						
						
						
						
						
						
					 | 
					
						2020-12-23 20:50:41 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						f72d93f6f6
					 | 
					
						
						
							
							Fix divide by zero
						
						
						
						
						
						
					 | 
					
						2020-12-23 20:50:13 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						0debc3289b
					 | 
					
						
						
							
							Merge branch 'shop-fill' into multishop-all
						
						
						
						
						
						
					 | 
					
						2020-12-23 16:36:45 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						6f0511c047
					 | 
					
						
						
							
							Move shop table adjustments outside of Rom.py
						
						
						
						
						
						
					 | 
					
						2020-12-23 16:36:06 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						a5a09ec4eb
					 | 
					
						
						
							
							Merge branch 'shop-fill' into multishop-all
						
						
						
						
						
						
					 | 
					
						2020-12-23 15:31:23 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						4c5cf78939
					 | 
					
						
						
							
							Fixes to logic, doesn't make unwinnable games
						
						
						
						
						
						
					 | 
					
						2020-12-23 15:30:21 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						c66e97faf6
					 | 
					
						
						
							
							Merge branch 'shop-fill' into multishop-all
						
						
						
						
						
						
					 | 
					
						2020-12-23 11:29:20 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						83304fd314
					 | 
					
						
						
							
							Rotate rupees out of shop and equalize prices
						
						
						
						
						
						
					 | 
					
						2020-12-23 11:28:42 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaitSith2
							
						 
					 | 
					
						
						
							
						
						d090a02d81
					 | 
					
						
						
							
							Implement tile shuffle
						
						
						
						
						
						
					 | 
					
						2020-12-22 01:05:48 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaitSith2
							
						 
					 | 
					
						
						
							
						
						2fccb3751c
					 | 
					
						
						
							
							Disallow non-local pendants and crystals
						
						
						
						
						
						
					 | 
					
						2020-12-19 16:23:21 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaitSith2
							
						 
					 | 
					
						
						
							
						
						35c00588ba
					 | 
					
						
						
							
							Make sure dungeon items aren't in non-local pool if the appropriate shuffle isn't set.
						
						
						
						
						
						
					 | 
					
						2020-12-19 15:36:29 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						767c84a581
					 | 
					
						
						
							
							Merge branch 'shop-fill' into multishop-all
						
						
						
						
						
						
					 | 
					
						2020-12-15 02:36:48 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						ffe5b4b1a1
					 | 
					
						
						
							
							Fixes to clients/servers for shop checks
						
						
						
						
						
						
					 | 
					
						2020-12-15 02:34:22 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						7b5bd016b9
					 | 
					
						
						
							
							Merge branch 'potion-shop' of github.com:pepperpow/MultiWorld-Utilities into multishop-all
						
						
						
						
						
						
					 | 
					
						2020-12-02 20:35:59 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						608d96329f
					 | 
					
						
						
							
							Shop Item Pool fill feature + multiworld player compatability
						
						
						
						
						
						
					 | 
					
						2020-11-23 20:05:04 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pepperpow
							
						 
					 | 
					
						
						
							
						
						fe218fffa6
					 | 
					
						
						
							
							Potion Shop Changes
						
						
						
						
						
						
						
						(reduced) 
						
						
					 | 
					
						2020-11-23 19:00:11 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaitSith2
							
						 
					 | 
					
						
						
							
						
						4370447adc
					 | 
					
						
						
							
							More fixes to non_local_items
						
						
						
						
						
						
					 | 
					
						2020-11-22 14:29:11 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						fc2f1dfd29
					 | 
					
						
						
							
							implement "non_local_items"
						
						
						
						
						
						
					 | 
					
						2020-11-22 22:53:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaitSith2
							
						 
					 | 
					
						
						
							
						
						d95a16a09e
					 | 
					
						
						
							
							Fix issue with inverted dungeon names on entrance data table.
						
						
						
						
						
						
					 | 
					
						2020-10-30 23:41:56 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fabian Dill
							
						 
					 | 
					
						
						
							
						
						99d596540f
					 | 
					
						
						
							
							Merge pull request #147 from KScl/ohko_weights
						
						
						
						
						
						
						
						Options for amount of time given in timer modes 
						
						
					 | 
					
						2020-10-30 03:51:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaitSith2
							
						 
					 | 
					
						
						
							
						
						5f535012f3
					 | 
					
						
						
							
							Remove debug info
						
						
						
						
						
						
					 | 
					
						2020-10-29 15:32:23 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaitSith2
							
						 
					 | 
					
						
						
							
						
						d79147fc58
					 | 
					
						
						
							
							Remove doors specific argument.
						
						
						
						
						
						
					 | 
					
						2020-10-29 15:32:05 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CaitSith2
							
						 
					 | 
					
						
						
							
						
						008e84c9a0
					 | 
					
						
						
							
							Add Location to area data to multidata
						
						
						
						
						
						
					 | 
					
						2020-10-29 15:28:18 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kaito Sinclaire
							
						 
					 | 
					
						
						
							
						
						41a58084f1
					 | 
					
						
						
							
							Options for amount of time given in timer modes
						
						
						
						
						
						
						
						(Primarily to make Timed OHKO a viable multiworld and/or mystery option,
but also works with other timer modes as well) 
						
						
					 | 
					
						2020-10-28 16:20:59 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |