Commit Graph

147 Commits

Author SHA1 Message Date
Fabian Dill dcce53f8c8 Merge branch 'main' into breaking_changes
# Conflicts:
#	Adjuster.py
#	Gui.py
#	MultiClient.py
#	setup.py
#	worlds/alttp/AdjusterMain.py
#	worlds/alttp/Main.py
2021-02-21 20:15:07 +01:00
Fabian Dill c55cf28229 allow ER coop 2021-02-20 02:30:55 +01:00
Fabian Dill 12222d5a4c Split adjuster into own program 2021-02-19 19:08:11 +01:00
pepperpow fca64f1177
Removes Flashing instances in game (#168)
* Added reduced flashing, triforce hud and cutscene options

* Corrected parameters and replacement order

* Mixed up rom byte

* Removed triforce hud, smoothed cutscene speed and reset tables

* Removed triforcehud line and added bird cutscene speedup

* Added options to yaml

* Added check for race rom generation (is not internal asm)

* Added options to GUI (check sprite adjust crash)

* Fixed inconsistency in setting weight

* A "slow" setting for the cutscenespeed (#1)

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Update playerSettings.yaml

* Remove instances of cutscene speed modification

* Changed command to remove to mitigate frame advantage

* Antiepilepsy enabled for default/race roms, param change, RTL byte

* Found a frame independent antiflashing patch for real

* Further ASM patching style

* Reduce these changes to just two bytes

* Added patches for Dark Mountain and Ether Flashing palette reveal

Co-authored-by: StructuralMike <66819228+StructuralMike@users.noreply.github.com>
2021-02-19 17:45:54 +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
CaitSith2 7f74aa7cb0 Implement open_pyramid yaml settings 2021-01-29 13:27:42 -08:00
Fabian Dill 7531bb9d11 improve enemizer logging 2021-01-27 02:32:38 +01:00
Fabian Dill 9386a9c220 Update Menus 2021-01-24 21:58:26 +01:00
Fabian Dill 8ebd36b5a7 update Archipelago 2021-01-03 14:32:32 +01:00
Fabian Dill 08ca4245c1 Merge branch 'main' into breaking_changes
# Conflicts:
#	Adjuster.py
#	AdjusterMain.py
#	BaseClasses.py
#	MultiClient.py
#	MultiServer.py
#	Mystery.py
#	Utils.py
#	WebHostLib/downloads.py
#	WebHostLib/generate.py
#	dumpSprites.py
#	test/TestBase.py
#	worlds/alttp/EntranceRandomizer.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py
2021-01-03 13:13:59 +01:00
Fabian Dill e8fd575379 tile_shuffle option no longer requires Enemizer, document it as such
also shuffle things around in gui.py
2020-12-29 19:59:20 +01:00
Fabian Dill e361b93a74 GUI: Add Sprite File location to tooltip 2020-12-05 23:15:39 +01:00
Fabian Dill 74cf51c20b create sprite directory if it doesn't exist 2020-11-30 21:34:40 +01:00
Fabian Dill 38490813de GUI: Move Timer options to Custom Items panel to make gui less high for smaller screens 2020-11-11 19:34:18 +01:00
Fabian Dill 033307cfc9 Allow just updating sprites and remove old alternate sprite folder 2020-11-11 13:45:21 +01:00
Fabian Dill 8060aa7884 add never adjust answer to client 2020-11-11 13:15:35 +01:00
Fabian Dill c230263200 move last used adjuster settings to _2 to avoid conflict with expanded palette options 2020-11-02 03:35:03 +01:00
Kaito Sinclaire 41a58084f1 Options for amount of time given in timer modes
(Primarily to make Timed OHKO a viable multiworld and/or mystery option,
but also works with other timer modes as well)
2020-10-28 16:20:59 -07:00
Fabian Dill 1d58f54101 move ALTTP to its own world folder 2020-10-24 05:38:56 +02:00
Edos512 b91a627b32
Added options from Maseya Palette Randomizer (#145)
Add remaining palette shuffle options
2020-10-24 02:44:27 +02:00
Fabian Dill 4f8c737eec squashed commit of many breaking changes
Dropping Support for Python 3.7; adding support for Python 3.9
2020-10-19 08:26:31 +02:00
CaitSith2 f17682e997 Implement pedestal ganon goal 2020-10-15 15:24:52 -07:00
CaitSith2 4a923c7046 Add bonk to random sprite on event 2020-10-07 16:16:56 -07:00
Fabian Dill 88a5e024c7 Fix typo 2020-10-07 23:19:16 +02:00
Fabian Dill b5d91af752 New Logic:
Enemy Shuffle awareness
Easy Item Functionality awareness
Dark Room Logic option
Boss Item Shuffle option
Silverless Ganon is a Minor Glitch

Faster Dungeon Item Fill
2020-10-07 19:51:46 +02:00
CaitSith2 9812e2cca5 Add sprite_pool for limiting sprites used in randomonevent. 2020-10-06 13:22:03 -07:00
CaitSith2 38ac943a9c Random sprite on hit now part of basepatch. Other events possible too. 2020-10-04 10:57:30 -07:00
Fabian Dill a668aa3b23 Make "Prize" shuffling an option 2020-09-20 04:35:45 +02:00
CaitSith2 81a23266c9 Add Easy item functionality to gui 2020-09-18 10:01:12 -07:00
Louis-David Perron c40196e07c
Fixed issues with customitemarray (#140)
* Fixed issues with customitemarray

* Fixed Triforce in custom item pool
2020-09-17 00:18:17 +02:00
Fabian Dill da01325abd Only pre-open pyramid if ER falls within vanilla/dungeonssimple/dungeonsfull 2020-09-11 03:23:00 +02:00
Fabian Dill 21e4135f5f Multithread sprite download
Also download all sprites that work even if an earlier one is broken
2020-09-06 18:09:11 +02:00
Fabian Dill c0632db403 Set rom default options 2020-09-05 05:20:34 +02:00
Chris Wilson d56e75a2cf Add a script to dump sprite data and gifs 2020-08-31 23:17:33 -04:00
Fabian Dill 51e15a1aa0 GUI: skip playthrough if spoiler is skipped 2020-08-30 16:46:47 +02:00
CaitSith2 366c92de49 Enemizer option labels now appear to left of the option. 2020-08-27 15:16:13 -07:00
Fabian Dill 91b18c9d2a adjust quickswap text 2020-08-27 14:17:28 +02:00
Fabian Dill 112868b751 remove duplicate shop setting in gui and make entrance/location cache renew slightly faster 2020-08-27 04:05:11 +02:00
Fabian Dill d86eb69b4c Remove old fill algorithms that I have no intention to optimize or support in the future 2020-08-25 17:44:03 +02:00
Fabian Dill 2096d6ae5b Use proper OS-specific path uris in many more places
also move path.join into local_path and output_path to simplify use
2020-08-25 13:22:47 +02:00
Fabian Dill 9cabd41d3b shopsanity 2020-08-23 21:38:21 +02:00
Fabian Dill 26ab3dd69a Shop Shuffle
- more can be done here, but this works fine as a sometimes fun proof of concept
2020-08-23 15:03:06 +02:00
Fabian Dill 685ff49711 make "universal" small key shuffle a thing and split it out of retro
also make retro usable independently from the other world modes in mystery
2020-08-20 20:13:00 +02:00
Fabian Dill 154ab88bda allow creation of diff files from gui 2020-08-20 03:41:37 +02:00
Fabian Dill cb4fa6dd33 Split enemy shuffle into its components 2020-08-19 23:24:17 +02:00
Fabian Dill c2e2c2d5f9 merge singularity and duality into one; under the singularity name 2020-08-19 21:10:02 +02:00
Fabian Dill 41163d50f5 default triforces in custom gui to their actual default 2020-08-16 16:49:48 +02:00
Fabian Dill f99bc676bc Fix custom item pool triforce piece handling 2020-08-16 12:04:04 +02:00
Fabian Dill 01ace95c32 Various Item pool fixes
* Pedestal goal always left a spare item in the pool, unless vanilla swords was also selected
* extra items for the pool can now be given dynamically based on items still needed.
* easy item pool + swordless gets 4 bows, not 2 (weird combo, but ok)
* add some item pool unittests
* add easy item pool to CLI and GUI
2020-08-01 16:49:46 +02:00
Fabian Dill ebd6a9e3cf Removed all instances of the word "Official" where it does not refer to Nintendo 2020-07-31 19:45:10 +02:00