Commit Graph
100 Commits
Author SHA1 Message Date
aerinon 4dce2762f1 CI Update ubuntu 2023-08-07 13:24:36 -06:00
aerinon 329950eadc CI Update ubuntu 2023-08-07 13:19:03 -06:00
aerinon 9e26c9c42c Fixed minor issue with dungeon counter interfering with timer 2023-08-07 10:44:55 -06:00
aerinon 1bb4d5f03b Version bump and note 2023-03-09 11:14:13 -07:00
aerinon bd25c6be26 Merge pull request #141 from tcprescott/DoorDev_MultiworldService
MultiServer: Add option to MultiServer to disable client forfeits
2023-03-09 11:12:37 -07:00
aerinon 5f8be831ec Version bump and release notes 2023-02-15 14:25:00 -07:00
aerinon afac655de2 Fixed door position typo 2023-02-15 14:22:31 -07:00
aerinon fe0e0805ad Fix for Desert Tiles 1 2023-02-15 14:20:15 -07:00
aerinon 45c762ce40 Merge branch 'tcprescott-patch-2' into DoorDev 2023-02-15 14:18:38 -07:00
aerinon 4a58ec1d2c Merge pull request #136 from tcprescott/patch-1
remove hard requirement of tkinter when using CLI
2023-01-09 08:19:44 -07:00
aerinon 46903470b5 Fix typo for door "Sewers Key Rat E" 2023-01-03 16:14:42 -07:00
aerinon 6934aedfd8 Logic bug for GT Refill room not requiring boots 2022-11-29 13:22:27 -07:00
aerinon 742d7db650 Merge pull request #133 from jdlyga/DoorDev
Updated Github actions yml to fix Node.js 12 deprecation
2022-11-21 09:43:41 -07:00
aerinon 4ab0a40c45 Bumper cave fix
Pottery coloring updated
2022-10-27 13:56:37 -06:00
aerinon a9806ec40f Minor doc update 2022-09-16 13:31:26 -06:00
aerinon 5137826837 Fix github build? 2022-09-16 13:00:15 -06:00
aerinon 303600f198 Merge branch 'DoorDevUnstable' into DoorDev
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rules.py
2022-09-16 12:08:57 -06:00
aerinon 3227ffee14 Missed a change 2022-09-07 21:30:57 -06:00
aerinon 1e4b857dab Update default setting to vanilla 2022-09-07 16:55:46 -06:00
aerinon 4ce85a9f2d Couple minor issues - let a door not be dead in higher intensity, slightly better reporting 2022-09-07 16:54:02 -06:00
aerinon c298b392d0 Fix for rain prevented doors fouling up key doors 2022-09-07 16:53:52 -06:00
aerinon 9cca25bdc4 Modified key fix for Unstable 2022-09-02 13:11:03 -06:00
aerinon c10a791ed6 Important key fix for logic placment 2022-09-02 13:10:20 -06:00
aerinon 2c78170579 Pyinstaller 5.0+ build fix 2022-08-31 16:16:20 -06:00
aerinon 258d66fb5c Minor standard fix, fix for test suite, made one error less annoying 2022-08-31 14:10:02 -06:00
aerinon 4aff460b22 Fix for crossed doors with ambrosia
Fix for ER + OWG in crossed doors
Fix for Small Key shuffle
2022-08-30 13:51:12 -06:00
aerinon 45395e9b15 Legacy pot shuffle fix 2022-08-26 16:08:18 -06:00
aerinon ae0efad830 More inverted pot fixes 2022-08-26 15:48:07 -06:00
aerinon 3e6f2bb79b Fixed issue with small key shuffle when big keys aren't 2022-08-26 15:20:53 -06:00
aerinon 55364c071a Fixed issue with inverted and certain pottery settings. 2022-08-26 14:42:06 -06:00
aerinon 0dfdbfd39e Removed "good bee" from Mothula logic
Fixed an issue with Mystery generation and windows file path
2022-08-24 15:00:48 -06:00
aerinon 5d419210af Fix a bank conflict with OWR
Release notes and version bump
2022-08-24 13:18:01 -06:00
aerinon 0d9d6f2ceb Copy world needs to copy location type 2022-08-24 13:10:57 -06:00
aerinon 9c612b6c00 Minor edit to when pyramid hole auto pre-opens 2022-08-23 16:43:27 -06:00
aerinon 0d5ea19ecd Fix for small key fill 2022-08-23 15:52:59 -06:00
aerinon 2ed0a80609 Fix for pot items to not reload with the supertile
Key distribution change
Unique boss shuffle make gt bosses also unique
Removed text color in hints due to bug
2022-08-11 15:25:09 -06:00
aerinon 32714b4c6a Fix for colorized pots in "dark desert hint" aka mire storyteller 2022-08-05 16:48:34 -06:00
aerinon 4267c2dde5 Minor bug in intensity 3, pottery setting not drop shuffle for Desert Tiles 2. 2022-07-25 12:13:50 -06:00
aerinon f06e7c7fd3 Merged in Volatile work 2022-07-07 14:20:41 -06:00
aerinon 04fc0b442d Hotfix for enemizer and pot substitutions 2022-06-30 11:51:34 -06:00
aerinon 2f821632e1 Spelling and grammar 2022-06-29 13:01:34 -06:00
aerinon d488df6d18 Pot substitutions for certain items 2022-06-29 12:58:10 -06:00
aerinon fe814005d6 Waterfall of Wishing logic exit fix revised 2022-06-23 10:36:51 -06:00
aerinon 377989d406 Update release notes and version 2022-06-22 10:43:39 -06:00
aerinon f5307dacc1 Waterfall logic fix. Inverted seems to have been fixed years ago 2022-06-17 15:12:37 -06:00
aerinon 8d140c9bf8 Spoiler refactor 2022-06-17 14:36:51 -06:00
aerinon b938bef8fa Check package requirements before importing them 2022-06-16 10:46:53 -06:00
aerinon 4397492aca Fix follower despawn when entering maiden's cell and she's not there due to Blind not being the boss 2022-06-16 06:58:41 -06:00
aerinon 32aebb2ad1 Pottery fix for item counting because of shop conflict 2022-06-15 16:55:20 -06:00
aerinon 25905fe3f3 Capitalization fixes
Highlight part of the text in red (experimental)
2022-06-14 13:22:24 -06:00
aerinon e9433e56c0 Missing player 2022-06-07 08:12:13 -06:00
aerinon 96f25d15a9 Settings code fix 2022-06-07 08:10:19 -06:00
aerinon 3052bd7585 Spelling 2022-05-25 10:28:15 -06:00
aerinon 752c063a9a Mailmap fix 2022-05-24 10:00:40 -06:00
aerinon 42c6e18655 Mailmap 2022-05-24 09:36:52 -06:00
aerinon 97377c9749 Merge pull request #129 from Phlyers/DoorDevVolatile
Ice Antechamber pots 3,4 require hammer
2022-03-16 08:37:49 -06:00
aerinon 1acad6a4f4 Merge pull request #126 from cassidoxa/inverted-portals-dr
Fix typo in inverted LW portal removal
2021-10-21 22:43:05 -06:00
aerinon c90092f70a Merge pull request #125 from cassidoxa/inverted-portals-dr
Remove diggable light world portals in inverted
2021-10-21 16:32:45 -06:00
aerinon cb8a168b6c Merge pull request #123 from Catobat/ItemPool
Fix money balancing with reduced item pool
2021-09-01 15:57:14 -06:00
aerinon e052468dba Merge pull request #122 from StructuralMike/DoorDevUnstable
Change the bomblogic-CLI to bombbags and add it to the example mystery yaml
2021-08-12 13:53:58 -06:00
aerinon cab5f22390 Merge pull request #121 from StructuralMike/DoorDevUnstable
Define bomb upgrade as advancement before beemizer
2021-08-02 15:22:06 -06:00
aerinon 0975b64519 Merge pull request #120 from compiling/DoorDevUnstable
Extra warnings / checks
2021-07-26 13:06:46 -06:00
aerinon 6852d80cb7 Merge pull request #111 from aerinon/DoorDevUnstable
Door dev unstable
2021-05-11 12:59:12 -06:00
aerinon 960b8de237 Merge pull request #104 from StructuralMike/DoorDevUnstable
gui startinginventory with Magic Cape
2021-03-22 11:33:14 -06:00
aerinon 749b94fa9f Merge pull request #97 from krelbel/chaosfix
Fix chaos boss/enemy shuffle
2021-03-12 16:33:48 -07:00
aerinon 4e9e564154 Set theme jekyll-theme-slate 2021-03-01 10:04:05 -07:00
aerinon 6a5bdbee6b Mostly a fix for Blind outside of TT when Blind is the boss of TT (boss enemizer)
Remove RaceRandom use for now
2021-02-27 15:33:05 -07:00
aerinon 7c35b4d14e Minor gui bugfix 2021-02-26 11:26:04 -07:00
aerinon f6d1dc282b Minor bugfix update 2021-02-25 16:51:07 -07:00
aerinon f1fd2c2759 Revert "Merge branch 'DoorDevUnstable' of https://github.com/miketrethewey/ALttPDoorRandomizer into miketrethewey-DoorDevUnstable"
This reverts commit 3448693f52, reversing
changes made to f2c021500d.
2021-02-25 16:16:20 -07:00
aerinon af441a8e9b Merging in base er changes 2021-02-25 15:26:29 -07:00
aerinon 5dded84a4c Merge pull request #88 from KevinCathcart/Dev
Dev
2021-02-24 15:31:36 -07:00
aerinon 3448693f52 Merge branch 'DoorDevUnstable' of https://github.com/miketrethewey/ALttPDoorRandomizer into miketrethewey-DoorDevUnstable 2021-02-24 15:24:25 -07:00
aerinon f2c021500d Merge branch 'Portals' of https://github.com/Catobat/ALttPDoorRandomizer into Catobat-Portals 2021-02-24 15:23:34 -07:00
aerinon d14c9b5758 Object reading improvements in utils 2021-02-24 13:29:10 -07:00
aerinon 90d45cc371 Potion shop crash in non-shopsanity modes 2021-02-22 14:47:24 -07:00
aerinon 4ee60db31a Documentation clean up and including the non-progressive shields. 2021-02-18 16:09:46 -07:00
aerinon 9d32a85b89 Progressive limits ignored for shop items (multiworld)
Multi Client improvements to reporting
2021-02-18 13:39:03 -07:00
aerinon 8d22dd1a3d Bringing in Unstable2 changes 2021-02-18 13:19:08 -07:00
aerinon 5945360f58 Silvers issue in swordless 2021-02-18 10:01:52 -07:00
aerinon 2af9ffbda4 Notes and version update
Fix hera double count
2021-02-17 15:23:46 -07:00
aerinon 309260a1e2 Merge branch 'DoorDevUnstable' of https://github.com/miketrethewey/ALttPDoorRandomizer into MikeQoL 2021-02-16 13:59:24 -07:00
aerinon 9bce09aad6 Merge branch 'InroomStairFix' into Unstable2 2021-02-16 13:58:31 -07:00
aerinon b36c03a8b4 Pot shuffle repair 2021-02-16 13:34:00 -07:00
aerinon 26f7b1c993 Notes/version
Baserom update
2021-02-15 13:36:34 -07:00
aerinon 3b8773ea33 Update item counter for mystery
Fixed bug with door restart
Made retro keys more lenient with door shuffle
2021-02-13 21:11:31 -07:00
aerinon 352592bd00 Key logic error with odd_counter and child doors
Fix the Lone Pot doors (E/W) swapped
2021-02-13 21:09:57 -07:00
aerinon f83b28adb6 -Disallowed Swamp Lobby in Hyrule Castle in Standard mode
-Prevent defeating Aga 1 before Zelda is delivered to the Sanctuary. (He can't take damage)
-Fix for Ice Jelly room when going backward and enemizer is on
-Fix for inverted - don't start as a bunny in Dark Sanctuary
-Fix for non-ER Inverted with Lobby shuffle. Aga Tower's exit works properly now.
2021-02-13 21:08:06 -07:00
aerinon 8083c8c179 Minor fix to ensure the key logic is correct when selling keys 2021-02-13 20:59:40 -07:00
aerinon 2caf5abe4a Update item counter for mystery
Fixed bug with door restart
Made retro keys more lenient with door shuffle
2021-02-13 20:58:59 -07:00
aerinon 2765f9bec0 - Settings code added (prototype)
- Mystery.py updates
- Blind maiden sequence restored if Blind is shuffled to TT
- Spoiler updated
- Fix for standard in vanilla ER
- Minor shopsanity discount
2021-02-09 16:31:12 -07:00
aerinon 7a22db5dd4 -Disallowed Swamp Lobby in Hyrule Castle in Standard mode
-Prevent defeating Aga 1 before Zelda is delivered to the Sanctuary. (He can't take damage)
-Fix for Ice Jelly room when going backward and enemizer is on
-Fix for inverted - don't start as a bunny in Dark Sanctuary
-Fix for non-ER Inverted with Lobby shuffle. Aga Tower's exit works properly now.
2021-02-05 15:05:16 -07:00
aerinon 1faf8c168c Only print lobbies if shuffling doors
Couple shopsanity bugs
2021-02-03 16:29:14 -07:00
aerinon 4e71b97403 Merging in shop work
Updated release notes and testsuite
2021-02-03 13:04:35 -07:00
aerinon 09cae6e640 Shopsanity multiworld and rupee progression balancing 2021-02-03 10:49:29 -07:00
aerinon f21687bd32 Update release notes and version 2021-02-01 16:30:47 -07:00
aerinon f8a0ba1816 merge in inroom staircases 2021-02-01 10:07:53 -07:00
aerinon b5f3c752e6 Shop work:
- Potion shop
- Cap Fairy blacklist
- Item counter increased over 255
- Inverted work
- Static sram for shops
- Price adjustments (and discounts)
2021-02-01 09:57:20 -07:00
aerinon f143e0d166 Merge in unstable 2021-01-28 21:20:32 -07:00
aerinon c411f5543c Couple minor problems addressed 2021-01-14 13:47:21 -07:00