94b56d10f5
Add shops / old man cave to multidata
2021-01-15 17:04:50 -08: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
36123308a6
Refine Shop Item Candidate picking
2021-01-10 15:50:18 +01:00
d8e5d0e4fc
Merge branch 'main' into multishop
2021-01-10 05:57:19 -08:00
10b7c83f1d
Just use locations in the multidata, not static IDs, for forfeits
...
Should also work better for *other* games
2021-01-10 14:50:38 +01:00
a8475c38b2
Merge branch 'multishop-all' into multishop
2021-01-10 05:38:54 -08:00
a4bb67d90a
Merge branch 'main' into multishop
2021-01-10 12:52:41 +01:00
233e9e6208
expand forfeit to forfeit out anything that is in multidata, so forfeits works with not yet implemented locations
2021-01-10 12:52:23 +01:00
2442a255cf
Merge pull request #159 from ScootyPuffJr1/main
...
Update Text.py
2021-01-10 12:38:39 +01:00
4250004f11
Added Shop ID constant and forfeit values
2021-01-10 05:11:45 -06:00
6d28978480
Prevent shop slots rebalancing each other + dungeon item criteria
2021-01-10 03:33:28 -06:00
1848e5e8bc
Whoops, need this block to actually send items.
2021-01-09 22:38:30 -08:00
c4b4ec8fba
No longer need the safety checks.
2021-01-09 18:53:09 -08:00
575966ce32
Update Text.py
...
Change to wording for tavern man
2021-01-09 19:25:19 -05:00
03552ecf12
remove duplicate Shop name in location names
2021-01-09 22:48:03 +01:00
00d1f272e8
set reasonable upper bounds for shop_shuffle_slots
2021-01-09 22:37:57 +01:00
166594a52b
remove potion_shop_shuffle from example yaml
2021-01-09 19:41:54 +01:00
2a0d1962f1
Tag version required for sending items out of shops
2021-01-09 18:11:24 +01:00
857e9f4dcd
add w shop_shuffle to CLI
2021-01-09 18:04:14 +01:00
9fcb317aca
convert potion_shop_shuffle into 'w' shop_shuffle flag
2021-01-09 17:53:38 +01:00
aed763c58f
make potion_shop_shuffle more consistent in type use
2021-01-09 17:29:31 +01:00
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
Fabian Dill
Edos512
Chris Wilson
Fabian Dill
pepperpow
ScootyPuffJr1