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
pepperpow
fe218fffa6
Potion Shop Changes
...
(reduced)
2020-11-23 19:00:11 -06:00
CaitSith2
75d5df3cd7
Fix bug with Uncle assist if uncle item is for another player.
2020-11-06 20:03:14 -08:00
Fabian Dill
52afe1b20b
comment out remaining link palette shuffle references
2020-11-06 08:31:10 +01:00
Fabian Dill
bb28cce24c
note player name for mirrorless courtyard path failure
2020-11-06 03:25:26 +01: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
e48838151b
Fix 2nd easy item pool silverbow not counting towards the 216 when it is your own.
2020-10-28 20:49:47 -07:00
CaitSith2
d3ee3a84c1
Fix Random sprite on event bug where a sprite that was not in user pool was added.
2020-10-28 18:31:32 -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
Fabian Dill
1e480648b9
use individual palette for sprite if it exists
2020-10-28 07:55:29 +01:00
Fabian Dill
dbb4acf045
fix accidental sprite palette overrides
2020-10-28 07:53:31 +01:00
CaitSith2
7cf4ad35a9
Encrypt most of the remaining items, and all player IDs
2020-10-27 01:43:32 -07:00
Fabian Dill
2d43cae88e
palette fixes
2020-10-24 05:33:52 +02:00
Edos512
b91a627b32
Added options from Maseya Palette Randomizer ( #145 )
...
Add remaining palette shuffle options
2020-10-24 02:44:27 +02:00
CaitSith2
b2a60ac926
Fix "LOCKED" always showing on file select screen.
2020-10-21 02:29:38 -07:00
CaitSith2
651e1a1901
Changes
...
* Fix chests always being for yourself AND intended recipient for Race Rom seeds.
* Fix MultiMystery not being able to correctly pack Race Rom seeds into a zip file.
* Add tags to multidata for Race rom, Spoiler log, and Playthrough if spoiler log was generated.
2020-10-21 02:02:13 -07:00
CaitSith2
ad765659dd
Add Race rom encryption.
2020-10-20 01:16:20 -07:00
CaitSith2
e72b74d476
Fix non-determistic random sprite (due to multithreading.)
2020-10-19 22:35:08 -07:00
Fabian Dill
9b237795f3
more "normal" english on the 1 crystal sign
2020-10-18 23:33:17 +02:00
Fabian Dill
e0f1f4ecfa
Fix All dungeons sign
2020-10-17 05:25:51 +02:00
