Commit Graph

56 Commits

Author SHA1 Message Date
pepperpow 222784dbb6 Merge branch 'main' of https://github.com/Berserker66/MultiWorld-Utilities into triforce_changes 2021-02-22 22:44:43 -06:00
StructuralMike 14b20e2c0d
Correctly parse Turtle Rock Medallion settings 2021-02-12 22:11:48 +01:00
CaitSith2 4684c2349c Fix Ice rod hunt beemizer level 4 still having 'Nothing' Items. 2021-02-07 06:34:42 -08:00
Fabian Dill fcbaa35cc5 new inverted logic, accounting for dark world flute activation 2021-02-02 11:24:17 +01:00
Fabian Dill 2352445146 Remove all uses of "item.priority" as the remaining fill algorithms don't need it anymore. 2021-01-30 09:57:25 +01:00
Fabian Dill 61bef142a3 New Beemizer implementation, no longer replacing health; leaving that to item pool settings. 2021-01-30 06:46:17 +01:00
pepperpow 82fc2aba20 Added triforce hud options, expanded triforce requirement 2021-01-29 15:42:00 -06: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 a2eb666ae9 Shop location sram offsets now fully static. 2021-01-22 07:08:50 -08:00
Fabian Dill f3e686ba9a Move Shop related stuff to a Shops module 2021-01-16 02:23:23 +01:00
CaitSith2 f046ca806c Merge branch 'main' into multishop 2021-01-15 10:17:27 -08:00
Fabian Dill 97a5f412a8 remove take_any_locs in-place modifications 2021-01-15 19:13:22 +01:00
CaitSith2 10a4a89c5f Merge branch 'main' into multishop 2021-01-15 01:41:36 -08:00
CaitSith2 6427d246a2 Fix Take-Any caves being non deterministic 2021-01-15 01:32:51 -08: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
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 03552ecf12 remove duplicate Shop name in location names 2021-01-09 22:48:03 +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 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 e7beb80219 Allow Mystery setting Misery Mire and Turtle Rock medallions 2021-01-02 23:00:14 +01:00
pepperpow c67e5ae6e6 Fixed line 2020-12-23 16:36:58 -06: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 37493c85dc Merge branch 'shop-generate' of github.com:pepperpow/MultiWorld-Utilities into multishop-all 2020-12-02 20:41:49 -06:00
pepperpow 4f58459742 Shop Generation options
(reduced from previous PR)
2020-11-23 19:38:57 -06:00
pepperpow fe218fffa6 Potion Shop Changes
(reduced)
2020-11-23 19:00:11 -06:00
CaitSith2 f17682e997 Implement pedestal ganon goal 2020-10-15 15:24:52 -07:00
Fabian Dill b5d91af752 New Logic:
Enemy Shuffle awareness
Easy Item Functionality awareness
Dark Room Logic option
Boss Item Shuffle option
Silverless Ganon is a Minor Glitch

Faster Dungeon Item Fill
2020-10-07 19:51:46 +02:00
Fabian Dill b08178a942 Do not remove Archery Game for a Take any in retro inverted to keep the early money source
Also remove global data modification, which can break very badly on the webhost
2020-09-26 05:09:15 +02:00
Fabian Dill c2393dfa8b fix that custom item pool did not have a universal small key in the front part of HC 2020-09-20 00:15:41 +02:00
Louis-David Perron c40196e07c
Fixed issues with customitemarray (#140)
* Fixed issues with customitemarray

* Fixed Triforce in custom item pool
2020-09-17 00:18:17 +02:00
Fabian Dill f0eebdd84f somehow total_items_to_place got desynced from item pool counts 2020-09-15 05:19:29 +02:00
Fabian Dill f6439dadea Rename Progressive Armor to Progressive Mail to bring it in line with Red Mail and Blue Mail
Also add some more item groups
2020-09-06 17:19:34 +02:00
CaitSith2 3ef9c78c3e Fix for 'Dark Sanctuary Hint' not being a possible take-any location...
...for player numbers after the first inverted retro player.
2020-08-31 14:59:25 -07:00
CaitSith2 db0c0a2e83 Allow the universal small key to be behind the arrow quiver. 2020-08-31 14:25:50 -07:00
CaitSith2 92b1d3ee83 Replace 10 arrows in red shield shop with...
...single arrow + random item in retro.
2020-08-31 14:23:48 -07:00
CaitSith2 e39903283f Progressive bomb/arrow capacity upgrades 2020-08-31 14:23:35 -07:00
Fabian Dill 1103d77ca5 Adjust price shop option to 0.5 to 2.0 range 2020-08-30 03:17:39 +02:00
CaitSith2 8cdd745d69 Fix for beemizer 3/4 having only 3 hearts on easy item pool. 2020-08-29 00:59:21 -07:00
Fabian Dill 0e67ca5ac9 speed up item pool generation 2020-08-28 23:10:07 +02:00
Fabian Dill d03dc8f8bf fix that retro take-any's would not have swords to use 2020-08-25 22:49:15 +02:00
Fabian Dill 7ec37d99fb only iterate of the item pool once for retro replacements 2020-08-25 20:20:36 +02:00
Fabian Dill 6370f4793b Make triforce hunt item pool fully dynamic 2020-08-25 19:45:33 +02:00
Fabian Dill 6d38e87527 Refactor some shop code 2020-08-25 14:31:20 +02:00
CaitSith2 08f8677433 Exclude potion shop from shop sanity.
As potion shop is hard-coded into the game, until some assembly changes are made to handle it specifically, for changing its prices/contents, including this shop could potentially make the only sphere one small key not accessible, (and causes duplicate red/green/blue potions to exist.)
2020-08-25 02:38:32 -07:00