c988ec24b6
update item table offsets
2021-01-30 23:40:01 +01:00
28c12054dd
update to Shops release
2021-01-30 23:37:35 +01:00
a646594f08
Merge branch 'main' into breaking_changes
...
# Conflicts:
# BaseClasses.py
# Fill.py
# MultiClient.py
# MultiServer.py
# Utils.py
# test/dungeons/TestDungeon.py
# test/inverted/TestInverted.py
# test/inverted_minor_glitches/TestInvertedMinor.py
# test/inverted_owg/TestInvertedOWG.py
# test/minor_glitches/TestMinor.py
# test/owg/TestVanillaOWG.py
# test/vanilla/TestVanilla.py
# worlds/alttp/ItemPool.py
# worlds/alttp/Main.py
# worlds/alttp/Rom.py
2021-01-30 23:29:32 +01:00
24e8fb54ad
update fast_ganon hole description
2021-01-30 23:17:54 +01:00
520dd7ba91
Merge remote-tracking branch 'origin/main'
2021-01-30 09:57:33 +01:00
2352445146
Remove all uses of "item.priority" as the remaining fill algorithms don't need it anymore.
2021-01-30 09:57:25 +01:00
ad8427c15a
Fix shop tracking.
2021-01-29 22:52:10 -08:00
8c301044e3
Add Nothing to the trap_replaceable list.
2021-01-29 22:15:39 -08:00
61bef142a3
New Beemizer implementation, no longer replacing health; leaving that to item pool settings.
2021-01-30 06:46:17 +01:00
5cc8dd2c71
Fix mistake made while reverting changes
2021-01-29 20:57:38 -08:00
aa9fe0d9cd
Removed debugging info
2021-01-29 19:16:25 -06:00
5c074c2c4f
Replace localtriforcehunt with teamtriforcehunt
2021-01-29 19:07:19 -06:00
d3129e25e1
Merge remote-tracking branch 'origin/main'
2021-01-30 02:02:20 +01:00
69ceb89202
Make Heart Pieces and Heart Containers significantly cheaper in Shops.
...
Obversation that triggered this is that they almost always get skipped, want to make the choice more enticing.
2021-01-30 02:02:13 +01:00
90c3fe9df3
Count take-any caves into final total.
2021-01-29 15:42:28 -08:00
1d93952ef1
Revert part of a previous change
2021-01-29 13:49:17 -08:00
82fc2aba20
Added triforce hud options, expanded triforce requirement
2021-01-29 15:42:00 -06:00
7f74aa7cb0
Implement open_pyramid yaml settings
2021-01-29 13:27:42 -08:00
fda32578fa
Modify end credits count.
2021-01-29 04:51:58 -08:00
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
ca4758d1c2
Actually disable shop slots that already have an item pushed in.
2021-01-29 00:21:42 -08:00
9ee5c50f88
Fixed non-deterministic shop-sanity shuffling.
2021-01-28 22:39:04 -08:00
8ddb1ab614
create per-team enemizer calls
2021-01-27 02:39:12 +01:00
7531bb9d11
improve enemizer logging
2021-01-27 02:32:38 +01:00
bee6e87615
Merge branch 'main' of https://github.com/berserker66/MultiWorld-Utilities into main
2021-01-26 18:29:43 -05:00
5f4a1636aa
Fix certain settings not being set properly on the weighted settings page.
2021-01-26 18:29:23 -05:00
eb1c4313a8
Fix root cause of items not being placed into locations
2021-01-26 13:11:43 -08:00
c88d9b4339
Additional fixes for Ice Rod Hunt
2021-01-26 07:06:57 -08:00
1275e49073
also fix typo in rom.py
2021-01-26 01:46:13 +01:00
e081d219c5
Merge pull request #166 from StructuralMike/main
...
Fix one text target misspelling.
2021-01-26 01:45:33 +01:00
38a8d1e604
Fix one text target misspelling.
...
entrace -> entrance
2021-01-26 01:36:24 +01:00
761f798f39
Fix formatting in Plando tutorial
2021-01-24 21:31:33 -05:00
635d04f6ec
Update Player Settings and Weighted Settings pages on website to reflect new possible settings.
...
- Also fix a bug caused by the website settings always forcing options to lowercase
2021-01-24 21:14:58 -05:00
5c427f5e3e
Add Ice rod hunt to player settings and weighted settings.
2021-01-24 14:52:42 -08:00
6e3ca3cc39
add misery_mire_medallion and turtle_rock_medallion to sample yaml
2021-01-24 22:41:58 +01:00
9386a9c220
Update Menus
2021-01-24 21:58:26 +01:00
a6dad66b59
Merge branch 'multishop'
2021-01-24 20:30:52 +01:00
441fa3e5db
Allow Plando'ing Dungeon Prizes
...
There be dragons beyond this point.
2021-01-24 08:26:39 +01:00
2a5115bc91
Good Bee shop item now fills bottles.
2021-01-23 11:59:32 -08:00
5b223c3d9f
Update base rom.
2021-01-22 15:33:58 -08:00
1385fb1894
add test for unique sram offsets for shops
...
doubles as a way to print them out for debugging
2021-01-22 20:53:48 +01:00
a2eb666ae9
Shop location sram offsets now fully static.
2021-01-22 07:08:50 -08:00
50888eaa6b
Merge branch 'main' into multishop
2021-01-22 05:51:52 -08:00
ba224535dc
Actually count recognized checks for the total.
2021-01-22 05:51:11 -08:00
6095cfc586
If any shop shuffle slots are defined, define ALL of them to avoid information leakage.
2021-01-22 05:40:50 -08:00
f02715f988
Merge branch 'main' into multishop
2021-01-22 04:40:32 -08:00
6163ddd374
Use names listed in Regions.lookup_name_to_id for location names.
2021-01-22 04:40:09 -08:00
ecf05dc29e
Base rom update
2021-01-21 23:05:34 -08:00
1d2f7efe46
sort shops explicitly
2021-01-22 07:51:09 +01:00
bd4e062d8d
Revert "Store region/item name/id maps in multidata"
...
This reverts commit 6f1fc2ad4e
2021-01-21 22:45:21 -08:00
Fabian Dill
CaitSith2
pepperpow
Chris Wilson
Fabian Dill
StructuralMike