Commit Graph

2489 Commits

Author SHA1 Message Date
CaitSith2
87d5a481f9 Merge branch 'inverted_flut' into main 2021-02-01 20:59:50 -08:00
pepperpow
36de78dddd Moved inverted goal sign to castle lawn 2021-02-01 20:26:07 -06:00
pepperpow
99468e6d46 Fixed flute working in both worlds instead of just dark 2021-01-31 21:42:44 -06:00
pepperpow
6b737775a2 Added hash/inverted sign message 2021-01-31 20:57:18 -06:00
Fabian Dill
078ad30195 Fix Multiworld tracker 2021-02-01 01:58:08 +01:00
pepperpow
4aedf3a8ed inverted_flute 2021-01-31 18:26:49 -06:00
pepperpow
cd85279ded Missed number in log output 2021-01-31 07:46:40 -06:00
Fabian Dill
1da1e4eac6 Sample implemention of JSONtoTextParser 2021-01-31 11:33:39 +01:00
CaitSith2
77a0e6f9cf Triforce at pedestal / Trinexx now correctly counts towards final total. 2021-01-31 00:54:31 -08:00
Fabian Dill
b78f852579 reduce prices of ammo and ammo capacity upgrades, make heart container actually 4X a heart piece and reduce progression item price slightly 2021-01-31 06:47:57 +01:00
Chris Wilson
b4502f1338 Fix indentation bug in weightedSettings.yaml 2021-01-30 19:05:06 -05:00
Chris Wilson
889d24606f Updated weighted settings to reflect new beemizer documentation and include pyramid_open options 2021-01-30 19:03:54 -05:00
Fabian Dill
3d81f0cca7 update after merge from /main 2021-01-30 23:43:15 +01:00
Fabian Dill
2553b1d2ee Merge branch 'main' into breaking_changes 2021-01-30 23:40:25 +01:00
Fabian Dill
c988ec24b6 update item table offsets 2021-01-30 23:40:01 +01:00
Fabian Dill
28c12054dd update to Shops release 2021-01-30 23:37:35 +01:00
Fabian Dill
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
Fabian Dill
24e8fb54ad update fast_ganon hole description 2021-01-30 23:17:54 +01:00
Fabian Dill
520dd7ba91 Merge remote-tracking branch 'origin/main' 2021-01-30 09:57:33 +01:00
Fabian Dill
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
CaitSith2
ad8427c15a Fix shop tracking. 2021-01-29 22:52:10 -08:00
CaitSith2
8c301044e3 Add Nothing to the trap_replaceable list. 2021-01-29 22:15:39 -08:00
Fabian Dill
61bef142a3 New Beemizer implementation, no longer replacing health; leaving that to item pool settings. 2021-01-30 06:46:17 +01:00
CaitSith2
5cc8dd2c71 Fix mistake made while reverting changes 2021-01-29 20:57:38 -08:00
pepperpow
aa9fe0d9cd Removed debugging info 2021-01-29 19:16:25 -06:00
pepperpow
5c074c2c4f Replace localtriforcehunt with teamtriforcehunt 2021-01-29 19:07:19 -06:00
Fabian Dill
d3129e25e1 Merge remote-tracking branch 'origin/main' 2021-01-30 02:02:20 +01:00
Fabian Dill
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
CaitSith2
90c3fe9df3 Count take-any caves into final total. 2021-01-29 15:42:28 -08:00
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
CaitSith2
fda32578fa Modify end credits count. 2021-01-29 04:51:58 -08:00
CaitSith2
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
CaitSith2
ca4758d1c2 Actually disable shop slots that already have an item pushed in. 2021-01-29 00:21:42 -08:00
CaitSith2
9ee5c50f88 Fixed non-deterministic shop-sanity shuffling. 2021-01-28 22:39:04 -08:00
Fabian Dill
8ddb1ab614 create per-team enemizer calls 2021-01-27 02:39:12 +01:00
Fabian Dill
7531bb9d11 improve enemizer logging 2021-01-27 02:32:38 +01:00
Chris Wilson
bee6e87615 Merge branch 'main' of https://github.com/berserker66/MultiWorld-Utilities into main 2021-01-26 18:29:43 -05:00
Chris Wilson
5f4a1636aa Fix certain settings not being set properly on the weighted settings page. 2021-01-26 18:29:23 -05:00
CaitSith2
eb1c4313a8 Fix root cause of items not being placed into locations 2021-01-26 13:11:43 -08:00
CaitSith2
c88d9b4339 Additional fixes for Ice Rod Hunt 2021-01-26 07:06:57 -08:00
Fabian Dill
1275e49073 also fix typo in rom.py 2021-01-26 01:46:13 +01:00
Fabian Dill
e081d219c5 Merge pull request #166 from StructuralMike/main
Fix one text target misspelling.
2021-01-26 01:45:33 +01:00
StructuralMike
38a8d1e604 Fix one text target misspelling.
entrace -> entrance
2021-01-26 01:36:24 +01:00
Chris Wilson
761f798f39 Fix formatting in Plando tutorial 2021-01-24 21:31:33 -05:00
Chris Wilson
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
CaitSith2
5c427f5e3e Add Ice rod hunt to player settings and weighted settings. 2021-01-24 14:52:42 -08:00
Fabian Dill
6e3ca3cc39 add misery_mire_medallion and turtle_rock_medallion to sample yaml 2021-01-24 22:41:58 +01:00
Fabian Dill
9386a9c220 Update Menus 2021-01-24 21:58:26 +01:00