CaitSith2
|
1d93952ef1
|
Revert part of a previous change
|
2021-01-29 13:49:17 -08:00 |
|
pepperpow
|
82fc2aba20
|
Added triforce hud options, expanded triforce requirement
|
2021-01-29 15:42:00 -06:00 |
|
CaitSith2
|
7f74aa7cb0
|
Implement open_pyramid yaml settings
|
2021-01-29 13:27:42 -08:00 |
|
Fabian Dill
|
8ddb1ab614
|
create per-team enemizer calls
|
2021-01-27 02:39:12 +01: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 |
|
CaitSith2
|
6095cfc586
|
If any shop shuffle slots are defined, define ALL of them to avoid information leakage.
|
2021-01-22 05:40:50 -08:00 |
|
CaitSith2
|
bd4e062d8d
|
Revert "Store region/item name/id maps in multidata"
This reverts commit 6f1fc2ad4e.
|
2021-01-21 22:45:21 -08:00 |
|
CaitSith2
|
6f1fc2ad4e
|
Store region/item name/id maps in multidata
|
2021-01-21 19:38:41 -08:00 |
|
Fabian Dill
|
7e18f93a3a
|
copy shop slots to new world
|
2021-01-19 01:03:32 +01:00 |
|
Fabian Dill
|
b775bfa916
|
Merge branch 'main' into multishop
|
2021-01-19 01:02:57 +01:00 |
|
Fabian Dill
|
e2075686c2
|
fix ItemPlando defaults
|
2021-01-19 01:02:03 +01:00 |
|
Fabian Dill
|
51692e7668
|
Merge remote-tracking branch 'origin/multishop' into multishop
|
2021-01-16 02:23:33 +01:00 |
|
Fabian Dill
|
f3e686ba9a
|
Move Shop related stuff to a Shops module
|
2021-01-16 02:23:23 +01:00 |
|
CaitSith2
|
0c1b679100
|
Whoops, fix for backwards cherry-pick
|
2021-01-15 17:07:18 -08:00 |
|
CaitSith2
|
94b56d10f5
|
Add shops / old man cave to multidata
|
2021-01-15 17:04:50 -08:00 |
|
Fabian Dill
|
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 |
|
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 |
|
Fabian Dill
|
32c5ee53e5
|
Test both item swap rules
|
2021-01-13 02:41:29 +01:00 |
|
Fabian Dill
|
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 |
|
Fabian Dill
|
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 |
|
Fabian Dill
|
322feb37f0
|
remove removed shop locations from relevant caches
|
2021-01-11 04:06:25 +01:00 |
|
Fabian Dill
|
3a99aedf89
|
safer failure in case of no more candidate swaps
|
2021-01-11 02:55:32 +01:00 |
|
Fabian Dill
|
f47fafe7e3
|
remove empty shopslots from regions
|
2021-01-11 02:48:57 +01:00 |
|
Fabian Dill
|
f12259dd7d
|
Simplify ShopSlot Shuffling
|
2021-01-10 19:23:57 +01:00 |
|
Fabian Dill
|
52d5b96435
|
optimize price conditions
|
2021-01-10 16:01:04 +01:00 |
|
Fabian Dill
|
3df7c360ef
|
mark todo
|
2021-01-10 15:52:04 +01:00 |
|
Fabian Dill
|
36123308a6
|
Refine Shop Item Candidate picking
|
2021-01-10 15:50:18 +01:00 |
|
pepperpow
|
4250004f11
|
Added Shop ID constant and forfeit values
|
2021-01-10 05:11:45 -06:00 |
|
pepperpow
|
6d28978480
|
Prevent shop slots rebalancing each other + dungeon item criteria
|
2021-01-10 03:33:28 -06:00 |
|
Fabian Dill
|
2a0d1962f1
|
Tag version required for sending items out of shops
|
2021-01-09 18:11:24 +01:00 |
|
Fabian Dill
|
9fcb317aca
|
convert potion_shop_shuffle into 'w' shop_shuffle flag
|
2021-01-09 17:53:38 +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
|
2891d575f0
|
Fix bug where you can force non-local triforce pieces on a local triforce hunt.
|
2021-01-05 09:56:20 -08:00 |
|
Fabian Dill
|
bd86a07115
|
make random world targeting smarter, in only considering possible unfilled locations
|
2021-01-04 15:14:20 +01:00 |
|
Fabian Dill
|
c24a376dd0
|
Always check for beatability, ignoring playthrough setting
|
2021-01-04 14:28:33 +01:00 |
|
Fabian Dill
|
e7beb80219
|
Allow Mystery setting Misery Mire and Turtle Rock medallions
|
2021-01-02 23:00:14 +01:00 |
|
Fabian Dill
|
be162f5b8d
|
Connections Plando Support
|
2021-01-02 22:41:03 +01:00 |
|
Fabian Dill
|
07df9b9e80
|
Text Plando Support
|
2021-01-02 16:44:58 +01:00 |
|
Fabian Dill
|
f3b6be2b20
|
Item Plando Support
|
2021-01-02 12:49:43 +01:00 |
|
Fabian Dill
|
e25a03173b
|
Implement "minimum version" checks into server and clients
|
2020-12-29 19:23:14 +01:00 |
|
pepperpow
|
62cfa8813f
|
Merge branch 'shop-fill' into multishop-all
|
2020-12-23 20:50:41 -06:00 |
|
pepperpow
|
f72d93f6f6
|
Fix divide by zero
|
2020-12-23 20:50:13 -06: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
|
a5a09ec4eb
|
Merge branch 'shop-fill' into multishop-all
|
2020-12-23 15:31:23 -06:00 |
|
pepperpow
|
4c5cf78939
|
Fixes to logic, doesn't make unwinnable games
|
2020-12-23 15:30:21 -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 |
|