alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity
2,091 Commits 5 Branches 0 Tags
7be5cc1a6bf3fe30c7fc1df516e1723e414ce65e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
aerinon 7be5cc1a6b Merge branch 'Customizer' into Synthesis 
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
 2022-08-24 14:29:10 -06:00
aerinon 152c383233 Merge branch 'DoorDevUnstable' into Customizer 
# Conflicts:
#	Bosses.py
#	ItemList.py
#	Main.py
#	Mystery.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
 2022-08-24 13:38:59 -06:00
aerinon 6b369b68b7 Update lite/lean with pottery options. Houses and caves with pots are shuffled in the ER pool if the pottery setting turns that on. 2022-08-24 13:29:14 -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 262b36cac6 Custom yaml properly record interior doors that are key doors 2022-08-24 13:10:32 -06:00
aerinon 32305a2202 Copy world needs to copy location type 2022-08-24 12:53:04 -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 5b8b0cb7f8 Mire Falling Bridge logic refinement for possible trap door movement 2022-08-23 15:27:22 -06:00
aerinon 3e7dfaf856 Fix Key Rat region 2022-08-23 15:06:36 -06:00
aerinon a5354f1f30 Spoiler bug 2022-08-12 13:50:04 -06:00
aerinon c3dcd56992 Some fixes sent by Catobat 2022-08-11 16:37:15 -06:00
aerinon 07b03f78d6 Rom update 2022-08-11 16:07:11 -06:00
aerinon 21456b5c90 Merge branch 'Customizer' into Synthesis 
# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
 2022-08-11 16:06:50 -06:00
aerinon 1168273e43 Merge branch 'DoorDevUnstable' into Synthesis 
# Conflicts:
#	Bosses.py
#	Main.py
#	Rom.py
#	data/base2current.bps
 2022-08-11 15:43:33 -06:00
aerinon 5dd9403afd Correct rom for tavern work 2022-08-11 15:38:15 -06:00
aerinon b2ae92a451 Merge branch 'Tavern' of github.com:Catobat/ALttPDoorRandomizer into Catobat-Tavern 
# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
Note: rom is not correct
 2022-08-11 15:37:19 -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 e167811d34 Merge branch 'DoorDevUnstable' into Synthesis 
# Conflicts:
#	Main.py
#	Mystery.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
 2022-08-05 14:06:01 -06:00
aerinon 09fbdc46ca Finish bomb/dash doors 
Lots of minor fixes
Fixed a few existing bugs
 2022-08-05 14:01:19 -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 d9f0e2a7b6 Options added for door_type_mode and new partitioned mode 2022-07-06 10:06:29 -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 2e9d132985 Large refactor underway. 
Wrote new main method
Implemented trap door shuffle to some degree
Still needs the other types
 2022-06-28 13:05:38 -06:00
aerinon b13e15f999 Merge branch 'DecoupledDoors' into Synthesis 
# Conflicts:
#	BaseClasses.py
#	DoorShuffle.py
 2022-06-23 10:59:44 -06:00
aerinon b426d47a0a Merge branch 'Customizer' into StandardThrone 
# Conflicts:
#	Main.py
 2022-06-23 10:38:18 -06:00
aerinon 8ec852a737 Merge branch 'DoorDevVolatile' into Customizer 
# Conflicts:
#	Main.py
 2022-06-23 10:37:38 -06:00
aerinon fe814005d6 Waterfall of Wishing logic exit fix revised 2022-06-23 10:36:51 -06:00
aerinon 1972500e31 Merge branch 'Customizer' into StandardThrone 
# Conflicts:
#	DungeonGenerator.py
#	Main.py
#	RELEASENOTES.md
 2022-06-22 13:08:38 -06:00
aerinon c487634d3d Merge branch 'DoorDevVolatile' into StandardThrone 
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
 2022-06-22 10:55:55 -06:00
aerinon 64048ba58d Merge branch 'DoorDevVolatile' into Customizer 
# Conflicts:
#	Main.py

Also fixed a bug with lite/lean
 2022-06-22 10:53:06 -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 31bee77c4c Mirror scroll behavior during escape altered. Pray I do not alter it further 2022-06-16 12:35:16 -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 8a6b05fe8f Merge branch 'DoorDevVolatile' into Customizer 
# Conflicts:
#	Main.py
#	Rom.py
 2022-06-15 16:56:57 -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 5dce2daa0b Standard throne room changes 2022-06-14 12:29:57 -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 14571508ae Init work on decoupling doors 2022-05-25 10:31:20 -06:00
aerinon ac651253fe Fix a couple bugs on generation 2022-05-24 11:07:06 -06:00
aerinon e40c4290c9 Fix yaml parsing 2022-05-24 10:18:59 -06:00
aerinon 041443be3d Fix windows absolute path parsing 2022-05-24 10:18:47 -06:00
aerinon 9a6b7c624d Minor fix for mystery 2022-05-24 10:18:23 -06:00
aerinon dbb69359aa Fix customizer GUI yaml selection 2022-05-24 10:17:31 -06:00
aerinon 8d5fe30889 Fix wording 2022-05-24 10:16:36 -06:00
aerinon 8fd010985f Merge branch 'DoorDevVolatile' into Customizer 
# Conflicts:
#	DoorShuffle.py
#	ItemList.py
#	Main.py
 2022-05-24 10:09:36 -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