7e18f93a3a
copy shop slots to new world
2021-01-19 01:03:32 +01:00
b775bfa916
Merge branch 'main' into multishop
2021-01-19 01:02:57 +01:00
e2075686c2
fix ItemPlando defaults
2021-01-19 01:02:03 +01:00
2b730ab1d4
Merge branch 'main' into multishop
2021-01-18 22:30:05 +01:00
4fb8067b5e
document item plando force parameter
2021-01-18 05:07:53 +01:00
b2d7229dde
type shop as Shop
2021-01-18 04:53:02 +01:00
478e1f3a82
General coding pass on Shops
2021-01-18 04:48:20 +01:00
a67d657882
Shopswap with higher spheres as well
2021-01-17 23:17:14 +01:00
ba07da6bba
Change ShopShuffle to operate within current Sphere
2021-01-17 22:58:52 +01:00
f4281f81f5
Merge branch 'main' into multishop
2021-01-17 22:08:43 +01:00
a87a79eb00
remove some duplicate code
2021-01-17 22:08:28 +01:00
0286a81755
plando world false is default
2021-01-17 21:42:28 +01:00
26314f7c13
Document Connection Plando
...
and show where Connection Plando Errors come from
2021-01-17 18:28:10 +01:00
446893c504
Document Item Plando
2021-01-17 17:58:58 +01:00
3b5ba161de
first two plando modules documented
2021-01-17 02:15:46 +01:00
51692e7668
Merge remote-tracking branch 'origin/multishop' into multishop
2021-01-16 02:23:33 +01:00
f3e686ba9a
Move Shop related stuff to a Shops module
2021-01-16 02:23:23 +01:00
0c1b679100
Whoops, fix for backwards cherry-pick
2021-01-15 17:07:18 -08:00
94b56d10f5
Add shops / old man cave to multidata
2021-01-15 17:04:50 -08:00
65fa39df95
Update weightedSettings.json ( #162 )
...
fixed a typo at line 1020 regarding enemy health on the setting "armor-plated"
2021-01-16 00:38:55 +01:00
25330bd730
Fix displaying Race Seeds
2021-01-16 00:32:52 +01:00
f046ca806c
Merge branch 'main' into multishop
2021-01-15 10:17:27 -08:00
97a5f412a8
remove take_any_locs in-place modifications
2021-01-15 19:13:22 +01:00
10a4a89c5f
Merge branch 'main' into multishop
2021-01-15 01:41:36 -08:00
6427d246a2
Fix Take-Any caves being non deterministic
2021-01-15 01:32:51 -08:00
5afe44f9cb
use multidata locations to get missing checks (in server)
2021-01-15 03:22:56 +01:00
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
fd888d9e31
Update MSU spanish tutorial ( #161 )
...
Added Stream-safe MSU packs section
2021-01-13 22:35:49 +01:00
082a7b7e41
Merge branch 'main' into multishop
2021-01-13 10:40:52 -08:00
7bb115de72
Fix bug with placements always being empty.
...
It will never be not empty, because every placement that succeeds gets its event set to true, and the conditional expects locations already placed within the fill to also not be events.
2021-01-13 10:40:23 -08:00
67731d9e53
Merge branch 'main' into multishop
2021-01-13 15:00:19 +01:00
85bef9d15e
Remove a missed instance of Skull Woods - Pinball Room special handling
2021-01-13 15:00:00 +01:00
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
c0cdeef67a
Optimize fulfills_accessibility by pruning to relevant locations
2021-01-13 14:27:17 +01:00
9aea7fa113
Update wording on host game page
2021-01-12 21:09:59 -05:00
32c5ee53e5
Test both item swap rules
2021-01-13 02:41:29 +01:00
51003275d4
Minor size adjustment to "Stream Safe MSU Packs" header
2021-01-11 23:05:06 -05:00
4880d12654
Re-worded the MSU tutorial to be more technically correct.
2021-01-11 23:03:54 -05:00
092fde54fd
Add a list of stream-safe MSU packs to the MSU-1 tutorial
2021-01-11 19:59:27 -05:00
a879e3fc8b
use computed goal names for open_pyramid, just in case
2021-01-11 20:45:59 +01:00
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
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
322feb37f0
remove removed shop locations from relevant caches
2021-01-11 04:06:25 +01:00
3a99aedf89
safer failure in case of no more candidate swaps
2021-01-11 02:55:32 +01:00
f47fafe7e3
remove empty shopslots from regions
2021-01-11 02:48:57 +01:00
6ab2caf37b
Take Any cave locations now known by MultiClient.
2021-01-10 17:42:58 -08:00
d214a1f596
Re-insert un-filled capacity upgrades back into the shop.
2021-01-10 11:24:13 -08:00
f12259dd7d
Simplify ShopSlot Shuffling
2021-01-10 19:23:57 +01:00
52d5b96435
optimize price conditions
2021-01-10 16:01:04 +01:00
3df7c360ef
mark todo
2021-01-10 15:52:04 +01:00
Fabian Dill
CaitSith2
Fischfilet89
Edos512
Chris Wilson