From d488df6d18197a2a14889a21b3f42109ff49e8d5 Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 29 Jun 2022 12:58:10 -0600 Subject: [PATCH 1/5] Pot substitutions for certain items --- Main.py | 2 +- RELEASENOTES.md | 2 ++ Rom.py | 2 +- data/base2current.bps | Bin 93041 -> 93142 bytes 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Main.py b/Main.py index 7d2375ac..e4fe1ae1 100644 --- a/Main.py +++ b/Main.py @@ -31,7 +31,7 @@ from Utils import output_path, parse_player_names from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config from source.tools.BPS import create_bps_from_data -__version__ = '1.0.2.7-v' +__version__ = '1.0.2.8-v' from source.classes.BabelFish import BabelFish diff --git a/RELEASENOTES.md b/RELEASENOTES.md index ab1c6ef0..36357d28 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -157,6 +157,8 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o #### Volatile +* 1.0.2.8 + * Pot substitution for red rupees, 10 bomb packs, 3 bomb packs, and 10 arrows have been added. They use objects that can results from a tree pull. The 3 bomb pack becomes a 4 bomb pack and the 10 bomb pack becomes an 8 pack. These substitutions are repeatable like all other nomral pot contents. * 1.0.2.7 * Revised: Fix for Waterfall of Wishing logic in open. You must have flippers to exit the Waterfall (flippers also required in glitched modes as well) * 1.0.2.6 diff --git a/Rom.py b/Rom.py index b7015162..ccf06ee7 100644 --- a/Rom.py +++ b/Rom.py @@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'e33204b6023f07025eba16874308f57d' +RANDOMIZERBASEHASH = 'c7ea39c6e81d5ba010752de102484aef' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index fc22d9c3956780075f6752188bd52fca2ae6c189..592ad7425896bc5aaa8508e40a0929706d874ea8 100644 GIT binary patch delta 466 zcmV;@0WJRV)&WGO$v6CAI zegUbIng@_N{jR9$>X?-eu&96m>O6>*A_=jmum_hZGJ&NDB2ciX8X}OGC!m!gSg)w+ z>J)*EA|}+JPz`{QBFd9w2s#gquBhsCfQbUipj?27AF;Eo2uA@4ezB=R!uBaS>jUrF3gJTT0V+;XO5DML{sD%oS@X;Wnm%khVR5Vq9jUWe(A_wj!2dJqC z0Khf?&;_X$0Dv68L;%nQsTTl%62K?`&;_X&0DuUVP9|1K1;g@kA0XhNU zm#iNF-vT7EmyI9+K@8clfD*HWvBDs!iL#g4AOSW45Ggt%4ey^y20qQ)6l_GessIUi@DKdej2_nC*s2U=Wm?xl>BFC<%>gp7MjUp!0 zpim8fks>*hYX~|I{H>_!bbyHh%Aj0;iH@+dvbQ*}{;;zI3S9yTnysiD zf{h}+t%GU|w`vRlQV Date: Wed, 29 Jun 2022 13:01:34 -0600 Subject: [PATCH 2/5] Spelling and grammar --- RELEASENOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 36357d28..c56aa3fc 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -158,7 +158,7 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o #### Volatile * 1.0.2.8 - * Pot substitution for red rupees, 10 bomb packs, 3 bomb packs, and 10 arrows have been added. They use objects that can results from a tree pull. The 3 bomb pack becomes a 4 bomb pack and the 10 bomb pack becomes an 8 pack. These substitutions are repeatable like all other nomral pot contents. + * Pot substitutions added for red rupees, 10 bomb packs, 3 bomb packs, and 10 arrows have been added. They use objects that can result from a tree pull or other drop. The 3 bomb pack becomes a 4 bomb pack and the 10 bomb pack becomes an 8 pack. These substitutions are repeatable like all other normal pot contents. * 1.0.2.7 * Revised: Fix for Waterfall of Wishing logic in open. You must have flippers to exit the Waterfall (flippers also required in glitched modes as well) * 1.0.2.6 From 04fc0b442dc7652a4b355425ab44fffbd7be6d58 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 30 Jun 2022 11:51:34 -0600 Subject: [PATCH 3/5] Hotfix for enemizer and pot substitutions --- Main.py | 2 +- RELEASENOTES.md | 2 ++ Rom.py | 2 +- data/base2current.bps | Bin 93142 -> 93161 bytes 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Main.py b/Main.py index e4fe1ae1..7218e202 100644 --- a/Main.py +++ b/Main.py @@ -31,7 +31,7 @@ from Utils import output_path, parse_player_names from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config from source.tools.BPS import create_bps_from_data -__version__ = '1.0.2.8-v' +__version__ = '1.0.2.9-v' from source.classes.BabelFish import BabelFish diff --git a/RELEASENOTES.md b/RELEASENOTES.md index c56aa3fc..3b52ca83 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -157,6 +157,8 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o #### Volatile +* 1.0.2.9 + * Hotfix for enemizer and the new substitution * 1.0.2.8 * Pot substitutions added for red rupees, 10 bomb packs, 3 bomb packs, and 10 arrows have been added. They use objects that can result from a tree pull or other drop. The 3 bomb pack becomes a 4 bomb pack and the 10 bomb pack becomes an 8 pack. These substitutions are repeatable like all other normal pot contents. * 1.0.2.7 diff --git a/Rom.py b/Rom.py index ccf06ee7..c96a5c71 100644 --- a/Rom.py +++ b/Rom.py @@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'c7ea39c6e81d5ba010752de102484aef' +RANDOMIZERBASEHASH = 'd29420ac98a70a5f539b730d197bff29' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 592ad7425896bc5aaa8508e40a0929706d874ea8..a06883144bc1eaea09656d8f2bc397343cb969d5 100644 GIT binary patch delta 430 zcmV;f0a5O6>*BIdBDum_hZGJ&NDA}z3}8X}OGC!m!gHLs}Z z>J)*EA|}+JPz`{QBBzsU2s#yNuBhsCfQbUipj?27{IIBKvz{Pav$_aD0SJ$=sOq?l zBA~Ma3SI&T2(G9cf{h|9gJ}%6X$%2V5COWEy&M6z1|fmsF#2GZogD#20SK4m9RXqi z8J9;M0bUPeeS?7+tAdTMA_sn(e}0lt^k9|1Z6zLyao0X9A%flv=?zy#0%YiMY|7O({L zf`V)GiGpj};@#fB7O(+esR6(kkOHX%g$*FVt&2;mxgD{qU?4ZKB3f0T;KjApsmp2yXIxKW{x(b+9F^#{d8T delta 411 zcmV;M0c8H^*9F$s1(1pX+mVaU1RD(G^OIfyE&-XdjRA=T3oMqAA`Gsm>WGO$lOP9w z0jZOq2ar1buBhtjn3WH(sDJ_LJcyMd39+cK2bU=_fu#u|P_U>PB9NFTpp_z6uc+$k z6oHK*Ce)x%4SbQ*} zkFx{{UIGX!uBaS>jUrEjY7Dn(3;|OR0o|9r909i}ErQ}O`e57Q-QK_!un2?=x$}W* zsR6(kkOHX%g$*FVt&2;mx$>>6YnOW+0Y(8%m%<$ZVgX;5B_07@4=R3xff=iUjjtjH zew#&ymy#X&6o6bh(gtfHF0!b{CsvnB9|1A}@0Wfb z0W|^Pm$V-NIsxIA?;im+358G(moF~{fU%cjAOVFO95?GNfZ{OvYvK^XAg*y9@IRb! z9<6X53aY;(mjodJLJQflfD*HWvBDs!iI-6!0XG2 Date: Thu, 7 Jul 2022 14:20:41 -0600 Subject: [PATCH 4/5] Merged in Volatile work --- BaseClasses.py | 2 +- CLI.py | 1 + Main.py | 6 +- Mystery.py | 14 +- RELEASENOTES.md | 239 +++++++++++++------------------- Rom.py | 2 +- data/base2current.bps | Bin 93161 -> 93156 bytes mystery_testsuite.yml | 32 +++-- resources/app/cli/args.json | 4 + source/test/MysteryTestSuite.py | 2 +- 10 files changed, 136 insertions(+), 166 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 12b5665b..7f6a00c6 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -2529,7 +2529,7 @@ class Spoiler(object): def mystery_meta_to_file(self, filename): self.parse_meta() with open(filename, 'w') as outfile: - outfile.write('ALttP Dungeon Randomizer Version %s - Seed: %s\n\n' % (self.metadata['version'], self.world.seed)) + outfile.write(f'ALttP Dungeon Randomizer Version {self.metadata["version"]}\n\n') for player in range(1, self.world.players + 1): if self.world.players > 1: outfile.write('\nPlayer %d: %s\n' % (player, self.world.get_player_names(player))) diff --git a/CLI.py b/CLI.py index 53fda3ad..ba5090ec 100644 --- a/CLI.py +++ b/CLI.py @@ -146,6 +146,7 @@ def parse_settings(): "accessibility": "items", "algorithm": "balanced", 'mystery': False, + 'suppress_meta': False, "restrict_boss_items": "none", # Shuffle Ganon defaults to TRUE diff --git a/Main.py b/Main.py index 7218e202..7aba1276 100644 --- a/Main.py +++ b/Main.py @@ -31,7 +31,7 @@ from Utils import output_path, parse_player_names from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config from source.tools.BPS import create_bps_from_data -__version__ = '1.0.2.9-v' +__version__ = '1.0.1.0-u' from source.classes.BabelFish import BabelFish @@ -148,7 +148,7 @@ def main(args, seed=None, fish=None): if args.create_spoiler and not args.jsonout: logger.info(world.fish.translate("cli", "cli", "create.meta")) world.spoiler.meta_to_file(output_path(f'{outfilebase}_Spoiler.txt')) - if args.mystery: + if args.mystery and not args.suppress_meta: world.spoiler.mystery_meta_to_file(output_path(f'{outfilebase}_meta.txt')) for player in range(1, world.players + 1): @@ -341,7 +341,7 @@ def main(args, seed=None, fish=None): with open(output_path('%s_multidata' % outfilebase), 'wb') as f: f.write(multidata) - if args.mystery: + if args.mystery and not args.suppress_meta: world.spoiler.hashes_to_file(output_path(f'{outfilebase}_meta.txt')) elif args.create_spoiler and not args.jsonout: world.spoiler.hashes_to_file(output_path(f'{outfilebase}_Spoiler.txt')) diff --git a/Mystery.py b/Mystery.py index ce58a8e2..20e0e2ca 100644 --- a/Mystery.py +++ b/Mystery.py @@ -29,6 +29,7 @@ def main(): parser.add_argument('--teams', default=1, type=lambda value: max(int(value), 1)) parser.add_argument('--create_spoiler', action='store_true') parser.add_argument('--suppress_rom', action='store_true') + parser.add_argument('--suppress_meta', action='store_true') parser.add_argument('--bps', action='store_true') parser.add_argument('--rom') parser.add_argument('--enemizercli') @@ -64,6 +65,7 @@ def main(): erargs.names = args.names erargs.create_spoiler = args.create_spoiler erargs.suppress_rom = args.suppress_rom + erargs.suppress_meta = args.suppress_meta erargs.bps = args.bps erargs.race = True erargs.outputname = seedname @@ -201,12 +203,14 @@ def roll_settings(weights): ret.crystals_ganon = get_choice('ganon_open') - goal_min = get_choice_default('triforce_goal_min', default=20) - goal_max = get_choice_default('triforce_goal_max', default=20) - pool_min = get_choice_default('triforce_pool_min', default=30) - pool_max = get_choice_default('triforce_pool_max', default=30) + from ItemList import set_default_triforce + default_tf_goal, default_tf_pool = set_default_triforce(ret.goal, 0, 0) + goal_min = get_choice_default('triforce_goal_min', default=default_tf_goal) + goal_max = get_choice_default('triforce_goal_max', default=default_tf_goal) + pool_min = get_choice_default('triforce_pool_min', default=default_tf_pool) + pool_max = get_choice_default('triforce_pool_max', default=default_tf_pool) ret.triforce_goal = random.randint(int(goal_min), int(goal_max)) - min_diff = get_choice_default('triforce_min_difference', default=10) + min_diff = get_choice_default('triforce_min_difference', default=default_tf_pool-default_tf_goal) ret.triforce_pool = random.randint(max(int(pool_min), ret.triforce_goal + int(min_diff)), int(pool_max)) ret.mode = get_choice('world_state') diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 3b52ca83..65293af1 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -25,7 +25,7 @@ Note for multiworld: due to the design of the pottery lottery, only 256 items fo ### Colorize Pots -If the pottery mode is dynamic, this option is forced to be on (clustered and reduced). It is allowed to be on in all other pottery modes. Exception "none" where no pots would be colored, and "lottery" where all pots would be. This option colors the pots differently that have been chosen to be part of the location pool. If not specified, you are expected to remember the pottery setting you chose. +If the pottery mode is dynamic, this option is forced to be on (clustered and reduced). It is allowed to be on in all other pottery modes. Exceptions include "none" where no pots would be colored, and "lottery" where all pots would be. This option colors the pots differently that have been chosen to be part of the location pool. If not specified, you are expected to remember the pottery setting you chose. Note that Mystery will colorize all pots if lottery is chosen randomly. CLI `--colorizepots` @@ -39,15 +39,40 @@ CLI `--dropshuffle` "Drop and Pot Keys" or `--keydropshuffle` is still availabe for use. This simply sets the pottery to keys and turns dropshuffle on as well to have the same behavior as the old setting. -The old "Pot Shuffle" option is still available under "Pot Shuffle (Legacy)" or `--shufflepots` and works the same by shuffling all pots on a supertile. It works with the lottery option as well to move the switches while having every pot in the pool. +The old "Pot Shuffle" option is still available under "Pot Shuffle (Legacy)" or `--shufflepots` and works the same by shuffling all pots on a supertile. It works with the lottery option as well to move the switches to any valid pot on the supertile regardless of the pots chosen in the pottery mode. This may increase the number of pot locations slightly depending on the mode. #### Tracking Notes -The sram locations for pots and sprite drops are not yet final, please reach out for assistance or investigate the rom changes. +The sram locations for pots and sprite drops are now final, please reach out for assistance or investigate the rom changes if needed. + +## New Options + +### Collection Rate + +You can set the collection rate counter on using the "Display Collection Rate" on the Game Options tab are using the CLI option `--collection_rate`. Mystery seeds will not display the total. + +### Goal: Trinity + +Triforces are placed behind Ganon, on the pedestal, and on Murahdahla with 8/10 triforce pieces required. Recommend to run with 4-5 Crystal requirement for Ganon. Automatically pre-opens the pyramid. + +### Boss Shuffle: Unique + +At least one boss each of the prize bosses will be present guarding the prizes. GT bosses can be anything. + +### MSU Resume + +Turns on msu resume support. Found on "Game Options" tab, the "Adjust/Patch" tab, or use the `--msu_resume` CLI option. + +### BPS Patch + +Creates a bps patch for the seed. Found on the "Generation Setup" tab called "Create BPS Patches" or `--bps`. Can turn off generating a rom using the existing "Create Patched ROM" option or `--suppress_rom`. There is an option on the Adjust/Patch tab to select a bps file to apply to the Base Rom selected on the Generation Setup tab using the Patch Rom button. Selected adjustments will be applied during patching. + +## New Font + +Font updated to support lowercase English. Lowercase vs. uppercase typos may exist. Note, you can use lowercase English letters on the file name. ## Restricted Item Placement Algorithm - The "Item Sorting" option or ```--algorithm``` has been updated with new placement algorithms. Older algorithms have been removed. When referenced below, Major Items include all Y items, all A items, all equipment (swords, shields, & armor) and Heart Containers. Dungeon items are considered major if shuffled outside of dungeons. Bomb and arrows upgrades are Major if shopsanity is turned on. The arrow quiver and universal small keys are Major if retro is turned on. Triforce Pieces are Major if that is the goal, and the Bomb Bag is Major if that is enabled. @@ -74,12 +99,12 @@ The fill attempts to place all major items in dungeons. It will overflow to the ### District Restriction -The world is divided up into different regions or districts. Each dungeon is it's own district. The overworld consists of the following districts: +The world is divided up into different regions or districts. Each dungeon is its own district. The overworld consists of the following districts: Light world: * Kakariko (The main screen, blacksmith screen, and library/maze race screens) -* Northwest Hyrule (The lost woods and fortune teller all the way to the rive west of the potion shop) +* Northwest Hyrule (The lost woods and fortune teller screens all the way to the river west of the potion shop) * Central Hyrule (Hyrule castle, Link's House, the marsh, and the haunted grove) * Desert (From the thief to the main desert screen) * Lake Hylia (Around the lake) @@ -108,10 +133,9 @@ In multiworld, the districts chosen apply to all players. ## New Hints -Based on the district algorithm above (whether it is enabled or not,) new hints can appear about that district or dungeon. For each district and dungeon, it is evaluated whether it contains vital items and how many. If it has not any vital item, items then it moves onto useful items. Useful items are generally safeties or convenience items: shields, mails, half magic, bottles, medallions that aren't required, etc. If it contains none of those and is an overworld district, then it check for a couple more things. First, if dungeons are shuffled, it looks to see if any are in the district, if so, one of those dungeons is picked for the hint. Then, if connectors are shuffled, it checks to see if you can get to unique region through a connector in that district. If none of the above apply, the district or dungeon is considered completely foolish. At least two "foolish" districts are chosen and the rest are random. +Based on the district algorithm above (whether it is enabled or not,) new hints can appear about that district or dungeon. For each district and dungeon, it is evaluated whether it contains vital items and how many. If it has not any vital item, items then it moves onto useful items. Useful items are generally safeties or convenience items: shields, mails, half magic, bottles, medallions that aren't required, etc. If it contains none of those and is an overworld district, then it checks for a couple more things. First, if dungeons are shuffled, it looks to see if any are in the district, if so, one of those dungeons is picked for the hint. Then, if connectors are shuffled, it checks to see if you can get to unique region through a connector in that district. If none of the above apply, the district or dungeon is considered completely foolish. - -### Overworld Map shows dungeon location +## Overworld Map shows Dungeon Entrances Option to move indicators on overworld map to reference dungeon location. The non-default options include indicators for Hyrule Castle, Agahnim's Tower, and Ganon's Tower. @@ -147,7 +171,9 @@ As before, the boss may have any item including any dungeon item that could occu ##### mapcompass -The map and compass are logically required to defeat a boss. This prevents both of those from appearing on the dungeon boss. Note that this does affect item placement logic and the placement algorithm as maps and compasses are considered as required items to beat a boss. +~~The map and compass are logically required to defeat a boss. This prevents both of those from appearing on the dungeon boss. Note that this does affect item placement logic and the placement algorithm as maps and compasses are considered as required items to beat a boss.~~ + +Currently bugged, not recommended for use. ##### dungeon @@ -155,145 +181,70 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o ## Notes and Bug Fixes -#### Volatile - -* 1.0.2.9 - * Hotfix for enemizer and the new substitution -* 1.0.2.8 - * Pot substitutions added for red rupees, 10 bomb packs, 3 bomb packs, and 10 arrows have been added. They use objects that can result from a tree pull or other drop. The 3 bomb pack becomes a 4 bomb pack and the 10 bomb pack becomes an 8 pack. These substitutions are repeatable like all other normal pot contents. -* 1.0.2.7 - * Revised: Fix for Waterfall of Wishing logic in open. You must have flippers to exit the Waterfall (flippers also required in glitched modes as well) -* 1.0.2.6 - * Fix for Zelda (or any follower) going to the maiden cell supertile and the boss is not Blind. The follower will not despawn unless the boss is Blind, then the maiden will spawn as normal. - * Added a check for package requirements before running code. GUI and console both for better error messages. Thanks to mtrethewey for the idea. - * Refactored spoiler to generate in stages for better error collection. A meta file will be generated additionally for mystery seeds. Some random settings moved later in the spoiler to have the meta section at the top not spoil certain things. (GT/Ganon requirements.) Thanks to codemann and OWR for most of this work. - * Fix for Waterfall of Wishing logic in open. You must have flippers to exit the Waterfall (or moon pearl in glitched modes that allow minor glitches in logic) -* 1.0.2.5 - * Some textual changes for hints (capitalization standardization) - * Item will be highlighted in red if experimental is on - * Bug with 0 GT crystals not opening GT - * Settings code fix - * Fix for pottery not counting items in certain caves that share a supertile with shops -* 1.0.2.4 - * Updated tourney winners (included Doors Async League winners) - * Fixed a couple issues with dungeon counters and the DungeonCompletion field for autotracking -* 1.0.2.3 - * Fix MultiClient for new shop data location in SRAM - * Some minor text updates -* 1.0.2.2 - * Change to all key pots and enemy key drops: always use the same address - * Don't colorize key pots in mystery if the item is "forced" -* 1.0.2.1 - * Fix for paired doors - * Fix for forbidding certain dashable doors (it actually does something this time) -* 1.0.2.0 - * Updated baserom to bleeding edge - * Pottery and enemy SRAM re-located to final destination - * Bulk of work on new font - * Updated TFH to support up to 850 pieces - * Fix for major item algorithm and pottery - * Updated map display on keysanity menu to work better with overworld_amp option - * Minor bug in crossed doors - * Minor bug in MultiClient which would count switches -* 1.0.1.13 - * New pottery modes - * Trinity goal added - * Potential fix for pottery hera key - * Fix for arrows sneaking into item pool with rupee bow - * Fixed msu resume bug on patcher - * Bonk Recoil OHKO fix (again) -* 1.0.1.12 - * Fix for Multiworld forfeits, shops and pot items now included - * Reworked GT Trash Fill. Base rate is 0-75% of locations fill with 7 crystals entrance requirements. Triforce hunt is 75%-100% of locations. The 75% number will decrease based on the crystal entrance requirement. Dungeon_only algorithm caps it based on how many items need to be placed in dungeons. Cross dungeon shuffle will now work with the trash fill. - * MultiServer fix for ssl certs and python - * Inverted bug - * Fix for hammerdashing pots, if sprite limit is reached, items won't spawn, but error beep won't play either because of other SFX - * Arrghus splash no longer used for pottery sprites (used apple instead) - * Killing enemies via freeze + hammer properly results in the droppable item instead of the freeze prize - * Forbid certain doors from being dashable when you either can't dash them open (but bombs would work) or you'd fall into a pit from the bonk recoil in OHKO - * Logic refinements - * Skull X Room requires Boots or access to Skull Back Drop - * GT Falling Torches requires Boots to get over the falling tile gap (this is a stop-gap measure until more sophisticated crystal switch traversal is possible) - * Fixed a couple rain state issues -* 1.0.1.11 - * Separated Collection Rate counter from experimental - * Added MSU Resume option - * Ensured pots in TR Dark Ride need lamp - * Fix for GT Crystal Conveyor not requiring Somaria/Bombs to get through - * Fixes for Links House being at certain entrances (did not generate) -* 1.0.1.10 - * More location count fixes - * Add major_only algorithm to code - * Include 1.0.0.2 fixes -* 1.0.1.9 - * Every pot you pick up that wasn't part of the location pool does not count toward the location count - * Fix for items spawning where a thrown pot was - * Fix for vanilla_fill, it now prioritizes heart container placements - * Fix for dungeon counter showing up in AT/HC in crossed dungeon mode - * Fix for TR Dark Ride (again) and some ohko rules refinement -* 1.0.1.8 - * Every pot you pick up now counts toward the location count - * A pot will de-spawn before the item under it does, error beep only plays if it still can't spawn - * Updated item counter & credits to support 4 digits - * Updated compass counter to support 3 digits (up to 255) - * Updated retro take-anys to not replace pot locations when pottery options are used - * Updated mystery_example.yml - * Fixed usestartinventory with mystery - * Fixed a bug with the old pot shuffle (crashed when used) -* 1.0.1.7 - * Expanded Mystery logic options (e.g. owglitches) - * Allowed Mystery.py to create BPS patches - * Allow creation of BPS and SFC files (no longer mutually exclusive) - * Pedestal goal + vanilla swords places a random sword in the pool - * Rebalanced trash ditching algo for seeds with lots of triforce pieces - * Added a few more places Links House shouldn't go when shuffled - * Fixed a bug with shopsanity + district algorithm where pre-placed potions messed up the placeholder count - * Fixed usestartinventory flag (can be use on a per player basis) - * Fix for map indicators on keysanity menu not showing up - * Potential sprite selector fix for systems with SSL issues -* 1.0.1.6 - * A couple new options for lighter pottery modes (Cave Pots and Dungeon Pots) - * New option for Boss Shuffle: Unique (Prize bosses will be one of each, but GT bosses can be anything) - * Support for BPS patch creation and applying patches during adjustment - * Fix for SFX shuffle - * Fix for Standard ER where locations in rain state could be in logic - * Fix for Ice Refill room pots, require being able to hit a switch for bombbag mode -* 1.0.1.5 - * Fix for Hera Basement Cage item inheriting last pot checked - * Update indicators on keysanity menu for overworld map option -* 1.0.1.4 - * Reverted SRAM change (the underlying refactor isn't done yet) -* 1.0.1.3 - * Fixed inverted generation issues with pottery option - * Moved SRAM according to SRAM standard - * Removed equitable algorithm - * Upped TFH goal limit to 254 - * Cuccos should no longer cause trap door rooms to not open - * Added double click fix for install.py - * Fix for pottery item palettes near bonkable torches - * Fix for multiworld progression balancing would place Nothing or Arrow items -* 1.0.1.2 - * Fixed logic for pots in TR Hub and TR Dark Ride - * Fix for districting + shopsanity - * Hint typo correction -* 1.0.1.1 - * Fixed logic for pots in the Ice Hammer Block room (Glove + Hammer required) - * Fixed logic for 2 pots in the Ice Antechamber (Glove required) - * Fixed retro not saving keys when grabbed from under pots in caves - * Fixed GUI not applying Drop shuffle when "Pot and Drops" are marked - * Fixed dungeon counts when one of Pottery or Drops are disabled - #### Unstable +* 1.0.1.0 + * Large features + * New pottery modes - see notes above + * Pot substitutions added for red rupees, 10 bomb packs, 3 bomb packs, and 10 arrows have been added. They use objects that can result from a tree pull or other drop. The 3 bomb pack becomes a 4 bomb pack and the 10 bomb pack becomes an 8 pack. These substitutions are repeatable like all other normal pot contents. + * Updated TFH to support up to 850 pieces + * New font support + * Trinity goal added + * Separated Collection Rate counter from experimental + * Added MSU Resume option + * Support for BPS patch creation and applying patches during adjustment + * New option for Boss Shuffle: Unique (Prize bosses will be one of each, but GT bosses can be anything) + * Logic Notes + * Skull X Room requires Boots or access to Skull Back Drop + * GT Falling Torches requires Boots to get over the falling tile gap (this is a stop-gap measure until more sophisticated crystal switch traversal is possible) + * Waterfall of Wishing logic in open. You must have flippers to exit the Waterfall (flippers also required in glitched modes as well) + * Fix for GT Crystal Conveyor not requiring Somaria/Bombs to get through + * Pedestal goal + vanilla swords places a random sword in the pool + * Added a few more places Links House shouldn't go when shuffled + * Small features + * Added a check for python package requirements before running code. GUI and console both for better error messages. Thanks to mtrethewey for the idea. + * Refactored spoiler to generate in stages for better error collection. A meta file will be generated additionally for mystery seeds. Some random settings moved later in the spoiler to have the meta section at the top not spoil certain things. (GT/Ganon requirements.) Thanks to codemann and OWR for most of this work. + * Updated tourney winners (included Doors Async League winners) + * Some textual changes for hints (capitalization standardization) + * Item will be highlighted in red if experimental is on. This will likely be removed. + * Reworked GT Trash Fill. Base rate is 0-75% of locations fill with 7 crystals entrance requirements. Triforce hunt is 75%-100% of locations. The 75% number will decrease based on the crystal entrance requirement. Dungeon_only algorithm caps it based on how many items need to be placed in dungeons. Cross dungeon shuffle will now work with the trash fill. + * Expanded Mystery logic options (e.g. owglitches) + * Updated indicators on keysanity menu for overworld map option + * Bug fixes: + * Fix for Zelda (or any follower) going to the maiden cell supertile and the boss is not Blind. The follower will not despawn unless the boss is Blind, then the maiden will spawn as normal. + * Bug with 0 GT crystals not opening GT + * Fixed a couple issues with dungeon counters and the DungeonCompletion field for autotracking + * Settings code fix + * Fix for forbidding certain dashable doors (it actually does something this time) + * Fix for major item algorithm and pottery + * Updated map display on keysanity menu to work better with overworld_map option + * Minor bug in crossed doors + * Fix for Multiworld forfeits, shops and pot items now included + * MultiServer fix for ssl certs and python + * forbid certain doors from being dashable when you either can't dash them open (but bombs would work) or you'd fall into a pit from the bonk recoil in OHKO + * Fixed a couple rain state issues + * Add major_only algorithm to settings code + * Fixes for Links House being at certain entrances (did not generate) + * Fix for vanilla_fill, it now prioritizes heart container placements + * Fix for dungeon counter showing up in AT/HC in crossed dungeon mode + * Fixed usestartinventory with mystery + * Added double click fix for install.py + * Fix for SFX shuffle + * Fix for districting + shopsanity + * Fix for multiworld progression balancing would place Nothing or Arrow items + * Fixed a bug with shopsanity + district algorithm where pre-placed potions messed up the placeholder count + * Fixed usestartinventory flag (can be use on a per player basis) + * Sprite selector fix for systems with SSL issues + * Fix for Standard ER where locations in rain state could be in logic * 1.0.0.3 - * overworld_map=map mode fixed. Location of dungeons with maps are not shown until map is retrieved. (Dungeon that do not have map like Castle Tower are simply never shown) - * Aga2 completion on overworld_map now tied to boss defeat flag instead of pyramid hole being opened (fast ganon fix) - * Minor issue in dungeon_only algorithm fixed (minorly affected major_only keyshuffle and vanilla fallbacks) + * overworld_map=map mode fixed. Location of dungeons with maps are not shown until map is retrieved. (Dungeon that do not have map like Castle Tower are simply never shown) + * Aga2 completion on overworld_map now tied to boss defeat flag instead of pyramid hole being opened (fast ganon fix) + * Minor issue in dungeon_only algorithm fixed (minorly affected major_only keyshuffle and vanilla fallbacks) * 1.0.0.2 - * Include 1.0.1 fixes - * District hint rework + * Include 1.0.1 fixes + * District hint rework * 1.0.0.1 - * Add Light Hype Fairy to bombbag mode as needing bombs + * Add Light Hype Fairy to bombbag mode as needing bombs ### From stable DoorDev diff --git a/Rom.py b/Rom.py index c96a5c71..7861a5cd 100644 --- a/Rom.py +++ b/Rom.py @@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'd29420ac98a70a5f539b730d197bff29' +RANDOMIZERBASEHASH = '9008f4335101689f01184e58295fdbc5' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index a06883144bc1eaea09656d8f2bc397343cb969d5..464ceaf6105a2637981d2d107a868a08a143c8e4 100644 GIT binary patch delta 8913 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 IMS)20f42OD@&Et; delta 8889 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 Date: Mon, 25 Jul 2022 12:13:50 -0600 Subject: [PATCH 5/5] Minor bug in intensity 3, pottery setting not drop shuffle for Desert Tiles 2. --- DoorShuffle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 0d36a2b0..ecb1b503 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -380,7 +380,7 @@ def choose_portals(world, player): if world.doorShuffle[player] in ['basic', 'crossed']: cross_flag = world.doorShuffle[player] == 'crossed' # key drops allow the big key in the right place in Desert Tiles 2 - bk_shuffle = world.bigkeyshuffle[player] or world.dropshuffle[player] + bk_shuffle = world.bigkeyshuffle[player] or world.pottery[player] not in ['none', 'cave'] std_flag = world.mode[player] == 'standard' # roast incognito doors world.get_room(0x60, player).delete(5)