Commit Graph

408 Commits

Author SHA1 Message Date
pepperpow
36de78dddd Moved inverted goal sign to castle lawn 2021-02-01 20:26:07 -06:00
pepperpow
99468e6d46 Fixed flute working in both worlds instead of just dark 2021-01-31 21:42:44 -06:00
pepperpow
6b737775a2 Added hash/inverted sign message 2021-01-31 20:57:18 -06:00
pepperpow
4aedf3a8ed inverted_flute 2021-01-31 18:26:49 -06:00
CaitSith2
77a0e6f9cf Triforce at pedestal / Trinexx now correctly counts towards final total. 2021-01-31 00:54:31 -08:00
CaitSith2
ad8427c15a Fix shop tracking. 2021-01-29 22:52:10 -08:00
CaitSith2
90c3fe9df3 Count take-any caves into final total. 2021-01-29 15:42:28 -08:00
CaitSith2
fda32578fa Modify end credits count. 2021-01-29 04:51:58 -08:00
CaitSith2
96e12088d7 Shop-sanity shops now marked as counting towards end-game credits.
Retro single arrow now marks itself as purchased from every single shop location on initial purchase.  (Nothing prevents you from buying your 'first' quiver if you already have one, however, its 6 hint points for the price of one in shop sanity.)
2021-01-29 00:25:13 -08:00
Fabian Dill
8ddb1ab614 create per-team enemizer calls 2021-01-27 02:39:12 +01:00
Fabian Dill
7531bb9d11 improve enemizer logging 2021-01-27 02:32:38 +01:00
Fabian Dill
1275e49073 also fix typo in rom.py 2021-01-26 01:46:13 +01:00
CaitSith2
2a5115bc91 Good Bee shop item now fills bottles. 2021-01-23 11:59:32 -08:00
CaitSith2
5b223c3d9f Update base rom. 2021-01-22 15:33:58 -08:00
CaitSith2
a2eb666ae9 Shop location sram offsets now fully static. 2021-01-22 07:08:50 -08:00
CaitSith2
ecf05dc29e Base rom update 2021-01-21 23:05:34 -08:00
Fabian Dill
1d2f7efe46 sort shops explicitly 2021-01-22 07:51:09 +01:00
CaitSith2
60afd0112c Update basepatch 2021-01-21 12:41:14 -08:00
pepperpow
62435c8349 Added overworld bee trap disguises, shop indicators and new shop items 2021-01-20 04:22:26 -06:00
Fabian Dill
478e1f3a82 General coding pass on Shops 2021-01-18 04:48:20 +01:00
Fabian Dill
f3e686ba9a Move Shop related stuff to a Shops module 2021-01-16 02:23:23 +01:00
Fabian Dill
67731d9e53 Merge branch 'main' into multishop 2021-01-13 15:00:19 +01:00
Fabian Dill
85bef9d15e Remove a missed instance of Skull Woods - Pinball Room special handling 2021-01-13 15:00:00 +01:00
CaitSith2
6ab2caf37b Take Any cave locations now known by MultiClient. 2021-01-10 17:42:58 -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
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
8116407b88 Add Ice Rod Hunt goal 2021-01-07 12:49:34 -08: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
Fabian Dill
07df9b9e80 Text Plando Support 2021-01-02 16:44:58 +01:00
Fabian Dill
44eb5eebdc update Enemizer 2020-12-29 20:01:27 +01:00
Fabian Dill
b9457f3da2 apply sprite to rom last, to overwrite palette shuffler changes 2020-12-29 08:03:56 +01: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
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
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
Fabian Dill
62c330788b Update WebHost sprites 2020-12-04 23:56:21 +01: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
360fcbea9e Add new patch, disallow single bee traps from shops 2020-12-02 20:00:08 -06:00
pepperpow
8f1a6a434e Updated basepatch 2020-11-30 15:16:38 -06:00
CaitSith2
e78e22477c Fix possible TypeError 2020-11-24 10:40:25 -08:00
CaitSith2
79aea6b3a6 more english improvements. 2020-11-24 10:29:52 -08:00
CaitSith2
5475b00b58 Fix bug where a sworded seed on normal item functionality or greater can still kill freezors with bombos. 2020-11-24 07:54:08 -08:00
pepperpow
afe371613c update patch 2020-11-24 01:31:30 -06:00
pepperpow
6e01442092 Updated patch 2020-11-24 01:30:00 -06:00
pepperpow
6642769caf Added missing player byte from table 2020-11-23 20:17:03 -06:00
pepperpow
167a253596 Added basepatch 2020-11-23 20:06:44 -06:00