| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 10,107b6b7a | 
					
						
							|  |  |  | 14,368db766 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d1b0,3480000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d1b4,348f330 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d1b8,3480000 | 
					
						
							|  |  |  | d1c0,0 | 
					
						
							|  |  |  | d1c4,0 | 
					
						
							|  |  |  | d1c8,0 | 
					
						
							|  |  |  | d1d0,0 | 
					
						
							|  |  |  | d1d4,0 | 
					
						
							|  |  |  | d1d8,0 | 
					
						
							|  |  |  | d1e0,0 | 
					
						
							|  |  |  | d1e4,0 | 
					
						
							|  |  |  | d1e8,0 | 
					
						
							|  |  |  | d1f0,0 | 
					
						
							|  |  |  | d1f4,0 | 
					
						
							|  |  |  | d1f8,0 | 
					
						
							|  |  |  | d200,0 | 
					
						
							|  |  |  | d204,0 | 
					
						
							|  |  |  | d208,0 | 
					
						
							|  |  |  | d210,0 | 
					
						
							|  |  |  | d214,0 | 
					
						
							|  |  |  | d218,0 | 
					
						
							|  |  |  | d220,0 | 
					
						
							|  |  |  | d224,0 | 
					
						
							|  |  |  | d228,0 | 
					
						
							|  |  |  | d230,0 | 
					
						
							|  |  |  | d234,0 | 
					
						
							|  |  |  | d238,0 | 
					
						
							|  |  |  | d240,0 | 
					
						
							|  |  |  | d244,0 | 
					
						
							|  |  |  | d248,0 | 
					
						
							|  |  |  | d250,0 | 
					
						
							|  |  |  | d254,0 | 
					
						
							|  |  |  | d258,0 | 
					
						
							|  |  |  | d260,0 | 
					
						
							|  |  |  | d264,0 | 
					
						
							|  |  |  | d268,0 | 
					
						
							|  |  |  | d270,0 | 
					
						
							|  |  |  | d274,0 | 
					
						
							|  |  |  | d278,0 | 
					
						
							|  |  |  | d280,0 | 
					
						
							|  |  |  | d284,0 | 
					
						
							|  |  |  | d288,0 | 
					
						
							|  |  |  | 89e810,0 | 
					
						
							|  |  |  | 89e814,0 | 
					
						
							|  |  |  | 89e81c,0 | 
					
						
							|  |  |  | 89e850,0 | 
					
						
							|  |  |  | 89e854,0 | 
					
						
							|  |  |  | 89e858,0 | 
					
						
							|  |  |  | 89e85c,0 | 
					
						
							|  |  |  | 89e868,0 | 
					
						
							|  |  |  | 89e86c,0 | 
					
						
							|  |  |  | 89e870,0 | 
					
						
							|  |  |  | 89e890,0 | 
					
						
							|  |  |  | 89e894,0 | 
					
						
							|  |  |  | 89e898,0 | 
					
						
							|  |  |  | 89e89c,0 | 
					
						
							|  |  |  | 89e8a0,0 | 
					
						
							|  |  |  | 89e8a4,0 | 
					
						
							|  |  |  | 89e8a8,0 | 
					
						
							|  |  |  | 89e8ac,0 | 
					
						
							|  |  |  | 89e8b0,0 | 
					
						
							|  |  |  | 89e8d0,0 | 
					
						
							|  |  |  | 89e8d4,0 | 
					
						
							|  |  |  | 89e8d8,0 | 
					
						
							|  |  |  | 89e8dc,0 | 
					
						
							|  |  |  | 89e8e0,0 | 
					
						
							|  |  |  | 89e8e4,0 | 
					
						
							|  |  |  | 89e8e8,0 | 
					
						
							|  |  |  | 89e8ec,0 | 
					
						
							|  |  |  | 89e8f0,0 | 
					
						
							|  |  |  | 89e90c,0 | 
					
						
							|  |  |  | 89e910,0 | 
					
						
							|  |  |  | 89e914,0 | 
					
						
							|  |  |  | 89e918,0 | 
					
						
							|  |  |  | 89e91c,0 | 
					
						
							|  |  |  | 89e920,0 | 
					
						
							|  |  |  | 89e924,0 | 
					
						
							|  |  |  | 89e928,0 | 
					
						
							|  |  |  | 89e92c,0 | 
					
						
							|  |  |  | 89e930,0 | 
					
						
							|  |  |  | 89e94c,0 | 
					
						
							|  |  |  | 89e950,0 | 
					
						
							|  |  |  | 89e954,0 | 
					
						
							|  |  |  | 89e958,0 | 
					
						
							|  |  |  | 89e95c,0 | 
					
						
							|  |  |  | 89e960,0 | 
					
						
							|  |  |  | 89e964,0 | 
					
						
							|  |  |  | 89e968,0 | 
					
						
							|  |  |  | 89e96c,0 | 
					
						
							|  |  |  | 89e970,0 | 
					
						
							|  |  |  | 89e98c,0 | 
					
						
							|  |  |  | 89e990,0 | 
					
						
							|  |  |  | 89e994,0 | 
					
						
							|  |  |  | 89e998,0 | 
					
						
							|  |  |  | 89e99c,0 | 
					
						
							|  |  |  | 89e9a0,0 | 
					
						
							|  |  |  | 89e9a4,0 | 
					
						
							|  |  |  | 89e9a8,0 | 
					
						
							|  |  |  | 89e9ac,0 | 
					
						
							|  |  |  | 89e9b0,0 | 
					
						
							|  |  |  | 89e9cc,0 | 
					
						
							|  |  |  | 89e9d0,0 | 
					
						
							|  |  |  | 89e9d4,0 | 
					
						
							|  |  |  | 89e9d8,0 | 
					
						
							|  |  |  | 89e9dc,0 | 
					
						
							|  |  |  | 89e9e0,0 | 
					
						
							|  |  |  | 89e9e4,0 | 
					
						
							|  |  |  | 89e9e8,0 | 
					
						
							|  |  |  | 89e9ec,0 | 
					
						
							|  |  |  | 89e9f0,0 | 
					
						
							|  |  |  | 89ea0c,0 | 
					
						
							|  |  |  | 89ea10,0 | 
					
						
							|  |  |  | 89ea14,0 | 
					
						
							|  |  |  | 89ea18,0 | 
					
						
							|  |  |  | 89ea1c,0 | 
					
						
							|  |  |  | 89ea20,0 | 
					
						
							|  |  |  | 89ea24,0 | 
					
						
							|  |  |  | 89ea28,0 | 
					
						
							|  |  |  | 89ea2c,0 | 
					
						
							|  |  |  | 89ea30,0 | 
					
						
							|  |  |  | 89ea4c,0 | 
					
						
							|  |  |  | 89ea50,0 | 
					
						
							|  |  |  | 89ea54,0 | 
					
						
							|  |  |  | 89ea58,0 | 
					
						
							|  |  |  | 89ea5c,0 | 
					
						
							|  |  |  | 89ea60,0 | 
					
						
							|  |  |  | 89ea64,0 | 
					
						
							|  |  |  | 89ea68,0 | 
					
						
							|  |  |  | 89ea6c,0 | 
					
						
							|  |  |  | 89ea70,0 | 
					
						
							|  |  |  | 89ea8c,0 | 
					
						
							|  |  |  | 89ea90,0 | 
					
						
							|  |  |  | 89ea94,0 | 
					
						
							|  |  |  | 89ea98,0 | 
					
						
							|  |  |  | 89ea9c,0 | 
					
						
							|  |  |  | 89eaa0,0 | 
					
						
							|  |  |  | 89eaa4,0 | 
					
						
							|  |  |  | 89eaa8,0 | 
					
						
							|  |  |  | 89eaac,0 | 
					
						
							|  |  |  | 89eab0,0 | 
					
						
							|  |  |  | 89eacc,0 | 
					
						
							|  |  |  | 89ead0,0 | 
					
						
							|  |  |  | 89ead4,0 | 
					
						
							|  |  |  | 89ead8,0 | 
					
						
							|  |  |  | 89eadc,0 | 
					
						
							|  |  |  | 89eae0,0 | 
					
						
							|  |  |  | 89eae4,0 | 
					
						
							|  |  |  | 89eae8,0 | 
					
						
							|  |  |  | 89eaec,0 | 
					
						
							|  |  |  | 89eaf0,0 | 
					
						
							|  |  |  | 89eb0c,0 | 
					
						
							|  |  |  | 89eb10,0 | 
					
						
							|  |  |  | 89eb14,0 | 
					
						
							|  |  |  | 89eb18,0 | 
					
						
							|  |  |  | 89eb1c,0 | 
					
						
							|  |  |  | 89eb20,0 | 
					
						
							|  |  |  | 89eb24,0 | 
					
						
							|  |  |  | 89eb28,0 | 
					
						
							|  |  |  | 89eb2c,0 | 
					
						
							|  |  |  | 89eb30,0 | 
					
						
							|  |  |  | 89eb4c,0 | 
					
						
							|  |  |  | 89eb50,0 | 
					
						
							|  |  |  | 89eb54,0 | 
					
						
							|  |  |  | 89eb58,0 | 
					
						
							|  |  |  | 89eb5c,0 | 
					
						
							|  |  |  | 89eb60,0 | 
					
						
							|  |  |  | 89eb64,0 | 
					
						
							|  |  |  | 89eb68,0 | 
					
						
							|  |  |  | 89eb6c,0 | 
					
						
							|  |  |  | 89eb70,0 | 
					
						
							|  |  |  | 89eb8c,0 | 
					
						
							|  |  |  | 89eb90,0 | 
					
						
							|  |  |  | 89eb94,0 | 
					
						
							|  |  |  | 89eb98,0 | 
					
						
							|  |  |  | 89eb9c,0 | 
					
						
							|  |  |  | 89eba0,0 | 
					
						
							|  |  |  | 89eba4,0 | 
					
						
							|  |  |  | 89eba8,0 | 
					
						
							|  |  |  | 89ebac,0 | 
					
						
							|  |  |  | 89ebb0,0 | 
					
						
							|  |  |  | 89ebcc,0 | 
					
						
							|  |  |  | 89ebd4,0 | 
					
						
							|  |  |  | 89ebd8,0 | 
					
						
							|  |  |  | 89ebe8,0 | 
					
						
							|  |  |  | 89ebec,0 | 
					
						
							|  |  |  | 89ebf0,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | a88f78,c1023ae | 
					
						
							|  |  |  | a89048,c1023c7 | 
					
						
							|  |  |  | a98c30,c1003cb | 
					
						
							|  |  |  | a9e838,8100781 | 
					
						
							|  |  |  | ac7ad4,c10034b | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ac8608,902025 | 
					
						
							|  |  |  | ac860c,848e00a4 | 
					
						
							|  |  |  | ac8610,34010043 | 
					
						
							|  |  |  | ac8614,0 | 
					
						
							|  |  |  | ac8618,0 | 
					
						
							|  |  |  | ac91b4,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ac9abc,c10040c | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ac9ac0,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | accd34,c1004c6 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | accd38,8e190000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | accde0,c101bac | 
					
						
							|  |  |  | acce18,c1008db | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | acce1c,8e0200a4 | 
					
						
							|  |  |  | acce20,1060001e | 
					
						
							|  |  |  | acce24,0 | 
					
						
							|  |  |  | acce28,0 | 
					
						
							|  |  |  | acce2c,0 | 
					
						
							|  |  |  | acce34,0 | 
					
						
							|  |  |  | acce38,0 | 
					
						
							|  |  |  | acce3c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | acce88,c101a70 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | acce8c,34040001 | 
					
						
							|  |  |  | acce90,0 | 
					
						
							|  |  |  | acce94,0 | 
					
						
							|  |  |  | acce98,0 | 
					
						
							|  |  |  | ad193c,10000012 | 
					
						
							|  |  |  | ada8a8,0 | 
					
						
							|  |  |  | ada8ac,0 | 
					
						
							|  |  |  | ada8b0,0 | 
					
						
							|  |  |  | ada97c,0 | 
					
						
							|  |  |  | ada9a8,0 | 
					
						
							|  |  |  | ada9bc,0 | 
					
						
							|  |  |  | adaa64,0 | 
					
						
							|  |  |  | adaa74,0 | 
					
						
							|  |  |  | adaa78,0 | 
					
						
							|  |  |  | adaba8,0 | 
					
						
							|  |  |  | adabcc,0 | 
					
						
							|  |  |  | adabe4,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ae5764,81006a7 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ae5768,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ae59e0,81006c3 | 
					
						
							|  |  |  | ae5df8,c100404 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ae5e04,0 | 
					
						
							|  |  |  | ae74d8,340e0000 | 
					
						
							|  |  |  | ae807c,6010007 | 
					
						
							|  |  |  | ae8080,84b80030 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ae8084,c100b29 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ae8088,0 | 
					
						
							|  |  |  | ae8090,0 | 
					
						
							|  |  |  | ae8094,0 | 
					
						
							|  |  |  | ae8098,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ae986c,8100b09 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ae9870,3c01800f | 
					
						
							|  |  |  | ae9ed8,35ee0000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | aeb67c,c1009b8 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | aeb680,0 | 
					
						
							|  |  |  | aeb764,26380008 | 
					
						
							|  |  |  | aeb768,ae9802b0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | aeb76c,c101de8 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | aeb778,400821 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | af1814,c100e6a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | af1818,0 | 
					
						
							|  |  |  | af74f8,afbf0044 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | af74fc,c100a3a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | af7500,0 | 
					
						
							|  |  |  | af7504,8fbf0044 | 
					
						
							|  |  |  | af7650,afbf0034 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | af7654,c100a48 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | af7658,0 | 
					
						
							|  |  |  | af765c,8fbf0034 | 
					
						
							|  |  |  | af76b8,afbf000c | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | af76bc,c100a2f | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | af76c4,8fbf000c | 
					
						
							|  |  |  | b06400,820f0ede | 
					
						
							|  |  |  | b0640c,31f80002 | 
					
						
							|  |  |  | b06bb8,34190000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b06c2c,c1007c2 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b06c30,a2280020 | 
					
						
							|  |  |  | b10218,afa40020 | 
					
						
							|  |  |  | b1021c,30a8fffe | 
					
						
							|  |  |  | b10220,3401000e | 
					
						
							|  |  |  | b10224,15010006 | 
					
						
							|  |  |  | b10228,afa50024 | 
					
						
							|  |  |  | b1022c,10000030 | 
					
						
							|  |  |  | b10230,0 | 
					
						
							|  |  |  | b10234,4410002 | 
					
						
							|  |  |  | b10238,34010004 | 
					
						
							|  |  |  | b1023c,afa10024 | 
					
						
							|  |  |  | b10240,8fa60020 | 
					
						
							|  |  |  | b10244,3c010001 | 
					
						
							|  |  |  | b10248,242121c8 | 
					
						
							|  |  |  | b1024c,c12021 | 
					
						
							|  |  |  | b10250,afa40018 | 
					
						
							|  |  |  | b10254,c000ba0 | 
					
						
							|  |  |  | b10258,24050250 | 
					
						
							|  |  |  | b1025c,8fa20024 | 
					
						
							|  |  |  | b10260,8fa40018 | 
					
						
							|  |  |  | b10264,8fa60020 | 
					
						
							|  |  |  | b10268,24010001 | 
					
						
							|  |  |  | b1026c,27143 | 
					
						
							|  |  |  | b10270,15c10015 | 
					
						
							|  |  |  | b10274,ac820228 | 
					
						
							|  |  |  | b10278,3c01800a | 
					
						
							|  |  |  | b1027c,242f8dec | 
					
						
							|  |  |  | b10280,24388e18 | 
					
						
							|  |  |  | b10284,24398c00 | 
					
						
							|  |  |  | b10288,24289244 | 
					
						
							|  |  |  | b1028c,24298fa8 | 
					
						
							|  |  |  | b10290,242a8e24 | 
					
						
							|  |  |  | b10294,242b9250 | 
					
						
							|  |  |  | b10298,242c92a8 | 
					
						
							|  |  |  | b1029c,242d92b4 | 
					
						
							|  |  |  | b102f0,3c010001 | 
					
						
							|  |  |  | b102f4,242117a4 | 
					
						
							|  |  |  | b102f8,812021 | 
					
						
							|  |  |  | b102fc,c02058a | 
					
						
							|  |  |  | b10300,24050002 | 
					
						
							|  |  |  | b10304,1000ffcb | 
					
						
							|  |  |  | b10308,0 | 
					
						
							|  |  |  | b1030c,3c01800a | 
					
						
							|  |  |  | b10310,242f8218 | 
					
						
							|  |  |  | b10314,243882b8 | 
					
						
							|  |  |  | b10318,243981e0 | 
					
						
							|  |  |  | b1031c,24288700 | 
					
						
							|  |  |  | b10320,242983fc | 
					
						
							|  |  |  | b10324,242a82c4 | 
					
						
							|  |  |  | b10328,242b83e4 | 
					
						
							|  |  |  | b1032c,242c83d8 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b10cc0,c1004ae | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b10cc4,3c010001 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b12a34,c10065a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b12a38,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b12a60,8101fca | 
					
						
							|  |  |  | b12e30,c101fdb | 
					
						
							|  |  |  | b12e44,8101fea | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b17bb4,afbf001c | 
					
						
							|  |  |  | b17bb8,afa40140 | 
					
						
							|  |  |  | b17bbc,3c048040 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b17bc0,3406f330 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b17bc4,c00037c | 
					
						
							|  |  |  | b17bc8,3c050348 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b17bcc,c10033e | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b17bd0,0 | 
					
						
							|  |  |  | b17bd4,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b2b488,c100bf4 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b2b48c,0 | 
					
						
							|  |  |  | b2b490,0 | 
					
						
							|  |  |  | b2b494,0 | 
					
						
							|  |  |  | b2b498,0 | 
					
						
							|  |  |  | b2b49c,0 | 
					
						
							|  |  |  | b2b4f0,3c048013 | 
					
						
							|  |  |  | b2b4f4,24848a50 | 
					
						
							|  |  |  | b2b4f8,3c058040 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b2b4fc,24a52fb0 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b2b500,c015c0c | 
					
						
							|  |  |  | b2b504,34060018 | 
					
						
							|  |  |  | b2b508,3c048013 | 
					
						
							|  |  |  | b2b50c,24848a50 | 
					
						
							|  |  |  | b2b514,0 | 
					
						
							|  |  |  | b2b518,3c048013 | 
					
						
							|  |  |  | b2b51c,24848a5c | 
					
						
							|  |  |  | b2b520,c02cf77 | 
					
						
							|  |  |  | b2b524,0 | 
					
						
							|  |  |  | b2b528,0 | 
					
						
							|  |  |  | b2b52c,0 | 
					
						
							|  |  |  | b2b530,0 | 
					
						
							|  |  |  | b2b534,0 | 
					
						
							|  |  |  | b2b538,0 | 
					
						
							|  |  |  | b2b53c,0 | 
					
						
							|  |  |  | b2e82c,3c058001 | 
					
						
							|  |  |  | b2e830,8ca5b188 | 
					
						
							|  |  |  | b2e854,3c058001 | 
					
						
							|  |  |  | b2e858,8ca5b198 | 
					
						
							|  |  |  | b3dd3c,3c018040 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b3dd40,8c242fc8 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b3dd44,c02e195 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b3dd48,8c252fcc | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b3dd4c,8fbf0014 | 
					
						
							|  |  |  | b3dd54,27bd0018 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b51694,c1007d5 | 
					
						
							|  |  |  | b516c4,c1007dc | 
					
						
							|  |  |  | b52784,c1007f6 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b52788,0 | 
					
						
							|  |  |  | b5278c,8fbf003c | 
					
						
							|  |  |  | b5293c,10000018 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b54b38,c100770 | 
					
						
							|  |  |  | b54e5c,c10075d | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b55428,a42063ed | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b55a64,c1007a7 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b575c8,acae0000 | 
					
						
							|  |  |  | b58320,afbf0000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | b58324,c1009f4 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | b58328,0 | 
					
						
							|  |  |  | b5832c,8fbf0000 | 
					
						
							|  |  |  | b58330,0 | 
					
						
							|  |  |  | b7ec4c,8009a3ac | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ba16ac,c100cde | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ba16b0,a42fca2a | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ba16e0,c100ce9 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ba16e4,a439ca2a | 
					
						
							|  |  |  | ba18c4,340c00c8 | 
					
						
							|  |  |  | ba1980,340800c8 | 
					
						
							|  |  |  | ba19dc,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ba1c68,c100cf4 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ba1c6c,a42dca2a | 
					
						
							|  |  |  | ba1c70,850e4a38 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ba1cd0,c100cff | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ba1cd4,a439ca2a | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ba1d04,c100d0a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ba1d08,0 | 
					
						
							|  |  |  | ba1e20,340d00c8 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ba32cc,c100d15 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ba32d0,a439ca2a | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ba3300,c100d20 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ba3304,a42bca2a | 
					
						
							|  |  |  | ba34dc,341800c8 | 
					
						
							|  |  |  | ba3654,0 | 
					
						
							|  |  |  | ba39d0,340d00c8 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | baa168,c100cc8 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | baa16c,a42eca2a | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | baa198,c100cd3 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | baa19c,a42dca2a | 
					
						
							|  |  |  | baa3ac,a07025 | 
					
						
							|  |  |  | bac064,7821 | 
					
						
							|  |  |  | bac1bc,7821 | 
					
						
							|  |  |  | bac3ec,c821 | 
					
						
							|  |  |  | bac94c,c821 | 
					
						
							|  |  |  | bae5a4,a46b4a6c | 
					
						
							|  |  |  | bae5c8,0 | 
					
						
							|  |  |  | bae864,0 | 
					
						
							|  |  |  | baed6c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | baf4f4,c100d2b | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | baf4f8,2002025 | 
					
						
							|  |  |  | baf738,102825 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | baf73c,c101850 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | baf740,330400ff | 
					
						
							|  |  |  | baf744,8fb00018 | 
					
						
							|  |  |  | baf748,8fbf001c | 
					
						
							|  |  |  | baf74c,3e00008 | 
					
						
							|  |  |  | baf750,27bd0088 | 
					
						
							|  |  |  | baf754,0 | 
					
						
							|  |  |  | baf758,0 | 
					
						
							|  |  |  | baf75c,0 | 
					
						
							|  |  |  | baf760,0 | 
					
						
							|  |  |  | baf764,0 | 
					
						
							|  |  |  | baf768,0 | 
					
						
							|  |  |  | baf76c,0 | 
					
						
							|  |  |  | baf770,0 | 
					
						
							|  |  |  | baf774,0 | 
					
						
							|  |  |  | baf778,0 | 
					
						
							|  |  |  | baf77c,0 | 
					
						
							|  |  |  | baf780,0 | 
					
						
							|  |  |  | baf784,0 | 
					
						
							|  |  |  | baf788,0 | 
					
						
							|  |  |  | baf78c,0 | 
					
						
							|  |  |  | baf790,0 | 
					
						
							|  |  |  | baf794,0 | 
					
						
							|  |  |  | bb05fc,ffc0 | 
					
						
							|  |  |  | bb0600,ffb0ffb0 | 
					
						
							|  |  |  | bb5eac,0 | 
					
						
							|  |  |  | bb5eb0,0 | 
					
						
							|  |  |  | bb5fdc,0 | 
					
						
							|  |  |  | bb6134,0 | 
					
						
							|  |  |  | bb6138,0 | 
					
						
							|  |  |  | bb61e0,0 | 
					
						
							|  |  |  | bb61e4,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bb6688,c100669 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bb668c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bb67c4,c100669 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bb67c8,1826021 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bb6cf0,c100698 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bb6cf4,0 | 
					
						
							|  |  |  | bb77b4,0 | 
					
						
							|  |  |  | bb7894,0 | 
					
						
							|  |  |  | bb7ba0,0 | 
					
						
							|  |  |  | bb7bfc,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bb7c88,c100663 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bb7c8c,1cf8821 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bb7d10,c100663 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bb7d14,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bc088c,c100676 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bc0890,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bcdbd8,c100d3d | 
					
						
							|  |  |  | bcecbc,810037c | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bcecc0,0 | 
					
						
							|  |  |  | bcecc4,0 | 
					
						
							|  |  |  | bcecc8,0 | 
					
						
							|  |  |  | bceccc,0 | 
					
						
							|  |  |  | bcecd0,0 | 
					
						
							|  |  |  | bcf73c,afbf0000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bcf740,c100814 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bcf744,0 | 
					
						
							|  |  |  | bcf748,8fbf0000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bcf914,c10080c | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bcf918,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bd4c58,c100b9d | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bd4c5c,270821 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bd5c58,c1005c5 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bd5c5c,301c825 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bd6958,c100a25 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bd695c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bd9a04,c1009d5 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bd9a08,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bda0a0,c10034f | 
					
						
							|  |  |  | bda0d8,c10036c | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bda0e4,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bda264,c10036f | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bda270,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bda2e8,c10038a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bda2ec,812a0002 | 
					
						
							|  |  |  | bda2f0,5600018 | 
					
						
							|  |  |  | bda2f4,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | be1bc8,c1005d6 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | be1bcc,afa50034 | 
					
						
							|  |  |  | be1c98,3c014218 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | be4a14,c100e18 | 
					
						
							|  |  |  | be4a40,c100e32 | 
					
						
							|  |  |  | be4a60,8100e4a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | be4a64,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | be5d8c,c100e74 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | be5d90,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | be9ac0,c1003a6 | 
					
						
							|  |  |  | be9ad8,c1003b1 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | be9adc,8fa20024 | 
					
						
							|  |  |  | be9ae4,8fa40028 | 
					
						
							|  |  |  | be9bdc,24018383 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | bea044,c10048a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | bea048,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | c004ec,81005ff | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | c0067c,28610064 | 
					
						
							|  |  |  | c0082c,340e0018 | 
					
						
							|  |  |  | c00830,8c4f00a0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | c01078,c100849 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | c0107c,0 | 
					
						
							|  |  |  | c01080,0 | 
					
						
							|  |  |  | c01084,0 | 
					
						
							|  |  |  | c01088,0 | 
					
						
							|  |  |  | c0108c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | c018a0,c100614 | 
					
						
							|  |  |  | c06198,c1009c2 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | c064bc,920201ec | 
					
						
							|  |  |  | c06e5c,920201ec | 
					
						
							|  |  |  | c07230,920201ec | 
					
						
							|  |  |  | c07494,920201ec | 
					
						
							|  |  |  | c075a8,931901ed | 
					
						
							|  |  |  | c07648,931901ed | 
					
						
							|  |  |  | c0796c,1f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | c0e77c,c1007bc | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | c0e780,ac400428 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | c5a9f0,c100cc3 | 
					
						
							|  |  |  | c6c7a8,c100624 | 
					
						
							|  |  |  | c6c920,c100624 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | c6cedc,340b0001 | 
					
						
							|  |  |  | c6ed84,946f00a2 | 
					
						
							|  |  |  | c6ed88,31f80018 | 
					
						
							|  |  |  | c6ff30,46005402 | 
					
						
							|  |  |  | c6ff34,44054000 | 
					
						
							|  |  |  | c6ff38,4600848d | 
					
						
							|  |  |  | c6ff3c,44069000 | 
					
						
							|  |  |  | c6ff44,27bdffe8 | 
					
						
							|  |  |  | c6ff48,afbf0004 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | c6ff4c,c100a00 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | c6ff50,0 | 
					
						
							|  |  |  | c6ff54,8fbf0004 | 
					
						
							|  |  |  | c6ff58,27bd0018 | 
					
						
							|  |  |  | c6ff5c,3e00008 | 
					
						
							|  |  |  | c6ff60,0 | 
					
						
							|  |  |  | c6ff64,0 | 
					
						
							|  |  |  | c6ff68,0 | 
					
						
							|  |  |  | c6ff6c,0 | 
					
						
							|  |  |  | c6ff70,0 | 
					
						
							|  |  |  | c6ff74,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | c72c64,c100bdb | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | c72c68,2002021 | 
					
						
							|  |  |  | c72c70,15e00006 | 
					
						
							|  |  |  | c72c74,0 | 
					
						
							|  |  |  | c7bcf0,8cb91d38 | 
					
						
							|  |  |  | c7bcf4,34080004 | 
					
						
							|  |  |  | c7bcf8,8ca21c44 | 
					
						
							|  |  |  | c7bcfc,0 | 
					
						
							|  |  |  | c7bd00,0 | 
					
						
							|  |  |  | c7bd04,0 | 
					
						
							|  |  |  | c7bd08,0 | 
					
						
							|  |  |  | c82550,0 | 
					
						
							|  |  |  | c892dc,340e0001 | 
					
						
							|  |  |  | c8931c,340a0001 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | c89744,c1003d8 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | c89868,920e1d28 | 
					
						
							|  |  |  | c898a4,92191d29 | 
					
						
							|  |  |  | c898c8,920a1d2a | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | c8b24c,c100509 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | c8b250,2002025 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ca6dc0,81023e9 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ca6dc4,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | cb6874,c1006a1 | 
					
						
							|  |  |  | cc0038,c10046a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | cc003c,8fa40018 | 
					
						
							|  |  |  | cc3fa8,a20101f8 | 
					
						
							|  |  |  | cc4024,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | cc4038,c1009a7 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | cc403c,240c0004 | 
					
						
							|  |  |  | cc453c,806 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | cc8594,c1005e9 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | cc8598,24180006 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | cc85b8,c100dfd | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | cc85bc,afa50064 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | cce9a4,c100ebc | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | cce9a8,8e04011c | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | cdf3ec,0 | 
					
						
							|  |  |  | cdf404,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | cdf420,c1005b9 | 
					
						
							|  |  |  | cdf638,c1005cd | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | cdf63c,e7a40034 | 
					
						
							|  |  |  | cdf790,2405001e | 
					
						
							|  |  |  | cf1ab8,0 | 
					
						
							|  |  |  | cf1abc,8f09b4a8 | 
					
						
							|  |  |  | cf1ac0,31280040 | 
					
						
							|  |  |  | cf1ac4,35390040 | 
					
						
							|  |  |  | cf1ac8,af19b4a8 | 
					
						
							|  |  |  | cf1acc,34090006 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | cf73c8,c100bb5 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | cf73cc,3c010001 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | cf7ad4,c1005b3 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | cf7ad8,afa50044 | 
					
						
							|  |  |  | d12f78,340f0000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d357d4,c100b17 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d35efc,0 | 
					
						
							|  |  |  | d35f54,10000008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d4bcb0,c100dd8 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d4bcb4,8619001c | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d4be6c,c10098b | 
					
						
							|  |  |  | d52698,c1004e5 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d5269c,8e190024 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d5b264,c100aa5 | 
					
						
							|  |  |  | d5b660,8100aa8 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d5b664,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d5ff94,c100eb2 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d5ff98,44d9f800 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d62100,c100c65 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d62110,3c014248 | 
					
						
							|  |  |  | d62128,0 | 
					
						
							|  |  |  | d6215c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d621cc,c100c73 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d621dc,3c014248 | 
					
						
							|  |  |  | d6221c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d68d68,c100c1d | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d68d6c,afb20044 | 
					
						
							|  |  |  | d68d70,3c098040 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d68d74,2529306c | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d68d78,81290000 | 
					
						
							|  |  |  | d68d7c,11200186 | 
					
						
							|  |  |  | d68d80,8fbf004c | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d68d84,c100c31 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d68d88,f7b80030 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d69c80,c100c39 | 
					
						
							|  |  |  | d6cc18,c100cbb | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d6cc1c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d6cdd4,c100cbf | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d6cdd8,0 | 
					
						
							|  |  |  | d73118,0 | 
					
						
							|  |  |  | d73128,0 | 
					
						
							|  |  |  | d74964,1000000a | 
					
						
							|  |  |  | d7e140,340e0001 | 
					
						
							|  |  |  | d7e144,806f0ede | 
					
						
							|  |  |  | d7e160,3c04801d | 
					
						
							|  |  |  | d7e164,248484a0 | 
					
						
							|  |  |  | d7e168,848800a4 | 
					
						
							|  |  |  | d7e16c,34010063 | 
					
						
							|  |  |  | d7e170,14280003 | 
					
						
							|  |  |  | d7e174,34022049 | 
					
						
							|  |  |  | d7e178,10000006 | 
					
						
							|  |  |  | d7e17c,0 | 
					
						
							|  |  |  | d7e180,94690ed6 | 
					
						
							|  |  |  | d7e184,31290004 | 
					
						
							|  |  |  | d7e188,15200002 | 
					
						
							|  |  |  | d7e18c,34022044 | 
					
						
							|  |  |  | d7e190,34022043 | 
					
						
							|  |  |  | d7e194,8fbf0014 | 
					
						
							|  |  |  | d7e198,27bd0018 | 
					
						
							|  |  |  | d7e19c,3e00008 | 
					
						
							|  |  |  | d7e1a0,0 | 
					
						
							|  |  |  | d7e398,94890ed6 | 
					
						
							|  |  |  | d7e39c,31280014 | 
					
						
							|  |  |  | d7e3a0,34090014 | 
					
						
							|  |  |  | d7e3a4,3401005f | 
					
						
							|  |  |  | d7e3a8,14230005 | 
					
						
							|  |  |  | d7e3ac,0 | 
					
						
							|  |  |  | d7e3b0,1109000d | 
					
						
							|  |  |  | d7e3b4,0 | 
					
						
							|  |  |  | d7e3b8,3e00008 | 
					
						
							|  |  |  | d7e3bc,34020001 | 
					
						
							|  |  |  | d7e3c0,14c20009 | 
					
						
							|  |  |  | d7e3c4,34010063 | 
					
						
							|  |  |  | d7e3c8,14230007 | 
					
						
							|  |  |  | d7e3cc,8c8a0010 | 
					
						
							|  |  |  | d7e3d0,15400005 | 
					
						
							|  |  |  | d7e3d4,0 | 
					
						
							|  |  |  | d7e3d8,15090003 | 
					
						
							|  |  |  | d7e3dc,0 | 
					
						
							|  |  |  | d7e3e0,3e00008 | 
					
						
							|  |  |  | d7e3e4,34020001 | 
					
						
							|  |  |  | d7e3e8,3e00008 | 
					
						
							|  |  |  | d7e3ec,34020000 | 
					
						
							|  |  |  | d7e76c,8fb80044 | 
					
						
							|  |  |  | d7e778,871800a4 | 
					
						
							|  |  |  | d7e77c,80490ede | 
					
						
							|  |  |  | d7e784,34080001 | 
					
						
							|  |  |  | d7e788,2002021 | 
					
						
							|  |  |  | d7e798,15400002 | 
					
						
							|  |  |  | d7e79c,3419005f | 
					
						
							|  |  |  | d7e7a0,17380005 | 
					
						
							|  |  |  | d7e7a4,ae0b0180 | 
					
						
							|  |  |  | d7e890,0 | 
					
						
							|  |  |  | d7e8a0,10000007 | 
					
						
							|  |  |  | d7e8a4,314a0004 | 
					
						
							|  |  |  | d7e8b0,0 | 
					
						
							|  |  |  | d7e8b4,0 | 
					
						
							|  |  |  | d7e8c0,340b0014 | 
					
						
							|  |  |  | d7e8c8,14b5025 | 
					
						
							|  |  |  | d7e8cc,154b0014 | 
					
						
							|  |  |  | d7e8d4,340e0001 | 
					
						
							|  |  |  | d7e8d8,804f0ede | 
					
						
							|  |  |  | d7e8e0,5700000f | 
					
						
							|  |  |  | d7eb4c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d7eb70,c100d5a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d7eb74,acc80004 | 
					
						
							|  |  |  | d7ebbc,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d7ebc8,c100d62 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d7ebf0,27bdffe8 | 
					
						
							|  |  |  | d7ebf4,afbf0014 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d7ebf8,c100d6d | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d7ebfc,8ca21c44 | 
					
						
							|  |  |  | d7ec04,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d7ec10,c100d71 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d7ec14,971804c6 | 
					
						
							|  |  |  | d7ec2c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d7ec34,c100d88 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | d7ec40,0 | 
					
						
							|  |  |  | d7ec54,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | d7ec60,8100d7a | 
					
						
							|  |  |  | d7ec70,8100da0 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | db13d0,24090076 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | db532c,c10043a | 
					
						
							|  |  |  | db53e8,810241b | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | db53ec,0 | 
					
						
							|  |  |  | dbec80,34020000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | dbf428,c1007fe | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | dbf434,44989000 | 
					
						
							|  |  |  | dbf438,e652019c | 
					
						
							|  |  |  | dbf484,0 | 
					
						
							|  |  |  | dbf4a8,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | dc7090,c10081e | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | dc7094,c60a0198 | 
					
						
							|  |  |  | dc87a0,0 | 
					
						
							|  |  |  | dc87bc,0 | 
					
						
							|  |  |  | dc87cc,0 | 
					
						
							|  |  |  | dc8828,1a00821 | 
					
						
							|  |  |  | dcbea8,3c014248 | 
					
						
							|  |  |  | dcbf24,3c014248 | 
					
						
							|  |  |  | dcbf30,3c014230 | 
					
						
							|  |  |  | dcbf9c,3c014230 | 
					
						
							|  |  |  | dd366c,3c0140d0 | 
					
						
							|  |  |  | dd367c,3c064000 | 
					
						
							|  |  |  | dd3684,3c074000 | 
					
						
							|  |  |  | dd3688,0 | 
					
						
							|  |  |  | dd368c,0 | 
					
						
							|  |  |  | dd3744,3c0140d0 | 
					
						
							|  |  |  | dd3754,3c064000 | 
					
						
							|  |  |  | dd375c,3c074000 | 
					
						
							|  |  |  | dd3760,0 | 
					
						
							|  |  |  | dd3764,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | de1018,c102434 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | de101c,0 | 
					
						
							|  |  |  | de1020,0 | 
					
						
							|  |  |  | de1024,0 | 
					
						
							|  |  |  | de1028,0 | 
					
						
							|  |  |  | de102c,0 | 
					
						
							|  |  |  | de1030,0 | 
					
						
							|  |  |  | de1034,0 | 
					
						
							|  |  |  | de1038,0 | 
					
						
							|  |  |  | de103c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | de1050,8102434 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | de1054,0 | 
					
						
							|  |  |  | df2644,76 | 
					
						
							|  |  |  | df7a90,340e0018 | 
					
						
							|  |  |  | df7a94,8c4f00a0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | df7cb0,c100644 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | dfec3c,3c188012 | 
					
						
							|  |  |  | dfec40,8f18ae8c | 
					
						
							|  |  |  | dfec48,33190010 | 
					
						
							|  |  |  | dfec4c,0 | 
					
						
							|  |  |  | e09f68,806f0ede | 
					
						
							|  |  |  | e09f74,31f80004 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e09fb0,c100427 | 
					
						
							|  |  |  | e0ec50,c100c0b | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e0ec54,2202825 | 
					
						
							|  |  |  | e11e98,9442a674 | 
					
						
							|  |  |  | e11e9c,304e0040 | 
					
						
							|  |  |  | e11ea0,51c00002 | 
					
						
							|  |  |  | e11ea4,1021 | 
					
						
							|  |  |  | e11ea8,34020001 | 
					
						
							|  |  |  | e11eac,3e00008 | 
					
						
							|  |  |  | e11eb0,0 | 
					
						
							|  |  |  | e11eb4,0 | 
					
						
							|  |  |  | e11eb8,0 | 
					
						
							|  |  |  | e11ebc,0 | 
					
						
							|  |  |  | e11ec0,0 | 
					
						
							|  |  |  | e11ec4,0 | 
					
						
							|  |  |  | e11ec8,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e11f90,c1004f0 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e11f94,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e12a04,c100e51 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e12a20,ac8302a4 | 
					
						
							|  |  |  | e1f72c,27bdffe8 | 
					
						
							|  |  |  | e1f730,afbf0014 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e1f734,c100e96 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e1f738,0 | 
					
						
							|  |  |  | e1f73c,8fbf0014 | 
					
						
							|  |  |  | e1f740,27bd0018 | 
					
						
							|  |  |  | e1f744,28410005 | 
					
						
							|  |  |  | e1f748,14200012 | 
					
						
							|  |  |  | e1f74c,24010005 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e1feac,c100ea8 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e1feb0,3c0743cf | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e20410,c100b43 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e20414,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e206dc,c100b51 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e206e0,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e2076c,c100b61 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e20770,afa40020 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e20798,c100b59 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e2079c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e24e7c,c1004bd | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e24e80,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e29388,8100448 | 
					
						
							|  |  |  | e2a044,c100451 | 
					
						
							|  |  |  | e2b0b4,c100459 | 
					
						
							|  |  |  | e2b434,c10085c | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e2b438,0 | 
					
						
							|  |  |  | e2b43c,0 | 
					
						
							|  |  |  | e2b440,0 | 
					
						
							|  |  |  | e2b444,0 | 
					
						
							|  |  |  | e2b448,0 | 
					
						
							|  |  |  | e2b44c,0 | 
					
						
							|  |  |  | e2b450,0 | 
					
						
							|  |  |  | e2b454,0 | 
					
						
							|  |  |  | e2b458,0 | 
					
						
							|  |  |  | e2b45c,0 | 
					
						
							|  |  |  | e2b460,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e2c03c,c10097e | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e2c040,2442a5d0 | 
					
						
							|  |  |  | e2cc1c,3c058012 | 
					
						
							|  |  |  | e2cc20,24a5a5d0 | 
					
						
							|  |  |  | e2cc24,86080270 | 
					
						
							|  |  |  | e2cc28,15000009 | 
					
						
							|  |  |  | e2cc2c,90b9008a | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e2d714,c10082b | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e2d71c,340900bf | 
					
						
							|  |  |  | e2d720,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e2d890,c10083a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e2d894,0 | 
					
						
							|  |  |  | e2f090,34 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e429dc,c10055e | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e429e0,0 | 
					
						
							|  |  |  | e429e4,10000053 | 
					
						
							|  |  |  | e429e8,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e42b5c,c100544 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e42b64,1000000d | 
					
						
							|  |  |  | e42b68,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e42c00,c10053c | 
					
						
							|  |  |  | e42c44,c1005a5 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e42c48,860e008a | 
					
						
							|  |  |  | e42c4c,15400045 | 
					
						
							|  |  |  | e50888,340403e7 | 
					
						
							|  |  |  | e55c4c,340c0000 | 
					
						
							|  |  |  | e56290,0 | 
					
						
							|  |  |  | e56294,340b401f | 
					
						
							|  |  |  | e56298,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e565d0,c100bfc | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e565d4,0 | 
					
						
							|  |  |  | e565d8,2002025 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | e571d0,3c038041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e571d4,906db5c4 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | e571d8,340c0001 | 
					
						
							|  |  |  | e571dc,11ac0004 | 
					
						
							|  |  |  | e571e0,0 | 
					
						
							|  |  |  | e57208,3c038041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e5720c,906db5c4 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | e57210,340c0002 | 
					
						
							|  |  |  | e57214,11ac000d | 
					
						
							|  |  |  | e57218,0 | 
					
						
							|  |  |  | e5721c,0 | 
					
						
							|  |  |  | e57220,0 | 
					
						
							|  |  |  | e57224,0 | 
					
						
							|  |  |  | e57228,0 | 
					
						
							|  |  |  | e5722c,0 | 
					
						
							|  |  |  | e57230,0 | 
					
						
							|  |  |  | e57234,0 | 
					
						
							|  |  |  | e57238,0 | 
					
						
							|  |  |  | e5723c,0 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e59cd4,0 | 
					
						
							|  |  |  | e59cd8,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e59e68,810246d | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e59e6c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e59ecc,8102496 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e59ed0,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e5b2f4,c100e7f | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e5b2f8,afa5001c | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e5b538,c100e8b | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e5b53c,3c07461c | 
					
						
							|  |  |  | e62630,a48001f8 | 
					
						
							|  |  |  | e62634,2463a5d0 | 
					
						
							|  |  |  | e62638,94790ed4 | 
					
						
							|  |  |  | e6263c,340f0090 | 
					
						
							|  |  |  | e62640,32fc024 | 
					
						
							|  |  |  | e62644,170f0006 | 
					
						
							|  |  |  | e62648,0 | 
					
						
							|  |  |  | e6264c,10000023 | 
					
						
							|  |  |  | e62650,34021045 | 
					
						
							|  |  |  | e62654,0 | 
					
						
							|  |  |  | e62658,0 | 
					
						
							|  |  |  | e6265c,0 | 
					
						
							|  |  |  | e62950,3c038012 | 
					
						
							|  |  |  | e62954,34010055 | 
					
						
							|  |  |  | e62958,2463a5d0 | 
					
						
							|  |  |  | e6295c,94680ed4 | 
					
						
							|  |  |  | e62960,31090080 | 
					
						
							|  |  |  | e62964,310a0010 | 
					
						
							|  |  |  | e62968,94680edc | 
					
						
							|  |  |  | e6296c,310b0001 | 
					
						
							|  |  |  | e62970,94680ed6 | 
					
						
							|  |  |  | e62974,310d1000 | 
					
						
							|  |  |  | e62978,12b7025 | 
					
						
							|  |  |  | e6297c,14d7825 | 
					
						
							|  |  |  | e62980,14410007 | 
					
						
							|  |  |  | e62984,34181010 | 
					
						
							|  |  |  | e62988,11c00003 | 
					
						
							|  |  |  | e6298c,0 | 
					
						
							|  |  |  | e62990,11f80010 | 
					
						
							|  |  |  | e62994,0 | 
					
						
							|  |  |  | e62998,3e00008 | 
					
						
							|  |  |  | e6299c,34020001 | 
					
						
							|  |  |  | e629a0,34010028 | 
					
						
							|  |  |  | e629a4,14410008 | 
					
						
							|  |  |  | e629a8,0 | 
					
						
							|  |  |  | e629ac,11c00009 | 
					
						
							|  |  |  | e629b0,0 | 
					
						
							|  |  |  | e629b4,15f80007 | 
					
						
							|  |  |  | e629b8,0 | 
					
						
							|  |  |  | e629bc,8c6c0004 | 
					
						
							|  |  |  | e629c0,1580fff5 | 
					
						
							|  |  |  | e629c4,0 | 
					
						
							|  |  |  | e629c8,3401005b | 
					
						
							|  |  |  | e629cc,1041fff2 | 
					
						
							|  |  |  | e629d0,0 | 
					
						
							|  |  |  | e629d4,3e00008 | 
					
						
							|  |  |  | e629d8,1021 | 
					
						
							|  |  |  | e629dc,0 | 
					
						
							|  |  |  | e629e0,0 | 
					
						
							|  |  |  | e629e4,0 | 
					
						
							|  |  |  | e6befc,0 | 
					
						
							|  |  |  | e6bf4c,340d0000 | 
					
						
							|  |  |  | e6bf50,0 | 
					
						
							|  |  |  | e7cc90,240e000c | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e7d19c,c100d31 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e7d1a0,3c050600 | 
					
						
							|  |  |  | e7d1a4,10a80003 | 
					
						
							|  |  |  | e7d1a8,3025 | 
					
						
							|  |  |  | e81128,35cf0080 | 
					
						
							|  |  |  | e9e1b8,3c19801d | 
					
						
							|  |  |  | e9e1bc,8f39a1d8 | 
					
						
							|  |  |  | e9e1c0,33390001 | 
					
						
							|  |  |  | e9e1c4,34010000 | 
					
						
							|  |  |  | e9e1c8,0 | 
					
						
							|  |  |  | e9e1cc,0 | 
					
						
							|  |  |  | e9f59c,95cfa674 | 
					
						
							|  |  |  | e9f5a0,31f80040 | 
					
						
							|  |  |  | e9f5a4,53000002 | 
					
						
							|  |  |  | e9f5a8,1021 | 
					
						
							|  |  |  | e9f5ac,34020001 | 
					
						
							|  |  |  | e9f5b0,3e00008 | 
					
						
							|  |  |  | e9f5b4,0 | 
					
						
							|  |  |  | e9f5b8,0 | 
					
						
							|  |  |  | e9f5bc,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e9f678,c1004f0 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e9f67c,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | e9f7a8,c1004f0 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | e9f7ac,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ebb85c,c10062f | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ebb864,14400012 | 
					
						
							|  |  |  | ebb86c,10000014 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ec1120,c1004f0 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ec1124,0 | 
					
						
							|  |  |  | ec68bc,8fad002c | 
					
						
							|  |  |  | ec68c0,340c000a | 
					
						
							|  |  |  | ec68c4,a5ac0110 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ec68c8,c101b6a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ec68cc,2002021 | 
					
						
							|  |  |  | ec68d0,0 | 
					
						
							|  |  |  | ec68d4,0 | 
					
						
							|  |  |  | ec68d8,0 | 
					
						
							|  |  |  | ec68dc,0 | 
					
						
							|  |  |  | ec68e0,0 | 
					
						
							|  |  |  | ec69ac,8fad002c | 
					
						
							|  |  |  | ec69b0,340c000a | 
					
						
							|  |  |  | ec69b4,a5ac0110 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ec69b8,c101b6a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ec69bc,2002021 | 
					
						
							|  |  |  | ec69c0,0 | 
					
						
							|  |  |  | ec69c4,0 | 
					
						
							|  |  |  | ec69c8,0 | 
					
						
							|  |  |  | ec69cc,0 | 
					
						
							|  |  |  | ec69d0,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ec6b04,8102402 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ec6b08,0 | 
					
						
							|  |  |  | ec9ce4,2419007a | 
					
						
							|  |  |  | ed2858,20180008 | 
					
						
							|  |  |  | ed2fac,806e0f18 | 
					
						
							|  |  |  | ed2fec,340a0000 | 
					
						
							|  |  |  | ed5a28,340e0018 | 
					
						
							|  |  |  | ed5a2c,8ccf00a0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ed645c,c100827 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ed6460,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ee7b84,c100955 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ee7b8c,0 | 
					
						
							|  |  |  | ee7b90,0 | 
					
						
							|  |  |  | ee7b94,0 | 
					
						
							|  |  |  | ee7b98,0 | 
					
						
							|  |  |  | ee7b9c,0 | 
					
						
							|  |  |  | ee7ba0,0 | 
					
						
							|  |  |  | ee7ba4,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ee7e4c,c100a8b | 
					
						
							|  |  |  | ef32b8,c100a80 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ef32bc,0 | 
					
						
							|  |  |  | ef32c0,8fbf003c | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ef36e4,c100a56 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ef36e8,0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | ef373c,c100a68 | 
					
						
							|  |  |  | ef4f98,c10079a | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | ef4f9c,0 | 
					
						
							|  |  |  | 26c10e0,38ff | 
					
						
							|  |  |  | 3480000,80400020 | 
					
						
							|  |  |  | 3480004,80400844 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3480008,8040a334 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | 3480020,3 | 
					
						
							|  |  |  | 3480034,dfdfdfdf | 
					
						
							|  |  |  | 3480038,dfdfdfdf | 
					
						
							|  |  |  | 348003c,dfdfdfdf | 
					
						
							|  |  |  | 3480040,dfdfdfdf | 
					
						
							|  |  |  | 3480044,dfdfdfdf | 
					
						
							|  |  |  | 3480048,dfdfdfdf | 
					
						
							|  |  |  | 348004c,dfdfdfdf | 
					
						
							|  |  |  | 3480050,dfdfdfdf | 
					
						
							|  |  |  | 3480054,dfdfdfdf | 
					
						
							|  |  |  | 3480058,dfdfdfdf | 
					
						
							|  |  |  | 348005c,dfdfdfdf | 
					
						
							|  |  |  | 3480060,dfdfdfdf | 
					
						
							|  |  |  | 3480064,dfdfdfdf | 
					
						
							|  |  |  | 3480068,dfdfdfdf | 
					
						
							|  |  |  | 348006c,dfdfdfdf | 
					
						
							|  |  |  | 3480070,dfdfdfdf | 
					
						
							|  |  |  | 3480074,dfdfdfdf | 
					
						
							|  |  |  | 3480078,dfdfdfdf | 
					
						
							|  |  |  | 348007c,dfdfdfdf | 
					
						
							|  |  |  | 3480080,dfdfdfdf | 
					
						
							|  |  |  | 3480084,dfdfdfdf | 
					
						
							|  |  |  | 3480088,dfdfdfdf | 
					
						
							|  |  |  | 348008c,dfdfdfdf | 
					
						
							|  |  |  | 3480090,dfdfdfdf | 
					
						
							|  |  |  | 3480094,dfdfdfdf | 
					
						
							|  |  |  | 3480098,dfdfdfdf | 
					
						
							|  |  |  | 348009c,dfdfdfdf | 
					
						
							|  |  |  | 34800a0,dfdfdfdf | 
					
						
							|  |  |  | 34800a4,dfdfdfdf | 
					
						
							|  |  |  | 34800a8,dfdfdfdf | 
					
						
							|  |  |  | 34800ac,dfdfdfdf | 
					
						
							|  |  |  | 34800b0,dfdfdfdf | 
					
						
							|  |  |  | 34800b4,dfdfdfdf | 
					
						
							|  |  |  | 34800b8,dfdfdfdf | 
					
						
							|  |  |  | 34800bc,dfdfdfdf | 
					
						
							|  |  |  | 34800c0,dfdfdfdf | 
					
						
							|  |  |  | 34800c4,dfdfdfdf | 
					
						
							|  |  |  | 34800c8,dfdfdfdf | 
					
						
							|  |  |  | 34800cc,dfdfdfdf | 
					
						
							|  |  |  | 34800d0,dfdfdfdf | 
					
						
							|  |  |  | 34800d4,dfdfdfdf | 
					
						
							|  |  |  | 34800d8,dfdfdfdf | 
					
						
							|  |  |  | 34800dc,dfdfdfdf | 
					
						
							|  |  |  | 34800e0,dfdfdfdf | 
					
						
							|  |  |  | 34800e4,dfdfdfdf | 
					
						
							|  |  |  | 34800e8,dfdfdfdf | 
					
						
							|  |  |  | 34800ec,dfdfdfdf | 
					
						
							|  |  |  | 34800f0,dfdfdfdf | 
					
						
							|  |  |  | 34800f4,dfdfdfdf | 
					
						
							|  |  |  | 34800f8,dfdfdfdf | 
					
						
							|  |  |  | 34800fc,dfdfdfdf | 
					
						
							|  |  |  | 3480100,dfdfdfdf | 
					
						
							|  |  |  | 3480104,dfdfdfdf | 
					
						
							|  |  |  | 3480108,dfdfdfdf | 
					
						
							|  |  |  | 348010c,dfdfdfdf | 
					
						
							|  |  |  | 3480110,dfdfdfdf | 
					
						
							|  |  |  | 3480114,dfdfdfdf | 
					
						
							|  |  |  | 3480118,dfdfdfdf | 
					
						
							|  |  |  | 348011c,dfdfdfdf | 
					
						
							|  |  |  | 3480120,dfdfdfdf | 
					
						
							|  |  |  | 3480124,dfdfdfdf | 
					
						
							|  |  |  | 3480128,dfdfdfdf | 
					
						
							|  |  |  | 348012c,dfdfdfdf | 
					
						
							|  |  |  | 3480130,dfdfdfdf | 
					
						
							|  |  |  | 3480134,dfdfdfdf | 
					
						
							|  |  |  | 3480138,dfdfdfdf | 
					
						
							|  |  |  | 348013c,dfdfdfdf | 
					
						
							|  |  |  | 3480140,dfdfdfdf | 
					
						
							|  |  |  | 3480144,dfdfdfdf | 
					
						
							|  |  |  | 3480148,dfdfdfdf | 
					
						
							|  |  |  | 348014c,dfdfdfdf | 
					
						
							|  |  |  | 3480150,dfdfdfdf | 
					
						
							|  |  |  | 3480154,dfdfdfdf | 
					
						
							|  |  |  | 3480158,dfdfdfdf | 
					
						
							|  |  |  | 348015c,dfdfdfdf | 
					
						
							|  |  |  | 3480160,dfdfdfdf | 
					
						
							|  |  |  | 3480164,dfdfdfdf | 
					
						
							|  |  |  | 3480168,dfdfdfdf | 
					
						
							|  |  |  | 348016c,dfdfdfdf | 
					
						
							|  |  |  | 3480170,dfdfdfdf | 
					
						
							|  |  |  | 3480174,dfdfdfdf | 
					
						
							|  |  |  | 3480178,dfdfdfdf | 
					
						
							|  |  |  | 348017c,dfdfdfdf | 
					
						
							|  |  |  | 3480180,dfdfdfdf | 
					
						
							|  |  |  | 3480184,dfdfdfdf | 
					
						
							|  |  |  | 3480188,dfdfdfdf | 
					
						
							|  |  |  | 348018c,dfdfdfdf | 
					
						
							|  |  |  | 3480190,dfdfdfdf | 
					
						
							|  |  |  | 3480194,dfdfdfdf | 
					
						
							|  |  |  | 3480198,dfdfdfdf | 
					
						
							|  |  |  | 348019c,dfdfdfdf | 
					
						
							|  |  |  | 34801a0,dfdfdfdf | 
					
						
							|  |  |  | 34801a4,dfdfdfdf | 
					
						
							|  |  |  | 34801a8,dfdfdfdf | 
					
						
							|  |  |  | 34801ac,dfdfdfdf | 
					
						
							|  |  |  | 34801b0,dfdfdfdf | 
					
						
							|  |  |  | 34801b4,dfdfdfdf | 
					
						
							|  |  |  | 34801b8,dfdfdfdf | 
					
						
							|  |  |  | 34801bc,dfdfdfdf | 
					
						
							|  |  |  | 34801c0,dfdfdfdf | 
					
						
							|  |  |  | 34801c4,dfdfdfdf | 
					
						
							|  |  |  | 34801c8,dfdfdfdf | 
					
						
							|  |  |  | 34801cc,dfdfdfdf | 
					
						
							|  |  |  | 34801d0,dfdfdfdf | 
					
						
							|  |  |  | 34801d4,dfdfdfdf | 
					
						
							|  |  |  | 34801d8,dfdfdfdf | 
					
						
							|  |  |  | 34801dc,dfdfdfdf | 
					
						
							|  |  |  | 34801e0,dfdfdfdf | 
					
						
							|  |  |  | 34801e4,dfdfdfdf | 
					
						
							|  |  |  | 34801e8,dfdfdfdf | 
					
						
							|  |  |  | 34801ec,dfdfdfdf | 
					
						
							|  |  |  | 34801f0,dfdfdfdf | 
					
						
							|  |  |  | 34801f4,dfdfdfdf | 
					
						
							|  |  |  | 34801f8,dfdfdfdf | 
					
						
							|  |  |  | 34801fc,dfdfdfdf | 
					
						
							|  |  |  | 3480200,dfdfdfdf | 
					
						
							|  |  |  | 3480204,dfdfdfdf | 
					
						
							|  |  |  | 3480208,dfdfdfdf | 
					
						
							|  |  |  | 348020c,dfdfdfdf | 
					
						
							|  |  |  | 3480210,dfdfdfdf | 
					
						
							|  |  |  | 3480214,dfdfdfdf | 
					
						
							|  |  |  | 3480218,dfdfdfdf | 
					
						
							|  |  |  | 348021c,dfdfdfdf | 
					
						
							|  |  |  | 3480220,dfdfdfdf | 
					
						
							|  |  |  | 3480224,dfdfdfdf | 
					
						
							|  |  |  | 3480228,dfdfdfdf | 
					
						
							|  |  |  | 348022c,dfdfdfdf | 
					
						
							|  |  |  | 3480230,dfdfdfdf | 
					
						
							|  |  |  | 3480234,dfdfdfdf | 
					
						
							|  |  |  | 3480238,dfdfdfdf | 
					
						
							|  |  |  | 348023c,dfdfdfdf | 
					
						
							|  |  |  | 3480240,dfdfdfdf | 
					
						
							|  |  |  | 3480244,dfdfdfdf | 
					
						
							|  |  |  | 3480248,dfdfdfdf | 
					
						
							|  |  |  | 348024c,dfdfdfdf | 
					
						
							|  |  |  | 3480250,dfdfdfdf | 
					
						
							|  |  |  | 3480254,dfdfdfdf | 
					
						
							|  |  |  | 3480258,dfdfdfdf | 
					
						
							|  |  |  | 348025c,dfdfdfdf | 
					
						
							|  |  |  | 3480260,dfdfdfdf | 
					
						
							|  |  |  | 3480264,dfdfdfdf | 
					
						
							|  |  |  | 3480268,dfdfdfdf | 
					
						
							|  |  |  | 348026c,dfdfdfdf | 
					
						
							|  |  |  | 3480270,dfdfdfdf | 
					
						
							|  |  |  | 3480274,dfdfdfdf | 
					
						
							|  |  |  | 3480278,dfdfdfdf | 
					
						
							|  |  |  | 348027c,dfdfdfdf | 
					
						
							|  |  |  | 3480280,dfdfdfdf | 
					
						
							|  |  |  | 3480284,dfdfdfdf | 
					
						
							|  |  |  | 3480288,dfdfdfdf | 
					
						
							|  |  |  | 348028c,dfdfdfdf | 
					
						
							|  |  |  | 3480290,dfdfdfdf | 
					
						
							|  |  |  | 3480294,dfdfdfdf | 
					
						
							|  |  |  | 3480298,dfdfdfdf | 
					
						
							|  |  |  | 348029c,dfdfdfdf | 
					
						
							|  |  |  | 34802a0,dfdfdfdf | 
					
						
							|  |  |  | 34802a4,dfdfdfdf | 
					
						
							|  |  |  | 34802a8,dfdfdfdf | 
					
						
							|  |  |  | 34802ac,dfdfdfdf | 
					
						
							|  |  |  | 34802b0,dfdfdfdf | 
					
						
							|  |  |  | 34802b4,dfdfdfdf | 
					
						
							|  |  |  | 34802b8,dfdfdfdf | 
					
						
							|  |  |  | 34802bc,dfdfdfdf | 
					
						
							|  |  |  | 34802c0,dfdfdfdf | 
					
						
							|  |  |  | 34802c4,dfdfdfdf | 
					
						
							|  |  |  | 34802c8,dfdfdfdf | 
					
						
							|  |  |  | 34802cc,dfdfdfdf | 
					
						
							|  |  |  | 34802d0,dfdfdfdf | 
					
						
							|  |  |  | 34802d4,dfdfdfdf | 
					
						
							|  |  |  | 34802d8,dfdfdfdf | 
					
						
							|  |  |  | 34802dc,dfdfdfdf | 
					
						
							|  |  |  | 34802e0,dfdfdfdf | 
					
						
							|  |  |  | 34802e4,dfdfdfdf | 
					
						
							|  |  |  | 34802e8,dfdfdfdf | 
					
						
							|  |  |  | 34802ec,dfdfdfdf | 
					
						
							|  |  |  | 34802f0,dfdfdfdf | 
					
						
							|  |  |  | 34802f4,dfdfdfdf | 
					
						
							|  |  |  | 34802f8,dfdfdfdf | 
					
						
							|  |  |  | 34802fc,dfdfdfdf | 
					
						
							|  |  |  | 3480300,dfdfdfdf | 
					
						
							|  |  |  | 3480304,dfdfdfdf | 
					
						
							|  |  |  | 3480308,dfdfdfdf | 
					
						
							|  |  |  | 348030c,dfdfdfdf | 
					
						
							|  |  |  | 3480310,dfdfdfdf | 
					
						
							|  |  |  | 3480314,dfdfdfdf | 
					
						
							|  |  |  | 3480318,dfdfdfdf | 
					
						
							|  |  |  | 348031c,dfdfdfdf | 
					
						
							|  |  |  | 3480320,dfdfdfdf | 
					
						
							|  |  |  | 3480324,dfdfdfdf | 
					
						
							|  |  |  | 3480328,dfdfdfdf | 
					
						
							|  |  |  | 348032c,dfdfdfdf | 
					
						
							|  |  |  | 3480330,dfdfdfdf | 
					
						
							|  |  |  | 3480334,dfdfdfdf | 
					
						
							|  |  |  | 3480338,dfdfdfdf | 
					
						
							|  |  |  | 348033c,dfdfdfdf | 
					
						
							|  |  |  | 3480340,dfdfdfdf | 
					
						
							|  |  |  | 3480344,dfdfdfdf | 
					
						
							|  |  |  | 3480348,dfdfdfdf | 
					
						
							|  |  |  | 348034c,dfdfdfdf | 
					
						
							|  |  |  | 3480350,dfdfdfdf | 
					
						
							|  |  |  | 3480354,dfdfdfdf | 
					
						
							|  |  |  | 3480358,dfdfdfdf | 
					
						
							|  |  |  | 348035c,dfdfdfdf | 
					
						
							|  |  |  | 3480360,dfdfdfdf | 
					
						
							|  |  |  | 3480364,dfdfdfdf | 
					
						
							|  |  |  | 3480368,dfdfdfdf | 
					
						
							|  |  |  | 348036c,dfdfdfdf | 
					
						
							|  |  |  | 3480370,dfdfdfdf | 
					
						
							|  |  |  | 3480374,dfdfdfdf | 
					
						
							|  |  |  | 3480378,dfdfdfdf | 
					
						
							|  |  |  | 348037c,dfdfdfdf | 
					
						
							|  |  |  | 3480380,dfdfdfdf | 
					
						
							|  |  |  | 3480384,dfdfdfdf | 
					
						
							|  |  |  | 3480388,dfdfdfdf | 
					
						
							|  |  |  | 348038c,dfdfdfdf | 
					
						
							|  |  |  | 3480390,dfdfdfdf | 
					
						
							|  |  |  | 3480394,dfdfdfdf | 
					
						
							|  |  |  | 3480398,dfdfdfdf | 
					
						
							|  |  |  | 348039c,dfdfdfdf | 
					
						
							|  |  |  | 34803a0,dfdfdfdf | 
					
						
							|  |  |  | 34803a4,dfdfdfdf | 
					
						
							|  |  |  | 34803a8,dfdfdfdf | 
					
						
							|  |  |  | 34803ac,dfdfdfdf | 
					
						
							|  |  |  | 34803b0,dfdfdfdf | 
					
						
							|  |  |  | 34803b4,dfdfdfdf | 
					
						
							|  |  |  | 34803b8,dfdfdfdf | 
					
						
							|  |  |  | 34803bc,dfdfdfdf | 
					
						
							|  |  |  | 34803c0,dfdfdfdf | 
					
						
							|  |  |  | 34803c4,dfdfdfdf | 
					
						
							|  |  |  | 34803c8,dfdfdfdf | 
					
						
							|  |  |  | 34803cc,dfdfdfdf | 
					
						
							|  |  |  | 34803d0,dfdfdfdf | 
					
						
							|  |  |  | 34803d4,dfdfdfdf | 
					
						
							|  |  |  | 34803d8,dfdfdfdf | 
					
						
							|  |  |  | 34803dc,dfdfdfdf | 
					
						
							|  |  |  | 34803e0,dfdfdfdf | 
					
						
							|  |  |  | 34803e4,dfdfdfdf | 
					
						
							|  |  |  | 34803e8,dfdfdfdf | 
					
						
							|  |  |  | 34803ec,dfdfdfdf | 
					
						
							|  |  |  | 34803f0,dfdfdfdf | 
					
						
							|  |  |  | 34803f4,dfdfdfdf | 
					
						
							|  |  |  | 34803f8,dfdfdfdf | 
					
						
							|  |  |  | 34803fc,dfdfdfdf | 
					
						
							|  |  |  | 3480400,dfdfdfdf | 
					
						
							|  |  |  | 3480404,dfdfdfdf | 
					
						
							|  |  |  | 3480408,dfdfdfdf | 
					
						
							|  |  |  | 348040c,dfdfdfdf | 
					
						
							|  |  |  | 3480410,dfdfdfdf | 
					
						
							|  |  |  | 3480414,dfdfdfdf | 
					
						
							|  |  |  | 3480418,dfdfdfdf | 
					
						
							|  |  |  | 348041c,dfdfdfdf | 
					
						
							|  |  |  | 3480420,dfdfdfdf | 
					
						
							|  |  |  | 3480424,dfdfdfdf | 
					
						
							|  |  |  | 3480428,dfdfdfdf | 
					
						
							|  |  |  | 348042c,dfdfdfdf | 
					
						
							|  |  |  | 3480430,dfdfdfdf | 
					
						
							|  |  |  | 3480434,dfdfdfdf | 
					
						
							|  |  |  | 3480438,dfdfdfdf | 
					
						
							|  |  |  | 348043c,dfdfdfdf | 
					
						
							|  |  |  | 3480440,dfdfdfdf | 
					
						
							|  |  |  | 3480444,dfdfdfdf | 
					
						
							|  |  |  | 3480448,dfdfdfdf | 
					
						
							|  |  |  | 348044c,dfdfdfdf | 
					
						
							|  |  |  | 3480450,dfdfdfdf | 
					
						
							|  |  |  | 3480454,dfdfdfdf | 
					
						
							|  |  |  | 3480458,dfdfdfdf | 
					
						
							|  |  |  | 348045c,dfdfdfdf | 
					
						
							|  |  |  | 3480460,dfdfdfdf | 
					
						
							|  |  |  | 3480464,dfdfdfdf | 
					
						
							|  |  |  | 3480468,dfdfdfdf | 
					
						
							|  |  |  | 348046c,dfdfdfdf | 
					
						
							|  |  |  | 3480470,dfdfdfdf | 
					
						
							|  |  |  | 3480474,dfdfdfdf | 
					
						
							|  |  |  | 3480478,dfdfdfdf | 
					
						
							|  |  |  | 348047c,dfdfdfdf | 
					
						
							|  |  |  | 3480480,dfdfdfdf | 
					
						
							|  |  |  | 3480484,dfdfdfdf | 
					
						
							|  |  |  | 3480488,dfdfdfdf | 
					
						
							|  |  |  | 348048c,dfdfdfdf | 
					
						
							|  |  |  | 3480490,dfdfdfdf | 
					
						
							|  |  |  | 3480494,dfdfdfdf | 
					
						
							|  |  |  | 3480498,dfdfdfdf | 
					
						
							|  |  |  | 348049c,dfdfdfdf | 
					
						
							|  |  |  | 34804a0,dfdfdfdf | 
					
						
							|  |  |  | 34804a4,dfdfdfdf | 
					
						
							|  |  |  | 34804a8,dfdfdfdf | 
					
						
							|  |  |  | 34804ac,dfdfdfdf | 
					
						
							|  |  |  | 34804b0,dfdfdfdf | 
					
						
							|  |  |  | 34804b4,dfdfdfdf | 
					
						
							|  |  |  | 34804b8,dfdfdfdf | 
					
						
							|  |  |  | 34804bc,dfdfdfdf | 
					
						
							|  |  |  | 34804c0,dfdfdfdf | 
					
						
							|  |  |  | 34804c4,dfdfdfdf | 
					
						
							|  |  |  | 34804c8,dfdfdfdf | 
					
						
							|  |  |  | 34804cc,dfdfdfdf | 
					
						
							|  |  |  | 34804d0,dfdfdfdf | 
					
						
							|  |  |  | 34804d4,dfdfdfdf | 
					
						
							|  |  |  | 34804d8,dfdfdfdf | 
					
						
							|  |  |  | 34804dc,dfdfdfdf | 
					
						
							|  |  |  | 34804e0,dfdfdfdf | 
					
						
							|  |  |  | 34804e4,dfdfdfdf | 
					
						
							|  |  |  | 34804e8,dfdfdfdf | 
					
						
							|  |  |  | 34804ec,dfdfdfdf | 
					
						
							|  |  |  | 34804f0,dfdfdfdf | 
					
						
							|  |  |  | 34804f4,dfdfdfdf | 
					
						
							|  |  |  | 34804f8,dfdfdfdf | 
					
						
							|  |  |  | 34804fc,dfdfdfdf | 
					
						
							|  |  |  | 3480500,dfdfdfdf | 
					
						
							|  |  |  | 3480504,dfdfdfdf | 
					
						
							|  |  |  | 3480508,dfdfdfdf | 
					
						
							|  |  |  | 348050c,dfdfdfdf | 
					
						
							|  |  |  | 3480510,dfdfdfdf | 
					
						
							|  |  |  | 3480514,dfdfdfdf | 
					
						
							|  |  |  | 3480518,dfdfdfdf | 
					
						
							|  |  |  | 348051c,dfdfdfdf | 
					
						
							|  |  |  | 3480520,dfdfdfdf | 
					
						
							|  |  |  | 3480524,dfdfdfdf | 
					
						
							|  |  |  | 3480528,dfdfdfdf | 
					
						
							|  |  |  | 348052c,dfdfdfdf | 
					
						
							|  |  |  | 3480530,dfdfdfdf | 
					
						
							|  |  |  | 3480534,dfdfdfdf | 
					
						
							|  |  |  | 3480538,dfdfdfdf | 
					
						
							|  |  |  | 348053c,dfdfdfdf | 
					
						
							|  |  |  | 3480540,dfdfdfdf | 
					
						
							|  |  |  | 3480544,dfdfdfdf | 
					
						
							|  |  |  | 3480548,dfdfdfdf | 
					
						
							|  |  |  | 348054c,dfdfdfdf | 
					
						
							|  |  |  | 3480550,dfdfdfdf | 
					
						
							|  |  |  | 3480554,dfdfdfdf | 
					
						
							|  |  |  | 3480558,dfdfdfdf | 
					
						
							|  |  |  | 348055c,dfdfdfdf | 
					
						
							|  |  |  | 3480560,dfdfdfdf | 
					
						
							|  |  |  | 3480564,dfdfdfdf | 
					
						
							|  |  |  | 3480568,dfdfdfdf | 
					
						
							|  |  |  | 348056c,dfdfdfdf | 
					
						
							|  |  |  | 3480570,dfdfdfdf | 
					
						
							|  |  |  | 3480574,dfdfdfdf | 
					
						
							|  |  |  | 3480578,dfdfdfdf | 
					
						
							|  |  |  | 348057c,dfdfdfdf | 
					
						
							|  |  |  | 3480580,dfdfdfdf | 
					
						
							|  |  |  | 3480584,dfdfdfdf | 
					
						
							|  |  |  | 3480588,dfdfdfdf | 
					
						
							|  |  |  | 348058c,dfdfdfdf | 
					
						
							|  |  |  | 3480590,dfdfdfdf | 
					
						
							|  |  |  | 3480594,dfdfdfdf | 
					
						
							|  |  |  | 3480598,dfdfdfdf | 
					
						
							|  |  |  | 348059c,dfdfdfdf | 
					
						
							|  |  |  | 34805a0,dfdfdfdf | 
					
						
							|  |  |  | 34805a4,dfdfdfdf | 
					
						
							|  |  |  | 34805a8,dfdfdfdf | 
					
						
							|  |  |  | 34805ac,dfdfdfdf | 
					
						
							|  |  |  | 34805b0,dfdfdfdf | 
					
						
							|  |  |  | 34805b4,dfdfdfdf | 
					
						
							|  |  |  | 34805b8,dfdfdfdf | 
					
						
							|  |  |  | 34805bc,dfdfdfdf | 
					
						
							|  |  |  | 34805c0,dfdfdfdf | 
					
						
							|  |  |  | 34805c4,dfdfdfdf | 
					
						
							|  |  |  | 34805c8,dfdfdfdf | 
					
						
							|  |  |  | 34805cc,dfdfdfdf | 
					
						
							|  |  |  | 34805d0,dfdfdfdf | 
					
						
							|  |  |  | 34805d4,dfdfdfdf | 
					
						
							|  |  |  | 34805d8,dfdfdfdf | 
					
						
							|  |  |  | 34805dc,dfdfdfdf | 
					
						
							|  |  |  | 34805e0,dfdfdfdf | 
					
						
							|  |  |  | 34805e4,dfdfdfdf | 
					
						
							|  |  |  | 34805e8,dfdfdfdf | 
					
						
							|  |  |  | 34805ec,dfdfdfdf | 
					
						
							|  |  |  | 34805f0,dfdfdfdf | 
					
						
							|  |  |  | 34805f4,dfdfdfdf | 
					
						
							|  |  |  | 34805f8,dfdfdfdf | 
					
						
							|  |  |  | 34805fc,dfdfdfdf | 
					
						
							|  |  |  | 3480600,dfdfdfdf | 
					
						
							|  |  |  | 3480604,dfdfdfdf | 
					
						
							|  |  |  | 3480608,dfdfdfdf | 
					
						
							|  |  |  | 348060c,dfdfdfdf | 
					
						
							|  |  |  | 3480610,dfdfdfdf | 
					
						
							|  |  |  | 3480614,dfdfdfdf | 
					
						
							|  |  |  | 3480618,dfdfdfdf | 
					
						
							|  |  |  | 348061c,dfdfdfdf | 
					
						
							|  |  |  | 3480620,dfdfdfdf | 
					
						
							|  |  |  | 3480624,dfdfdfdf | 
					
						
							|  |  |  | 3480628,dfdfdfdf | 
					
						
							|  |  |  | 348062c,dfdfdfdf | 
					
						
							|  |  |  | 3480630,dfdfdfdf | 
					
						
							|  |  |  | 3480634,dfdfdfdf | 
					
						
							|  |  |  | 3480638,dfdfdfdf | 
					
						
							|  |  |  | 348063c,dfdfdfdf | 
					
						
							|  |  |  | 3480640,dfdfdfdf | 
					
						
							|  |  |  | 3480644,dfdfdfdf | 
					
						
							|  |  |  | 3480648,dfdfdfdf | 
					
						
							|  |  |  | 348064c,dfdfdfdf | 
					
						
							|  |  |  | 3480650,dfdfdfdf | 
					
						
							|  |  |  | 3480654,dfdfdfdf | 
					
						
							|  |  |  | 3480658,dfdfdfdf | 
					
						
							|  |  |  | 348065c,dfdfdfdf | 
					
						
							|  |  |  | 3480660,dfdfdfdf | 
					
						
							|  |  |  | 3480664,dfdfdfdf | 
					
						
							|  |  |  | 3480668,dfdfdfdf | 
					
						
							|  |  |  | 348066c,dfdfdfdf | 
					
						
							|  |  |  | 3480670,dfdfdfdf | 
					
						
							|  |  |  | 3480674,dfdfdfdf | 
					
						
							|  |  |  | 3480678,dfdfdfdf | 
					
						
							|  |  |  | 348067c,dfdfdfdf | 
					
						
							|  |  |  | 3480680,dfdfdfdf | 
					
						
							|  |  |  | 3480684,dfdfdfdf | 
					
						
							|  |  |  | 3480688,dfdfdfdf | 
					
						
							|  |  |  | 348068c,dfdfdfdf | 
					
						
							|  |  |  | 3480690,dfdfdfdf | 
					
						
							|  |  |  | 3480694,dfdfdfdf | 
					
						
							|  |  |  | 3480698,dfdfdfdf | 
					
						
							|  |  |  | 348069c,dfdfdfdf | 
					
						
							|  |  |  | 34806a0,dfdfdfdf | 
					
						
							|  |  |  | 34806a4,dfdfdfdf | 
					
						
							|  |  |  | 34806a8,dfdfdfdf | 
					
						
							|  |  |  | 34806ac,dfdfdfdf | 
					
						
							|  |  |  | 34806b0,dfdfdfdf | 
					
						
							|  |  |  | 34806b4,dfdfdfdf | 
					
						
							|  |  |  | 34806b8,dfdfdfdf | 
					
						
							|  |  |  | 34806bc,dfdfdfdf | 
					
						
							|  |  |  | 34806c0,dfdfdfdf | 
					
						
							|  |  |  | 34806c4,dfdfdfdf | 
					
						
							|  |  |  | 34806c8,dfdfdfdf | 
					
						
							|  |  |  | 34806cc,dfdfdfdf | 
					
						
							|  |  |  | 34806d0,dfdfdfdf | 
					
						
							|  |  |  | 34806d4,dfdfdfdf | 
					
						
							|  |  |  | 34806d8,dfdfdfdf | 
					
						
							|  |  |  | 34806dc,dfdfdfdf | 
					
						
							|  |  |  | 34806e0,dfdfdfdf | 
					
						
							|  |  |  | 34806e4,dfdfdfdf | 
					
						
							|  |  |  | 34806e8,dfdfdfdf | 
					
						
							|  |  |  | 34806ec,dfdfdfdf | 
					
						
							|  |  |  | 34806f0,dfdfdfdf | 
					
						
							|  |  |  | 34806f4,dfdfdfdf | 
					
						
							|  |  |  | 34806f8,dfdfdfdf | 
					
						
							|  |  |  | 34806fc,dfdfdfdf | 
					
						
							|  |  |  | 3480700,dfdfdfdf | 
					
						
							|  |  |  | 3480704,dfdfdfdf | 
					
						
							|  |  |  | 3480708,dfdfdfdf | 
					
						
							|  |  |  | 348070c,dfdfdfdf | 
					
						
							|  |  |  | 3480710,dfdfdfdf | 
					
						
							|  |  |  | 3480714,dfdfdfdf | 
					
						
							|  |  |  | 3480718,dfdfdfdf | 
					
						
							|  |  |  | 348071c,dfdfdfdf | 
					
						
							|  |  |  | 3480720,dfdfdfdf | 
					
						
							|  |  |  | 3480724,dfdfdfdf | 
					
						
							|  |  |  | 3480728,dfdfdfdf | 
					
						
							|  |  |  | 348072c,dfdfdfdf | 
					
						
							|  |  |  | 3480730,dfdfdfdf | 
					
						
							|  |  |  | 3480734,dfdfdfdf | 
					
						
							|  |  |  | 3480738,dfdfdfdf | 
					
						
							|  |  |  | 348073c,dfdfdfdf | 
					
						
							|  |  |  | 3480740,dfdfdfdf | 
					
						
							|  |  |  | 3480744,dfdfdfdf | 
					
						
							|  |  |  | 3480748,dfdfdfdf | 
					
						
							|  |  |  | 348074c,dfdfdfdf | 
					
						
							|  |  |  | 3480750,dfdfdfdf | 
					
						
							|  |  |  | 3480754,dfdfdfdf | 
					
						
							|  |  |  | 3480758,dfdfdfdf | 
					
						
							|  |  |  | 348075c,dfdfdfdf | 
					
						
							|  |  |  | 3480760,dfdfdfdf | 
					
						
							|  |  |  | 3480764,dfdfdfdf | 
					
						
							|  |  |  | 3480768,dfdfdfdf | 
					
						
							|  |  |  | 348076c,dfdfdfdf | 
					
						
							|  |  |  | 3480770,dfdfdfdf | 
					
						
							|  |  |  | 3480774,dfdfdfdf | 
					
						
							|  |  |  | 3480778,dfdfdfdf | 
					
						
							|  |  |  | 348077c,dfdfdfdf | 
					
						
							|  |  |  | 3480780,dfdfdfdf | 
					
						
							|  |  |  | 3480784,dfdfdfdf | 
					
						
							|  |  |  | 3480788,dfdfdfdf | 
					
						
							|  |  |  | 348078c,dfdfdfdf | 
					
						
							|  |  |  | 3480790,dfdfdfdf | 
					
						
							|  |  |  | 3480794,dfdfdfdf | 
					
						
							|  |  |  | 3480798,dfdfdfdf | 
					
						
							|  |  |  | 348079c,dfdfdfdf | 
					
						
							|  |  |  | 34807a0,dfdfdfdf | 
					
						
							|  |  |  | 34807a4,dfdfdfdf | 
					
						
							|  |  |  | 34807a8,dfdfdfdf | 
					
						
							|  |  |  | 34807ac,dfdfdfdf | 
					
						
							|  |  |  | 34807b0,dfdfdfdf | 
					
						
							|  |  |  | 34807b4,dfdfdfdf | 
					
						
							|  |  |  | 34807b8,dfdfdfdf | 
					
						
							|  |  |  | 34807bc,dfdfdfdf | 
					
						
							|  |  |  | 34807c0,dfdfdfdf | 
					
						
							|  |  |  | 34807c4,dfdfdfdf | 
					
						
							|  |  |  | 34807c8,dfdfdfdf | 
					
						
							|  |  |  | 34807cc,dfdfdfdf | 
					
						
							|  |  |  | 34807d0,dfdfdfdf | 
					
						
							|  |  |  | 34807d4,dfdfdfdf | 
					
						
							|  |  |  | 34807d8,dfdfdfdf | 
					
						
							|  |  |  | 34807dc,dfdfdfdf | 
					
						
							|  |  |  | 34807e0,dfdfdfdf | 
					
						
							|  |  |  | 34807e4,dfdfdfdf | 
					
						
							|  |  |  | 34807e8,dfdfdfdf | 
					
						
							|  |  |  | 34807ec,dfdfdfdf | 
					
						
							|  |  |  | 34807f0,dfdfdfdf | 
					
						
							|  |  |  | 34807f4,dfdfdfdf | 
					
						
							|  |  |  | 34807f8,dfdfdfdf | 
					
						
							|  |  |  | 34807fc,dfdfdfdf | 
					
						
							|  |  |  | 3480800,dfdfdfdf | 
					
						
							|  |  |  | 3480804,dfdfdfdf | 
					
						
							|  |  |  | 3480808,dfdfdfdf | 
					
						
							|  |  |  | 348080c,dfdfdfdf | 
					
						
							|  |  |  | 3480810,dfdfdfdf | 
					
						
							|  |  |  | 3480814,dfdfdfdf | 
					
						
							|  |  |  | 3480818,dfdfdfdf | 
					
						
							|  |  |  | 348081c,dfdfdfdf | 
					
						
							|  |  |  | 3480820,dfdfdfdf | 
					
						
							|  |  |  | 3480824,dfdfdfdf | 
					
						
							|  |  |  | 3480828,dfdfdfdf | 
					
						
							|  |  |  | 348082c,dfdfdfdf | 
					
						
							|  |  |  | 3480830,dfdfdfdf | 
					
						
							|  |  |  | 3480844,1f073fd8 | 
					
						
							|  |  |  | 3480848,ff | 
					
						
							|  |  |  | 348084c,ff | 
					
						
							|  |  |  | 3480850,460032 | 
					
						
							|  |  |  | 3480854,5a005a | 
					
						
							|  |  |  | 3480858,ff0000 | 
					
						
							|  |  |  | 348085c,960000 | 
					
						
							|  |  |  | 3480860,ff00a0 | 
					
						
							|  |  |  | 3480868,5000c8 | 
					
						
							|  |  |  | 348086c,50 | 
					
						
							|  |  |  | 3480870,ff0050 | 
					
						
							|  |  |  | 3480874,9600ff | 
					
						
							|  |  |  | 3480878,ff00ff | 
					
						
							|  |  |  | 348087c,32ffff | 
					
						
							|  |  |  | 3480880,64ffff64 | 
					
						
							|  |  |  | 3480884,fa0000fa | 
					
						
							|  |  |  | 3480888,100 | 
					
						
							|  |  |  | 3480cd0,640000 | 
					
						
							|  |  |  | 3480cd4,100 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3480ce8,10000 | 
					
						
							|  |  |  | 3480cf8,27bdffe8 | 
					
						
							|  |  |  | 3480cfc,afbf0010 | 
					
						
							|  |  |  | 3480d00,c101fac | 
					
						
							|  |  |  | 3480d08,3c028012 | 
					
						
							|  |  |  | 3480d0c,2442d2a0 | 
					
						
							|  |  |  | 3480d10,240e0140 | 
					
						
							|  |  |  | 3480d14,3c018010 | 
					
						
							|  |  |  | 3480d18,ac2ee500 | 
					
						
							|  |  |  | 3480d1c,240f00f0 | 
					
						
							|  |  |  | 3480d20,8fbf0010 | 
					
						
							|  |  |  | 3480d24,3e00008 | 
					
						
							|  |  |  | 3480d28,27bd0018 | 
					
						
							|  |  |  | 3480d2c,3c088040 | 
					
						
							|  |  |  | 3480d30,ac4815d4 | 
					
						
							|  |  |  | 3480d34,3e00008 | 
					
						
							|  |  |  | 3480d38,340215c0 | 
					
						
							|  |  |  | 3480d3c,308400ff | 
					
						
							|  |  |  | 3480d40,3c088012 | 
					
						
							|  |  |  | 3480d44,2508a5d0 | 
					
						
							|  |  |  | 3480d48,3401008c | 
					
						
							|  |  |  | 3480d4c,10810016 | 
					
						
							|  |  |  | 3480d50,91020075 | 
					
						
							|  |  |  | 3480d54,3401008d | 
					
						
							|  |  |  | 3480d58,10810013 | 
					
						
							|  |  |  | 3480d5c,91020075 | 
					
						
							|  |  |  | 3480d60,10800011 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3480d64,91020074 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3480d68,3401008a | 
					
						
							|  |  |  | 3480d6c,1081000e | 
					
						
							|  |  |  | 3480d70,91020074 | 
					
						
							|  |  |  | 3480d74,3401008b | 
					
						
							|  |  |  | 3480d78,1081000b | 
					
						
							|  |  |  | 3480d7c,91020074 | 
					
						
							|  |  |  | 3480d80,34010058 | 
					
						
							|  |  |  | 3480d84,10810008 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3480d88,34020000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3480d8c,34010078 | 
					
						
							|  |  |  | 3480d90,10810005 | 
					
						
							|  |  |  | 3480d94,34020000 | 
					
						
							|  |  |  | 3480d98,34010079 | 
					
						
							|  |  |  | 3480d9c,10810002 | 
					
						
							|  |  |  | 3480da0,34020000 | 
					
						
							|  |  |  | 3480da4,340200ff | 
					
						
							|  |  |  | 3480da8,3e00008 | 
					
						
							|  |  |  | 3480db0,8fa60030 | 
					
						
							|  |  |  | 3480db4,8100372 | 
					
						
							|  |  |  | 3480db8,84c50004 | 
					
						
							|  |  |  | 3480dbc,8fb9002c | 
					
						
							|  |  |  | 3480dc0,8100372 | 
					
						
							|  |  |  | 3480dc4,87250004 | 
					
						
							|  |  |  | 3480dc8,3c0a8041 | 
					
						
							|  |  |  | 3480dcc,254ab58c | 
					
						
							|  |  |  | 3480dd0,8d4a0000 | 
					
						
							|  |  |  | 3480dd4,11400004 | 
					
						
							|  |  |  | 3480ddc,3c058041 | 
					
						
							|  |  |  | 3480de0,24a5b580 | 
					
						
							|  |  |  | 3480de4,8ca50000 | 
					
						
							|  |  |  | 3480de8,3e00008 | 
					
						
							|  |  |  | 3480df0,3c088041 | 
					
						
							|  |  |  | 3480df4,2508b58c | 
					
						
							|  |  |  | 3480df8,8d080000 | 
					
						
							|  |  |  | 3480dfc,11000004 | 
					
						
							|  |  |  | 3480e04,3c038041 | 
					
						
							|  |  |  | 3480e08,2463b57c | 
					
						
							|  |  |  | 3480e0c,8c630000 | 
					
						
							|  |  |  | 3480e10,30fc3 | 
					
						
							|  |  |  | 3480e14,614026 | 
					
						
							|  |  |  | 3480e18,1014023 | 
					
						
							|  |  |  | 3480e1c,a0880852 | 
					
						
							|  |  |  | 3480e20,3e00008 | 
					
						
							|  |  |  | 3480e28,3c088040 | 
					
						
							|  |  |  | 3480e2c,25080cd6 | 
					
						
							|  |  |  | 3480e30,91080000 | 
					
						
							|  |  |  | 3480e34,1500000c | 
					
						
							|  |  |  | 3480e38,240bffff | 
					
						
							|  |  |  | 3480e3c,3c088041 | 
					
						
							|  |  |  | 3480e40,2508b58c | 
					
						
							|  |  |  | 3480e44,8d080000 | 
					
						
							|  |  |  | 3480e48,11000007 | 
					
						
							|  |  |  | 3480e4c,1405821 | 
					
						
							|  |  |  | 3480e50,3c088041 | 
					
						
							|  |  |  | 3480e54,2508b578 | 
					
						
							|  |  |  | 3480e58,8d080000 | 
					
						
							|  |  |  | 3480e5c,15000002 | 
					
						
							|  |  |  | 3480e60,240bffff | 
					
						
							|  |  |  | 3480e64,340b0001 | 
					
						
							|  |  |  | 3480e68,5600009 | 
					
						
							|  |  |  | 3480e70,27bdffe8 | 
					
						
							|  |  |  | 3480e74,afab0010 | 
					
						
							|  |  |  | 3480e78,afbf0014 | 
					
						
							|  |  |  | 3480e7c,c01c508 | 
					
						
							|  |  |  | 3480e84,8fab0010 | 
					
						
							|  |  |  | 3480e88,8fbf0014 | 
					
						
							|  |  |  | 3480e8c,27bd0018 | 
					
						
							|  |  |  | 3480e90,3e00008 | 
					
						
							|  |  |  | 3480e98,90450003 | 
					
						
							|  |  |  | 3480e9c,3c088041 | 
					
						
							|  |  |  | 3480ea0,2508b58c | 
					
						
							|  |  |  | 3480ea4,8d080000 | 
					
						
							|  |  |  | 3480ea8,11000004 | 
					
						
							|  |  |  | 3480eb0,3c058041 | 
					
						
							|  |  |  | 3480eb4,24a5b584 | 
					
						
							|  |  |  | 3480eb8,8ca50000 | 
					
						
							|  |  |  | 3480ebc,3e00008 | 
					
						
							|  |  |  | 3480ec4,27bdffe8 | 
					
						
							|  |  |  | 3480ec8,afb00010 | 
					
						
							|  |  |  | 3480ecc,afbf0014 | 
					
						
							|  |  |  | 3480ed0,3c088041 | 
					
						
							|  |  |  | 3480ed4,2508b590 | 
					
						
							|  |  |  | 3480ed8,8d080000 | 
					
						
							|  |  |  | 3480edc,31080001 | 
					
						
							|  |  |  | 3480ee0,1500000b | 
					
						
							|  |  |  | 3480ee4,34100041 | 
					
						
							|  |  |  | 3480ee8,3c048041 | 
					
						
							|  |  |  | 3480eec,2484b58c | 
					
						
							|  |  |  | 3480ef0,8c840000 | 
					
						
							|  |  |  | 3480ef4,10800006 | 
					
						
							|  |  |  | 3480ef8,90500000 | 
					
						
							|  |  |  | 3480efc,3c088041 | 
					
						
							|  |  |  | 3480f00,2508b588 | 
					
						
							|  |  |  | 3480f04,8d100000 | 
					
						
							|  |  |  | 3480f08,c101f03 | 
					
						
							|  |  |  | 3480f10,c101abd | 
					
						
							|  |  |  | 3480f18,2002821 | 
					
						
							|  |  |  | 3480f1c,8fb00010 | 
					
						
							|  |  |  | 3480f20,8fbf0014 | 
					
						
							|  |  |  | 3480f24,3e00008 | 
					
						
							|  |  |  | 3480f28,27bd0018 | 
					
						
							|  |  |  | 3480f2c,27bdffe0 | 
					
						
							|  |  |  | 3480f30,afa70010 | 
					
						
							|  |  |  | 3480f34,afa20014 | 
					
						
							|  |  |  | 3480f38,afa30018 | 
					
						
							|  |  |  | 3480f3c,afbf001c | 
					
						
							|  |  |  | 3480f40,c101b2e | 
					
						
							|  |  |  | 3480f44,e02821 | 
					
						
							|  |  |  | 3480f48,8fa70010 | 
					
						
							|  |  |  | 3480f4c,8fa20014 | 
					
						
							|  |  |  | 3480f50,8fa30018 | 
					
						
							|  |  |  | 3480f54,8fbf001c | 
					
						
							|  |  |  | 3480f58,3e00008 | 
					
						
							|  |  |  | 3480f5c,27bd0020 | 
					
						
							|  |  |  | 3480f60,27bdffe8 | 
					
						
							|  |  |  | 3480f64,afbf0010 | 
					
						
							|  |  |  | 3480f68,8c881d2c | 
					
						
							|  |  |  | 3480f6c,34090001 | 
					
						
							|  |  |  | 3480f70,94e00 | 
					
						
							|  |  |  | 3480f74,1091024 | 
					
						
							|  |  |  | 3480f78,10400021 | 
					
						
							|  |  |  | 3480f80,94ca02dc | 
					
						
							|  |  |  | 3480f84,3c0b8012 | 
					
						
							|  |  |  | 3480f88,256ba5d0 | 
					
						
							|  |  |  | 3480f8c,948c00a4 | 
					
						
							|  |  |  | 3480f90,3401003d | 
					
						
							|  |  |  | 3480f94,1181000a | 
					
						
							|  |  |  | 3480f9c,8a6021 | 
					
						
							|  |  |  | 3480fa0,918d1d28 | 
					
						
							|  |  |  | 3480fa4,15a00014 | 
					
						
							|  |  |  | 3480fac,340d0001 | 
					
						
							|  |  |  | 3480fb0,a18d1d28 | 
					
						
							|  |  |  | 3480fb4,254a0013 | 
					
						
							|  |  |  | 3480fb8,1000000a | 
					
						
							|  |  |  | 3480fc0,340c0001 | 
					
						
							|  |  |  | 3480fc4,14c6004 | 
					
						
							|  |  |  | 3480fc8,916d0ef2 | 
					
						
							|  |  |  | 3480fcc,1ac7024 | 
					
						
							|  |  |  | 3480fd0,15c00009 | 
					
						
							|  |  |  | 3480fd8,1ac7025 | 
					
						
							|  |  |  | 3480fdc,a16e0ef2 | 
					
						
							|  |  |  | 3480fe0,254a0010 | 
					
						
							|  |  |  | 3480fe4,1294827 | 
					
						
							|  |  |  | 3480fe8,1094024 | 
					
						
							|  |  |  | 3480fec,ac881d2c | 
					
						
							|  |  |  | 3480ff0,c101a70 | 
					
						
							|  |  |  | 3480ff4,1402021 | 
					
						
							|  |  |  | 3480ff8,c10253a | 
					
						
							|  |  |  | 3481000,8fbf0010 | 
					
						
							|  |  |  | 3481004,34020000 | 
					
						
							|  |  |  | 3481008,3e00008 | 
					
						
							|  |  |  | 348100c,27bd0018 | 
					
						
							|  |  |  | 3481010,27bdffe8 | 
					
						
							|  |  |  | 3481014,afbf0010 | 
					
						
							|  |  |  | 3481018,c101a70 | 
					
						
							|  |  |  | 348101c,20e4ffc6 | 
					
						
							|  |  |  | 3481020,340200ff | 
					
						
							|  |  |  | 3481024,8fbf0010 | 
					
						
							|  |  |  | 3481028,3e00008 | 
					
						
							|  |  |  | 348102c,27bd0018 | 
					
						
							|  |  |  | 3481030,27bdffe0 | 
					
						
							|  |  |  | 3481034,afa10010 | 
					
						
							|  |  |  | 3481038,afa30014 | 
					
						
							|  |  |  | 348103c,afbf0018 | 
					
						
							|  |  |  | 3481040,c101a70 | 
					
						
							|  |  |  | 3481044,34040023 | 
					
						
							|  |  |  | 3481048,8fa10010 | 
					
						
							|  |  |  | 348104c,8fa30014 | 
					
						
							|  |  |  | 3481050,8fbf0018 | 
					
						
							|  |  |  | 3481054,3e00008 | 
					
						
							|  |  |  | 3481058,27bd0020 | 
					
						
							|  |  |  | 348105c,27bdffe0 | 
					
						
							|  |  |  | 3481060,afa60010 | 
					
						
							|  |  |  | 3481064,afa70014 | 
					
						
							|  |  |  | 3481068,afbf0018 | 
					
						
							|  |  |  | 348106c,3c018012 | 
					
						
							|  |  |  | 3481070,2421a5d0 | 
					
						
							|  |  |  | 3481074,80280ede | 
					
						
							|  |  |  | 3481078,35080001 | 
					
						
							|  |  |  | 348107c,a0280ede | 
					
						
							|  |  |  | 3481080,c101a70 | 
					
						
							|  |  |  | 3481084,34040027 | 
					
						
							|  |  |  | 3481088,8fa60010 | 
					
						
							|  |  |  | 348108c,8fa70014 | 
					
						
							|  |  |  | 3481090,8fbf0018 | 
					
						
							|  |  |  | 3481094,3e00008 | 
					
						
							|  |  |  | 3481098,27bd0020 | 
					
						
							|  |  |  | 348109c,27bdffe8 | 
					
						
							|  |  |  | 34810a0,afa30010 | 
					
						
							|  |  |  | 34810a4,afbf0014 | 
					
						
							|  |  |  | 34810a8,3c018012 | 
					
						
							|  |  |  | 34810ac,2421a5d0 | 
					
						
							|  |  |  | 34810b0,80280ede | 
					
						
							|  |  |  | 34810b4,35080004 | 
					
						
							|  |  |  | 34810b8,a0280ede | 
					
						
							|  |  |  | 34810bc,3c188040 | 
					
						
							|  |  |  | 34810c0,83180cd8 | 
					
						
							|  |  |  | 34810c4,13000003 | 
					
						
							|  |  |  | 34810cc,c101a70 | 
					
						
							|  |  |  | 34810d0,34040029 | 
					
						
							|  |  |  | 34810d4,240f0001 | 
					
						
							|  |  |  | 34810d8,8fa30010 | 
					
						
							|  |  |  | 34810dc,8fbf0014 | 
					
						
							|  |  |  | 34810e0,3e00008 | 
					
						
							|  |  |  | 34810e4,27bd0018 | 
					
						
							|  |  |  | 34810e8,27bdffd8 | 
					
						
							|  |  |  | 34810ec,afa40010 | 
					
						
							|  |  |  | 34810f0,afa20014 | 
					
						
							|  |  |  | 34810f4,afaf0018 | 
					
						
							|  |  |  | 34810f8,afbf0020 | 
					
						
							|  |  |  | 34810fc,c101a70 | 
					
						
							|  |  |  | 3481100,3404002a | 
					
						
							|  |  |  | 3481104,34050003 | 
					
						
							|  |  |  | 3481108,8fa40010 | 
					
						
							|  |  |  | 348110c,8fa20014 | 
					
						
							|  |  |  | 3481110,8faf0018 | 
					
						
							|  |  |  | 3481114,8fbf0020 | 
					
						
							|  |  |  | 3481118,3e00008 | 
					
						
							|  |  |  | 348111c,27bd0028 | 
					
						
							|  |  |  | 3481120,607821 | 
					
						
							|  |  |  | 3481124,81ec0edf | 
					
						
							|  |  |  | 3481128,318e0080 | 
					
						
							|  |  |  | 348112c,11c00003 | 
					
						
							|  |  |  | 3481130,34030005 | 
					
						
							|  |  |  | 3481134,3e00008 | 
					
						
							|  |  |  | 3481138,34020002 | 
					
						
							|  |  |  | 348113c,3e00008 | 
					
						
							|  |  |  | 3481140,601021 | 
					
						
							|  |  |  | 3481144,85c200a4 | 
					
						
							|  |  |  | 3481148,3c088012 | 
					
						
							|  |  |  | 348114c,2508a5d0 | 
					
						
							|  |  |  | 3481150,81090edf | 
					
						
							|  |  |  | 3481154,35290080 | 
					
						
							|  |  |  | 3481158,a1090edf | 
					
						
							|  |  |  | 348115c,3e00008 | 
					
						
							|  |  |  | 3481164,27bdfff0 | 
					
						
							|  |  |  | 3481168,afbf0004 | 
					
						
							|  |  |  | 348116c,c035886 | 
					
						
							|  |  |  | 3481174,3c0c8012 | 
					
						
							|  |  |  | 3481178,258ca5d0 | 
					
						
							|  |  |  | 348117c,858d0f2e | 
					
						
							|  |  |  | 3481180,8d980004 | 
					
						
							|  |  |  | 3481184,13000002 | 
					
						
							|  |  |  | 3481188,340e0001 | 
					
						
							|  |  |  | 348118c,340e0002 | 
					
						
							|  |  |  | 3481190,1ae6825 | 
					
						
							|  |  |  | 3481194,a58d0f2e | 
					
						
							|  |  |  | 3481198,8fbf0004 | 
					
						
							|  |  |  | 348119c,27bd0010 | 
					
						
							|  |  |  | 34811a0,3e00008 | 
					
						
							|  |  |  | 34811a8,24090041 | 
					
						
							|  |  |  | 34811ac,27bdffe0 | 
					
						
							|  |  |  | 34811b0,afa80004 | 
					
						
							|  |  |  | 34811b4,afa90008 | 
					
						
							|  |  |  | 34811b8,afaa000c | 
					
						
							|  |  |  | 34811bc,afac0010 | 
					
						
							|  |  |  | 34811c0,3c0affff | 
					
						
							|  |  |  | 34811c4,a5403 | 
					
						
							|  |  |  | 34811c8,3c08801d | 
					
						
							|  |  |  | 34811cc,850c894c | 
					
						
							|  |  |  | 34811d0,118a0002 | 
					
						
							|  |  |  | 34811d8,a500894c | 
					
						
							|  |  |  | 34811dc,3c08801e | 
					
						
							|  |  |  | 34811e0,810a887c | 
					
						
							|  |  |  | 34811e4,11400009 | 
					
						
							|  |  |  | 34811ec,3c090036 | 
					
						
							|  |  |  | 34811f0,94c03 | 
					
						
							|  |  |  | 34811f4,a109887c | 
					
						
							|  |  |  | 34811f8,3c090002 | 
					
						
							|  |  |  | 34811fc,94c03 | 
					
						
							|  |  |  | 3481200,a109895f | 
					
						
							|  |  |  | 3481204,3c08801f | 
					
						
							|  |  |  | 3481208,a1008d38 | 
					
						
							|  |  |  | 348120c,8fac0010 | 
					
						
							|  |  |  | 3481210,8faa000c | 
					
						
							|  |  |  | 3481214,8fa90008 | 
					
						
							|  |  |  | 3481218,8fa80004 | 
					
						
							|  |  |  | 348121c,3e00008 | 
					
						
							|  |  |  | 3481220,27bd0020 | 
					
						
							|  |  |  | 3481228,3c0a8010 | 
					
						
							|  |  |  | 348122c,254ae49c | 
					
						
							|  |  |  | 3481230,8d4a0000 | 
					
						
							|  |  |  | 3481234,1140001e | 
					
						
							|  |  |  | 348123c,3c08801d | 
					
						
							|  |  |  | 3481240,250884a0 | 
					
						
							|  |  |  | 3481244,3c0b0001 | 
					
						
							|  |  |  | 3481248,356b04c4 | 
					
						
							|  |  |  | 348124c,10b4020 | 
					
						
							|  |  |  | 3481250,85090000 | 
					
						
							|  |  |  | 3481254,3c0b0002 | 
					
						
							|  |  |  | 3481258,356b26cc | 
					
						
							|  |  |  | 348125c,14b5020 | 
					
						
							|  |  |  | 3481260,94840 | 
					
						
							|  |  |  | 3481264,12a5021 | 
					
						
							|  |  |  | 3481268,85490000 | 
					
						
							|  |  |  | 348126c,a5091956 | 
					
						
							|  |  |  | 3481270,3c0c801e | 
					
						
							|  |  |  | 3481274,258c84a0 | 
					
						
							|  |  |  | 3481278,34090003 | 
					
						
							|  |  |  | 348127c,a1891e5e | 
					
						
							|  |  |  | 3481280,34090014 | 
					
						
							|  |  |  | 3481284,a1091951 | 
					
						
							|  |  |  | 3481288,34090001 | 
					
						
							|  |  |  | 348128c,3c018040 | 
					
						
							|  |  |  | 3481290,a0291224 | 
					
						
							|  |  |  | 3481294,3c088012 | 
					
						
							|  |  |  | 3481298,2508a5d0 | 
					
						
							|  |  |  | 348129c,850913d2 | 
					
						
							|  |  |  | 34812a0,11200003 | 
					
						
							|  |  |  | 34812a8,34090001 | 
					
						
							|  |  |  | 34812ac,a50913d4 | 
					
						
							|  |  |  | 34812b0,3e00008 | 
					
						
							|  |  |  | 34812b8,3421241c | 
					
						
							|  |  |  | 34812bc,3c0d8040 | 
					
						
							|  |  |  | 34812c0,25ad1224 | 
					
						
							|  |  |  | 34812c4,81a90000 | 
					
						
							|  |  |  | 34812c8,11200008 | 
					
						
							|  |  |  | 34812cc,862a00a4 | 
					
						
							|  |  |  | 34812d0,340b005e | 
					
						
							|  |  |  | 34812d4,114b0005 | 
					
						
							|  |  |  | 34812d8,3c0c801e | 
					
						
							|  |  |  | 34812dc,258c84a0 | 
					
						
							|  |  |  | 34812e0,34090003 | 
					
						
							|  |  |  | 34812e4,a1891e5e | 
					
						
							|  |  |  | 34812e8,a1a00000 | 
					
						
							|  |  |  | 34812ec,3e00008 | 
					
						
							|  |  |  | 34812f4,3c02801d | 
					
						
							|  |  |  | 34812f8,244284a0 | 
					
						
							|  |  |  | 34812fc,3c010001 | 
					
						
							|  |  |  | 3481300,411020 | 
					
						
							|  |  |  | 3481304,3401047e | 
					
						
							|  |  |  | 3481308,a4411e1a | 
					
						
							|  |  |  | 348130c,34010014 | 
					
						
							|  |  |  | 3481310,3e00008 | 
					
						
							|  |  |  | 3481314,a0411e15 | 
					
						
							|  |  |  | 3481318,27bdffe8 | 
					
						
							|  |  |  | 348131c,afbf0014 | 
					
						
							|  |  |  | 3481320,afa40018 | 
					
						
							|  |  |  | 3481324,8e190004 | 
					
						
							|  |  |  | 3481328,17200015 | 
					
						
							|  |  |  | 348132c,8e190000 | 
					
						
							|  |  |  | 3481330,3c018010 | 
					
						
							|  |  |  | 3481334,24219c90 | 
					
						
							|  |  |  | 3481338,19c880 | 
					
						
							|  |  |  | 348133c,3210820 | 
					
						
							|  |  |  | 3481340,90210000 | 
					
						
							|  |  |  | 3481344,34190052 | 
					
						
							|  |  |  | 3481348,1721000d | 
					
						
							|  |  |  | 348134c,8e190000 | 
					
						
							|  |  |  | 3481350,960200a6 | 
					
						
							|  |  |  | 3481354,304c0007 | 
					
						
							|  |  |  | 3481358,398c0007 | 
					
						
							|  |  |  | 348135c,15800008 | 
					
						
							|  |  |  | 3481360,240400aa | 
					
						
							|  |  |  | 3481364,c00a22d | 
					
						
							|  |  |  | 348136c,14400004 | 
					
						
							|  |  |  | 3481370,8e190000 | 
					
						
							|  |  |  | 3481374,341900db | 
					
						
							|  |  |  | 3481378,10000002 | 
					
						
							|  |  |  | 348137c,ae190000 | 
					
						
							|  |  |  | 3481380,340101e1 | 
					
						
							|  |  |  | 3481384,8fbf0014 | 
					
						
							|  |  |  | 3481388,8fa40018 | 
					
						
							|  |  |  | 348138c,3e00008 | 
					
						
							|  |  |  | 3481390,27bd0018 | 
					
						
							|  |  |  | 3481394,3c088040 | 
					
						
							|  |  |  | 3481398,81080cde | 
					
						
							|  |  |  | 348139c,11000005 | 
					
						
							|  |  |  | 34813a0,3c018012 | 
					
						
							|  |  |  | 34813a4,2421a5d0 | 
					
						
							|  |  |  | 34813a8,80280ed6 | 
					
						
							|  |  |  | 34813ac,35080001 | 
					
						
							|  |  |  | 34813b0,a0280ed6 | 
					
						
							|  |  |  | 34813b4,34080000 | 
					
						
							|  |  |  | 34813b8,3e00008 | 
					
						
							|  |  |  | 34813bc,adf90000 | 
					
						
							|  |  |  | 34813c0,3c0b801d | 
					
						
							|  |  |  | 34813c4,256b84a0 | 
					
						
							|  |  |  | 34813c8,856b00a4 | 
					
						
							|  |  |  | 34813cc,340c005a | 
					
						
							|  |  |  | 34813d0,156c0003 | 
					
						
							|  |  |  | 34813d4,340b01a5 | 
					
						
							|  |  |  | 34813d8,a42b1e1a | 
					
						
							|  |  |  | 34813dc,1000000e | 
					
						
							|  |  |  | 34813e0,3c0c8012 | 
					
						
							|  |  |  | 34813e4,258ca5d0 | 
					
						
							|  |  |  | 34813e8,8d8c0004 | 
					
						
							|  |  |  | 34813ec,15800008 | 
					
						
							|  |  |  | 34813f0,3c0b8040 | 
					
						
							|  |  |  | 34813f4,816b0cde | 
					
						
							|  |  |  | 34813f8,11600007 | 
					
						
							|  |  |  | 34813fc,842b1e1a | 
					
						
							|  |  |  | 3481400,340c01a5 | 
					
						
							|  |  |  | 3481404,116c0002 | 
					
						
							|  |  |  | 348140c,10000002 | 
					
						
							|  |  |  | 3481410,340b0129 | 
					
						
							|  |  |  | 3481414,a42b1e1a | 
					
						
							|  |  |  | 3481418,3e00008 | 
					
						
							|  |  |  | 3481424,2202825 | 
					
						
							|  |  |  | 3481428,3c0a801e | 
					
						
							|  |  |  | 348142c,254aaa30 | 
					
						
							|  |  |  | 3481430,c544002c | 
					
						
							|  |  |  | 3481434,3c0bc43c | 
					
						
							|  |  |  | 3481438,256b8000 | 
					
						
							|  |  |  | 348143c,448b3000 | 
					
						
							|  |  |  | 3481440,4606203c | 
					
						
							|  |  |  | 3481448,45000026 | 
					
						
							|  |  |  | 3481450,c5440024 | 
					
						
							|  |  |  | 3481454,3c0bc28a | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3481458,448b3000 | 
					
						
							|  |  |  | 348145c,4606203c | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3481464,4501001f | 
					
						
							|  |  |  | 348146c,3c0b41c8 | 
					
						
							|  |  |  | 3481470,448b3000 | 
					
						
							|  |  |  | 3481474,4606203c | 
					
						
							|  |  |  | 348147c,45000019 | 
					
						
							|  |  |  | 3481484,3c098040 | 
					
						
							|  |  |  | 3481488,25291420 | 
					
						
							|  |  |  | 348148c,814b0424 | 
					
						
							|  |  |  | 3481490,1160000e | 
					
						
							|  |  |  | 3481494,812e0000 | 
					
						
							|  |  |  | 3481498,340c007e | 
					
						
							|  |  |  | 348149c,116c000b | 
					
						
							|  |  |  | 34814a4,15c00009 | 
					
						
							|  |  |  | 34814a8,340c0001 | 
					
						
							|  |  |  | 34814ac,a12c0000 | 
					
						
							|  |  |  | 34814b0,3c0dc1a0 | 
					
						
							|  |  |  | 34814b4,ad4d0024 | 
					
						
							|  |  |  | 34814b8,3c0d4120 | 
					
						
							|  |  |  | 34814bc,ad4d0028 | 
					
						
							|  |  |  | 34814c0,3c0dc446 | 
					
						
							|  |  |  | 34814c4,25ad8000 | 
					
						
							|  |  |  | 34814c8,ad4d002c | 
					
						
							|  |  |  | 34814cc,11c00005 | 
					
						
							|  |  |  | 34814d4,15600003 | 
					
						
							|  |  |  | 34814d8,340d8000 | 
					
						
							|  |  |  | 34814dc,a54d00b6 | 
					
						
							|  |  |  | 34814e0,a1200000 | 
					
						
							|  |  |  | 34814e4,3e00008 | 
					
						
							|  |  |  | 34814f0,3c0a801e | 
					
						
							|  |  |  | 34814f4,254aaa30 | 
					
						
							|  |  |  | 34814f8,8d4b066c | 
					
						
							|  |  |  | 34814fc,3c0cd000 | 
					
						
							|  |  |  | 3481500,258cffff | 
					
						
							|  |  |  | 3481504,16c5824 | 
					
						
							|  |  |  | 3481508,3e00008 | 
					
						
							|  |  |  | 348150c,ad4b066c | 
					
						
							|  |  |  | 3481510,27bdffe0 | 
					
						
							|  |  |  | 3481514,afbf0014 | 
					
						
							|  |  |  | 3481518,afa40018 | 
					
						
							|  |  |  | 348151c,1c17825 | 
					
						
							|  |  |  | 3481520,ac4f0680 | 
					
						
							|  |  |  | 3481524,34040001 | 
					
						
							|  |  |  | 3481528,c01b638 | 
					
						
							|  |  |  | 3481530,3c088040 | 
					
						
							|  |  |  | 3481534,81080cd8 | 
					
						
							|  |  |  | 3481538,15000007 | 
					
						
							|  |  |  | 3481540,3c04801d | 
					
						
							|  |  |  | 3481544,248484a0 | 
					
						
							|  |  |  | 3481548,3c058040 | 
					
						
							|  |  |  | 348154c,80a50cd9 | 
					
						
							|  |  |  | 3481550,c037500 | 
					
						
							|  |  |  | 3481558,8fa40018 | 
					
						
							|  |  |  | 348155c,8c880138 | 
					
						
							|  |  |  | 3481560,8d090010 | 
					
						
							|  |  |  | 3481564,252a03d4 | 
					
						
							|  |  |  | 3481568,ac8a029c | 
					
						
							|  |  |  | 348156c,8fbf0014 | 
					
						
							|  |  |  | 3481570,3e00008 | 
					
						
							|  |  |  | 3481574,27bd0020 | 
					
						
							|  |  |  | 3481578,27bdffe0 | 
					
						
							|  |  |  | 348157c,afbf0014 | 
					
						
							|  |  |  | 3481580,afa40018 | 
					
						
							|  |  |  | 3481584,3c088040 | 
					
						
							|  |  |  | 3481588,81080cd8 | 
					
						
							|  |  |  | 348158c,1500001a | 
					
						
							|  |  |  | 3481594,3c09801e | 
					
						
							|  |  |  | 3481598,2529887c | 
					
						
							|  |  |  | 348159c,81280000 | 
					
						
							|  |  |  | 34815a0,340b0036 | 
					
						
							|  |  |  | 34815a4,150b001e | 
					
						
							|  |  |  | 34815ac,3c088040 | 
					
						
							|  |  |  | 34815b0,810814ec | 
					
						
							|  |  |  | 34815b4,1500001a | 
					
						
							|  |  |  | 34815bc,34080001 | 
					
						
							|  |  |  | 34815c0,3c018040 | 
					
						
							|  |  |  | 34815c4,a02814ec | 
					
						
							|  |  |  | 34815c8,3c04801d | 
					
						
							|  |  |  | 34815cc,248484a0 | 
					
						
							|  |  |  | 34815d0,3c058040 | 
					
						
							|  |  |  | 34815d4,90a50cda | 
					
						
							|  |  |  | 34815d8,34060000 | 
					
						
							|  |  |  | 34815dc,c037385 | 
					
						
							|  |  |  | 34815e4,34044802 | 
					
						
							|  |  |  | 34815e8,c0191bc | 
					
						
							|  |  |  | 34815f0,10000025 | 
					
						
							|  |  |  | 34815f8,3c04801d | 
					
						
							|  |  |  | 34815fc,248484a0 | 
					
						
							|  |  |  | 3481600,34050065 | 
					
						
							|  |  |  | 3481604,c01bf73 | 
					
						
							|  |  |  | 348160c,34040032 | 
					
						
							|  |  |  | 3481610,c01b638 | 
					
						
							|  |  |  | 3481618,1000000c | 
					
						
							|  |  |  | 3481620,8fa40018 | 
					
						
							|  |  |  | 3481624,3c05801d | 
					
						
							|  |  |  | 3481628,24a584a0 | 
					
						
							|  |  |  | 348162c,c008ab4 | 
					
						
							|  |  |  | 3481634,10400014 | 
					
						
							|  |  |  | 348163c,3c088040 | 
					
						
							|  |  |  | 3481640,810814ec | 
					
						
							|  |  |  | 3481644,11000010 | 
					
						
							|  |  |  | 348164c,8fa40018 | 
					
						
							|  |  |  | 3481650,8c880138 | 
					
						
							|  |  |  | 3481654,8d090010 | 
					
						
							|  |  |  | 3481658,252a035c | 
					
						
							|  |  |  | 348165c,ac8a029c | 
					
						
							|  |  |  | 3481660,3c028012 | 
					
						
							|  |  |  | 3481664,2442a5d0 | 
					
						
							|  |  |  | 3481668,94490ee0 | 
					
						
							|  |  |  | 348166c,352a0020 | 
					
						
							|  |  |  | 3481670,a44a0ee0 | 
					
						
							|  |  |  | 3481674,8c880004 | 
					
						
							|  |  |  | 3481678,3c09ffff | 
					
						
							|  |  |  | 348167c,2529ffff | 
					
						
							|  |  |  | 3481680,1094024 | 
					
						
							|  |  |  | 3481684,ac880004 | 
					
						
							|  |  |  | 3481688,8fbf0014 | 
					
						
							|  |  |  | 348168c,3e00008 | 
					
						
							|  |  |  | 3481690,27bd0020 | 
					
						
							|  |  |  | 3481694,860f00b6 | 
					
						
							|  |  |  | 3481698,9739b4ae | 
					
						
							|  |  |  | 348169c,3c09801e | 
					
						
							|  |  |  | 34816a0,2529aa30 | 
					
						
							|  |  |  | 34816a4,812a0424 | 
					
						
							|  |  |  | 34816a8,11400004 | 
					
						
							|  |  |  | 34816b0,3409007e | 
					
						
							|  |  |  | 34816b4,15490003 | 
					
						
							|  |  |  | 34816bc,3e00008 | 
					
						
							|  |  |  | 34816c0,340a0000 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34816c4,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34816c8,340a0001 | 
					
						
							|  |  |  | 34816cc,8c8e0134 | 
					
						
							|  |  |  | 34816d0,15c00002 | 
					
						
							|  |  |  | 34816d4,3c0e4480 | 
					
						
							|  |  |  | 34816d8,ac8e0024 | 
					
						
							|  |  |  | 34816dc,3e00008 | 
					
						
							|  |  |  | 34816e0,8fae0044 | 
					
						
							|  |  |  | 34816e4,260501a4 | 
					
						
							|  |  |  | 34816e8,27bdffe0 | 
					
						
							|  |  |  | 34816ec,afbf0014 | 
					
						
							|  |  |  | 34816f0,afa50018 | 
					
						
							|  |  |  | 34816f4,8625001c | 
					
						
							|  |  |  | 34816f8,52a03 | 
					
						
							|  |  |  | 34816fc,c008134 | 
					
						
							|  |  |  | 3481700,30a5003f | 
					
						
							|  |  |  | 3481704,8fa50018 | 
					
						
							|  |  |  | 3481708,8fbf0014 | 
					
						
							|  |  |  | 348170c,3e00008 | 
					
						
							|  |  |  | 3481710,27bd0020 | 
					
						
							|  |  |  | 3481714,ae19066c | 
					
						
							|  |  |  | 3481718,8e0a0428 | 
					
						
							|  |  |  | 348171c,3c09801e | 
					
						
							|  |  |  | 3481720,2529aa30 | 
					
						
							|  |  |  | 3481724,854b00b6 | 
					
						
							|  |  |  | 3481728,216b8000 | 
					
						
							|  |  |  | 348172c,3e00008 | 
					
						
							|  |  |  | 3481730,a52b00b6 | 
					
						
							|  |  |  | 3481734,3c08801e | 
					
						
							|  |  |  | 3481738,2508aa30 | 
					
						
							|  |  |  | 348173c,810a0434 | 
					
						
							|  |  |  | 3481740,340b0008 | 
					
						
							|  |  |  | 3481744,154b0002 | 
					
						
							|  |  |  | 3481748,34090007 | 
					
						
							|  |  |  | 348174c,a1090434 | 
					
						
							|  |  |  | 3481750,3e00008 | 
					
						
							|  |  |  | 3481754,c606000c | 
					
						
							|  |  |  | 3481758,3c08801e | 
					
						
							|  |  |  | 348175c,2508aa30 | 
					
						
							|  |  |  | 3481760,8d0901ac | 
					
						
							|  |  |  | 3481764,3c0a0400 | 
					
						
							|  |  |  | 3481768,254a2f98 | 
					
						
							|  |  |  | 348176c,152a000b | 
					
						
							|  |  |  | 3481770,8d0b01bc | 
					
						
							|  |  |  | 3481774,3c0c42cf | 
					
						
							|  |  |  | 3481778,156c0003 | 
					
						
							|  |  |  | 348177c,3c0d4364 | 
					
						
							|  |  |  | 3481780,10000006 | 
					
						
							|  |  |  | 3481784,ad0d01bc | 
					
						
							|  |  |  | 3481788,3c0c4379 | 
					
						
							|  |  |  | 348178c,156c0003 | 
					
						
							|  |  |  | 3481790,3c09803b | 
					
						
							|  |  |  | 3481794,2529967c | 
					
						
							|  |  |  | 3481798,ad090664 | 
					
						
							|  |  |  | 348179c,3e00008 | 
					
						
							|  |  |  | 34817a0,260501a4 | 
					
						
							|  |  |  | 34817a4,a498017c | 
					
						
							|  |  |  | 34817a8,3c08801d | 
					
						
							|  |  |  | 34817ac,250884a0 | 
					
						
							|  |  |  | 34817b0,850900a4 | 
					
						
							|  |  |  | 34817b4,340a0002 | 
					
						
							|  |  |  | 34817b8,152a000e | 
					
						
							|  |  |  | 34817bc,8c890138 | 
					
						
							|  |  |  | 34817c0,8d290010 | 
					
						
							|  |  |  | 34817c4,252a3398 | 
					
						
							|  |  |  | 34817c8,ac8a0184 | 
					
						
							|  |  |  | 34817cc,340b0001 | 
					
						
							|  |  |  | 34817d0,a48b017c | 
					
						
							|  |  |  | 34817d4,27bdffe8 | 
					
						
							|  |  |  | 34817d8,afbf0014 | 
					
						
							|  |  |  | 34817dc,3c053dcd | 
					
						
							|  |  |  | 34817e0,24a5cccd | 
					
						
							|  |  |  | 34817e4,c0083e2 | 
					
						
							|  |  |  | 34817ec,8fbf0014 | 
					
						
							|  |  |  | 34817f0,27bd0018 | 
					
						
							|  |  |  | 34817f4,3e00008 | 
					
						
							|  |  |  | 34817fc,948e001c | 
					
						
							|  |  |  | 3481800,21cdffce | 
					
						
							|  |  |  | 3481804,5a00010 | 
					
						
							|  |  |  | 3481808,34020000 | 
					
						
							|  |  |  | 348180c,31a90007 | 
					
						
							|  |  |  | 3481810,340a0001 | 
					
						
							|  |  |  | 3481814,12a5004 | 
					
						
							|  |  |  | 3481818,d48c2 | 
					
						
							|  |  |  | 348181c,3c0c8012 | 
					
						
							|  |  |  | 3481820,258ca5d0 | 
					
						
							|  |  |  | 3481824,1896020 | 
					
						
							|  |  |  | 3481828,918b05b4 | 
					
						
							|  |  |  | 348182c,16a5824 | 
					
						
							|  |  |  | 3481830,34020000 | 
					
						
							|  |  |  | 3481834,11600004 | 
					
						
							|  |  |  | 348183c,340d0026 | 
					
						
							|  |  |  | 3481840,a48d001c | 
					
						
							|  |  |  | 3481844,34020001 | 
					
						
							|  |  |  | 3481848,3e00008 | 
					
						
							|  |  |  | 3481850,94ae001c | 
					
						
							|  |  |  | 3481854,21cdffce | 
					
						
							|  |  |  | 3481858,5a0000b | 
					
						
							|  |  |  | 348185c,34020000 | 
					
						
							|  |  |  | 3481860,31a90007 | 
					
						
							|  |  |  | 3481864,340a0001 | 
					
						
							|  |  |  | 3481868,12a5004 | 
					
						
							|  |  |  | 348186c,d48c2 | 
					
						
							|  |  |  | 3481870,3c0c8012 | 
					
						
							|  |  |  | 3481874,258ca5d0 | 
					
						
							|  |  |  | 3481878,1896020 | 
					
						
							|  |  |  | 348187c,918b05b4 | 
					
						
							|  |  |  | 3481880,16a5825 | 
					
						
							|  |  |  | 3481884,a18b05b4 | 
					
						
							|  |  |  | 3481888,3e00008 | 
					
						
							|  |  |  | 3481890,27bdfff0 | 
					
						
							|  |  |  | 3481894,afbf0008 | 
					
						
							|  |  |  | 3481898,28810032 | 
					
						
							|  |  |  | 348189c,10200003 | 
					
						
							|  |  |  | 34818a0,801021 | 
					
						
							|  |  |  | 34818a4,320f809 | 
					
						
							|  |  |  | 34818ac,8fbf0008 | 
					
						
							|  |  |  | 34818b0,27bd0010 | 
					
						
							|  |  |  | 34818b4,3e00008 | 
					
						
							|  |  |  | 34818bc,3c08801d | 
					
						
							|  |  |  | 34818c0,250884a0 | 
					
						
							|  |  |  | 34818c4,3c098012 | 
					
						
							|  |  |  | 34818c8,2529a5d0 | 
					
						
							|  |  |  | 34818cc,950a00a4 | 
					
						
							|  |  |  | 34818d0,3401003e | 
					
						
							|  |  |  | 34818d4,15410002 | 
					
						
							|  |  |  | 34818d8,912b1397 | 
					
						
							|  |  |  | 34818dc,216aff2a | 
					
						
							|  |  |  | 34818e0,960b001c | 
					
						
							|  |  |  | 34818e4,216b0001 | 
					
						
							|  |  |  | 34818e8,340c0001 | 
					
						
							|  |  |  | 34818ec,16c6004 | 
					
						
							|  |  |  | 34818f0,3401001c | 
					
						
							|  |  |  | 34818f4,1410018 | 
					
						
							|  |  |  | 34818f8,6812 | 
					
						
							|  |  |  | 34818fc,12d7020 | 
					
						
							|  |  |  | 3481900,8dcf00e4 | 
					
						
							|  |  |  | 3481904,18f1024 | 
					
						
							|  |  |  | 3481908,3e00008 | 
					
						
							|  |  |  | 3481910,3c08801d | 
					
						
							|  |  |  | 3481914,250884a0 | 
					
						
							|  |  |  | 3481918,3c098012 | 
					
						
							|  |  |  | 348191c,2529a5d0 | 
					
						
							|  |  |  | 3481920,950a00a4 | 
					
						
							|  |  |  | 3481924,3401003e | 
					
						
							|  |  |  | 3481928,15410002 | 
					
						
							|  |  |  | 348192c,912b1397 | 
					
						
							|  |  |  | 3481930,216aff2a | 
					
						
							|  |  |  | 3481934,848b001c | 
					
						
							|  |  |  | 3481938,216b0001 | 
					
						
							|  |  |  | 348193c,340c0001 | 
					
						
							|  |  |  | 3481940,16c6004 | 
					
						
							|  |  |  | 3481944,3401001c | 
					
						
							|  |  |  | 3481948,1410018 | 
					
						
							|  |  |  | 348194c,6812 | 
					
						
							|  |  |  | 3481950,12d7020 | 
					
						
							|  |  |  | 3481954,8dcf00e4 | 
					
						
							|  |  |  | 3481958,18f7825 | 
					
						
							|  |  |  | 348195c,adcf00e4 | 
					
						
							|  |  |  | 3481960,3e00008 | 
					
						
							|  |  |  | 3481968,27bdffe8 | 
					
						
							|  |  |  | 348196c,afbf0010 | 
					
						
							|  |  |  | 3481970,c101fbb | 
					
						
							|  |  |  | 3481978,8fbf0010 | 
					
						
							|  |  |  | 348197c,27bd0018 | 
					
						
							|  |  |  | 3481980,8fae0018 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3481984,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3481988,3c018010 | 
					
						
							|  |  |  | 348198c,340100ff | 
					
						
							|  |  |  | 3481990,15210002 | 
					
						
							|  |  |  | 3481994,92220000 | 
					
						
							|  |  |  | 3481998,340200ff | 
					
						
							|  |  |  | 348199c,3e00008 | 
					
						
							|  |  |  | 34819a0,34010009 | 
					
						
							|  |  |  | 34819a4,27bdffe8 | 
					
						
							|  |  |  | 34819a8,afa20010 | 
					
						
							|  |  |  | 34819ac,afbf0014 | 
					
						
							|  |  |  | 34819b0,c10068d | 
					
						
							|  |  |  | 34819b8,14400002 | 
					
						
							|  |  |  | 34819bc,91830000 | 
					
						
							|  |  |  | 34819c0,340300ff | 
					
						
							|  |  |  | 34819c4,8fa20010 | 
					
						
							|  |  |  | 34819c8,8fbf0014 | 
					
						
							|  |  |  | 34819cc,27bd0018 | 
					
						
							|  |  |  | 34819d0,3e00008 | 
					
						
							|  |  |  | 34819d4,34010009 | 
					
						
							|  |  |  | 34819d8,27bdffe8 | 
					
						
							|  |  |  | 34819dc,afa20010 | 
					
						
							|  |  |  | 34819e0,afbf0014 | 
					
						
							|  |  |  | 34819e4,960201e8 | 
					
						
							|  |  |  | 34819e8,34010003 | 
					
						
							|  |  |  | 34819ec,14410007 | 
					
						
							|  |  |  | 34819f4,c10068d | 
					
						
							|  |  |  | 34819fc,14400007 | 
					
						
							|  |  |  | 3481a04,10000005 | 
					
						
							|  |  |  | 3481a08,3403007a | 
					
						
							|  |  |  | 3481a0c,3401017a | 
					
						
							|  |  |  | 3481a10,14610002 | 
					
						
							|  |  |  | 3481a18,3403007a | 
					
						
							|  |  |  | 3481a1c,36280 | 
					
						
							|  |  |  | 3481a20,18d2821 | 
					
						
							|  |  |  | 3481a24,8fa20010 | 
					
						
							|  |  |  | 3481a28,8fbf0014 | 
					
						
							|  |  |  | 3481a2c,3e00008 | 
					
						
							|  |  |  | 3481a30,27bd0018 | 
					
						
							|  |  |  | 3481a34,27bdfff0 | 
					
						
							|  |  |  | 3481a38,afbf0000 | 
					
						
							|  |  |  | 3481a3c,afa30004 | 
					
						
							|  |  |  | 3481a40,afa40008 | 
					
						
							|  |  |  | 3481a44,c101ff7 | 
					
						
							|  |  |  | 3481a4c,8fbf0000 | 
					
						
							|  |  |  | 3481a50,8fa30004 | 
					
						
							|  |  |  | 3481a54,8fa40008 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3481a58,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3481a5c,27bd0010 | 
					
						
							|  |  |  | 3481a60,6d7024 | 
					
						
							|  |  |  | 3481a64,15c00002 | 
					
						
							|  |  |  | 3481a68,91ec0000 | 
					
						
							|  |  |  | 3481a6c,27ff003c | 
					
						
							|  |  |  | 3481a70,3e00008 | 
					
						
							|  |  |  | 3481a84,3c088012 | 
					
						
							|  |  |  | 3481a88,2508a5d0 | 
					
						
							|  |  |  | 3481a8c,8509009c | 
					
						
							|  |  |  | 3481a90,352a0002 | 
					
						
							|  |  |  | 3481a94,3e00008 | 
					
						
							|  |  |  | 3481a98,a50a009c | 
					
						
							|  |  |  | 3481a9c,3c058012 | 
					
						
							|  |  |  | 3481aa0,24a5a5d0 | 
					
						
							|  |  |  | 3481aa4,3c088040 | 
					
						
							|  |  |  | 3481aa8,25081a78 | 
					
						
							|  |  |  | 3481aac,8ca90068 | 
					
						
							|  |  |  | 3481ab0,ad090000 | 
					
						
							|  |  |  | 3481ab4,8ca9006c | 
					
						
							|  |  |  | 3481ab8,ad090004 | 
					
						
							|  |  |  | 3481abc,94a90070 | 
					
						
							|  |  |  | 3481ac0,a5090008 | 
					
						
							|  |  |  | 3481ac4,94a9009c | 
					
						
							|  |  |  | 3481ac8,a509000a | 
					
						
							|  |  |  | 3481acc,340807e4 | 
					
						
							|  |  |  | 3481ad0,1054021 | 
					
						
							|  |  |  | 3481ad4,34090e64 | 
					
						
							|  |  |  | 3481ad8,1254821 | 
					
						
							|  |  |  | 3481adc,340a0008 | 
					
						
							|  |  |  | 3481ae0,8d0b0000 | 
					
						
							|  |  |  | 3481ae4,8d2c0000 | 
					
						
							|  |  |  | 3481ae8,ad2b0000 | 
					
						
							|  |  |  | 3481aec,ad0c0000 | 
					
						
							|  |  |  | 3481af0,2508001c | 
					
						
							|  |  |  | 3481af4,25290004 | 
					
						
							|  |  |  | 3481af8,254affff | 
					
						
							|  |  |  | 3481afc,1d40fff8 | 
					
						
							|  |  |  | 3481b04,801be03 | 
					
						
							|  |  |  | 3481b0c,27bdffe0 | 
					
						
							|  |  |  | 3481b10,afb00010 | 
					
						
							|  |  |  | 3481b14,afb10014 | 
					
						
							|  |  |  | 3481b18,afbf0018 | 
					
						
							|  |  |  | 3481b1c,3c108012 | 
					
						
							|  |  |  | 3481b20,2610a5d0 | 
					
						
							|  |  |  | 3481b24,3c118040 | 
					
						
							|  |  |  | 3481b28,26311a78 | 
					
						
							|  |  |  | 3481b2c,8e080004 | 
					
						
							|  |  |  | 3481b30,11000005 | 
					
						
							|  |  |  | 3481b38,c1006ed | 
					
						
							|  |  |  | 3481b40,10000003 | 
					
						
							|  |  |  | 3481b48,c100700 | 
					
						
							|  |  |  | 3481b50,c1006e0 | 
					
						
							|  |  |  | 3481b54,34040000 | 
					
						
							|  |  |  | 3481b58,c1006e0 | 
					
						
							|  |  |  | 3481b5c,34040001 | 
					
						
							|  |  |  | 3481b60,c1006e0 | 
					
						
							|  |  |  | 3481b64,34040002 | 
					
						
							|  |  |  | 3481b68,8fb00010 | 
					
						
							|  |  |  | 3481b6c,8fb10014 | 
					
						
							|  |  |  | 3481b70,8fbf0018 | 
					
						
							|  |  |  | 3481b74,27bd0020 | 
					
						
							|  |  |  | 3481b78,3e00008 | 
					
						
							|  |  |  | 3481b80,2044021 | 
					
						
							|  |  |  | 3481b84,9109006c | 
					
						
							|  |  |  | 3481b88,340100ff | 
					
						
							|  |  |  | 3481b8c,11210007 | 
					
						
							|  |  |  | 3481b94,2094821 | 
					
						
							|  |  |  | 3481b98,91290074 | 
					
						
							|  |  |  | 3481b9c,3401002c | 
					
						
							|  |  |  | 3481ba0,11210002 | 
					
						
							|  |  |  | 3481ba8,a1090069 | 
					
						
							|  |  |  | 3481bac,3e00008 | 
					
						
							|  |  |  | 3481bb4,27bdffe8 | 
					
						
							|  |  |  | 3481bb8,afbf0010 | 
					
						
							|  |  |  | 3481bbc,8e280000 | 
					
						
							|  |  |  | 3481bc0,ae080040 | 
					
						
							|  |  |  | 3481bc4,8e280004 | 
					
						
							|  |  |  | 3481bc8,ae080044 | 
					
						
							|  |  |  | 3481bcc,96280008 | 
					
						
							|  |  |  | 3481bd0,a6080048 | 
					
						
							|  |  |  | 3481bd4,a2000f33 | 
					
						
							|  |  |  | 3481bd8,9208004a | 
					
						
							|  |  |  | 3481bdc,340100ff | 
					
						
							|  |  |  | 3481be0,15010003 | 
					
						
							|  |  |  | 3481be8,c100713 | 
					
						
							|  |  |  | 3481bf0,8fbf0010 | 
					
						
							|  |  |  | 3481bf4,27bd0018 | 
					
						
							|  |  |  | 3481bf8,3e00008 | 
					
						
							|  |  |  | 3481c00,8e080040 | 
					
						
							|  |  |  | 3481c04,ae080068 | 
					
						
							|  |  |  | 3481c08,8e080044 | 
					
						
							|  |  |  | 3481c0c,ae08006c | 
					
						
							|  |  |  | 3481c10,96080048 | 
					
						
							|  |  |  | 3481c14,9209009d | 
					
						
							|  |  |  | 3481c18,31290020 | 
					
						
							|  |  |  | 3481c1c,15200002 | 
					
						
							|  |  |  | 3481c24,3108ffdf | 
					
						
							|  |  |  | 3481c28,a6080070 | 
					
						
							|  |  |  | 3481c2c,92080068 | 
					
						
							|  |  |  | 3481c30,340100ff | 
					
						
							|  |  |  | 3481c34,15010003 | 
					
						
							|  |  |  | 3481c3c,34080001 | 
					
						
							|  |  |  | 3481c40,a2080f33 | 
					
						
							|  |  |  | 3481c44,3e00008 | 
					
						
							|  |  |  | 3481c4c,27bdffe8 | 
					
						
							|  |  |  | 3481c50,afbf0010 | 
					
						
							|  |  |  | 3481c54,9608009c | 
					
						
							|  |  |  | 3481c58,31080040 | 
					
						
							|  |  |  | 3481c5c,11000005 | 
					
						
							|  |  |  | 3481c64,96080070 | 
					
						
							|  |  |  | 3481c68,3108ff0f | 
					
						
							|  |  |  | 3481c6c,35080030 | 
					
						
							|  |  |  | 3481c70,a6080070 | 
					
						
							|  |  |  | 3481c74,92280001 | 
					
						
							|  |  |  | 3481c78,a2080069 | 
					
						
							|  |  |  | 3481c7c,96280002 | 
					
						
							|  |  |  | 3481c80,a608006a | 
					
						
							|  |  |  | 3481c84,8e280004 | 
					
						
							|  |  |  | 3481c88,ae08006c | 
					
						
							|  |  |  | 3481c8c,c10072d | 
					
						
							|  |  |  | 3481c90,34040000 | 
					
						
							|  |  |  | 3481c94,c10072d | 
					
						
							|  |  |  | 3481c98,34040001 | 
					
						
							|  |  |  | 3481c9c,c10072d | 
					
						
							|  |  |  | 3481ca0,34040002 | 
					
						
							|  |  |  | 3481ca4,8fbf0010 | 
					
						
							|  |  |  | 3481ca8,27bd0018 | 
					
						
							|  |  |  | 3481cac,3e00008 | 
					
						
							|  |  |  | 3481cb4,2044021 | 
					
						
							|  |  |  | 3481cb8,3c098040 | 
					
						
							|  |  |  | 3481cbc,25291d5c | 
					
						
							|  |  |  | 3481cc0,910a006c | 
					
						
							|  |  |  | 3481cc4,340100ff | 
					
						
							|  |  |  | 3481cc8,11410005 | 
					
						
							|  |  |  | 3481cd0,12a4821 | 
					
						
							|  |  |  | 3481cd4,91290000 | 
					
						
							|  |  |  | 3481cd8,1520001c | 
					
						
							|  |  |  | 3481ce0,3c098040 | 
					
						
							|  |  |  | 3481ce4,25291d53 | 
					
						
							|  |  |  | 3481ce8,25290001 | 
					
						
							|  |  |  | 3481cec,912a0000 | 
					
						
							|  |  |  | 3481cf0,11400013 | 
					
						
							|  |  |  | 3481cf8,20a5821 | 
					
						
							|  |  |  | 3481cfc,916b0074 | 
					
						
							|  |  |  | 3481d00,340100ff | 
					
						
							|  |  |  | 3481d04,1161fff8 | 
					
						
							|  |  |  | 3481d0c,920c006c | 
					
						
							|  |  |  | 3481d10,118afff5 | 
					
						
							|  |  |  | 3481d18,920c006d | 
					
						
							|  |  |  | 3481d1c,118afff2 | 
					
						
							|  |  |  | 3481d24,920c006e | 
					
						
							|  |  |  | 3481d28,118affef | 
					
						
							|  |  |  | 3481d30,a10b0069 | 
					
						
							|  |  |  | 3481d34,a10a006c | 
					
						
							|  |  |  | 3481d38,10000004 | 
					
						
							|  |  |  | 3481d40,340900ff | 
					
						
							|  |  |  | 3481d44,a1090069 | 
					
						
							|  |  |  | 3481d48,a109006c | 
					
						
							|  |  |  | 3481d4c,3e00008 | 
					
						
							|  |  |  | 3481d54,90f0203 | 
					
						
							|  |  |  | 3481d58,10d0b00 | 
					
						
							|  |  |  | 3481d5c,10101 | 
					
						
							|  |  |  | 3481d60,1010001 | 
					
						
							|  |  |  | 3481d64,1010101 | 
					
						
							|  |  |  | 3481d68,10001 | 
					
						
							|  |  |  | 3481d6c,1010101 | 
					
						
							|  |  |  | 3481d70,1010100 | 
					
						
							|  |  |  | 3481d74,330821 | 
					
						
							|  |  |  | 3481d78,200f0047 | 
					
						
							|  |  |  | 3481d7c,15ea000e | 
					
						
							|  |  |  | 3481d80,3c028012 | 
					
						
							|  |  |  | 3481d84,8c42a5d4 | 
					
						
							|  |  |  | 3481d88,8e6f00a4 | 
					
						
							|  |  |  | 3481d8c,f7a03 | 
					
						
							|  |  |  | 3481d90,14400005 | 
					
						
							|  |  |  | 3481d94,34024830 | 
					
						
							|  |  |  | 3481d98,15e20007 | 
					
						
							|  |  |  | 3481da0,24190003 | 
					
						
							|  |  |  | 3481da4,10000004 | 
					
						
							|  |  |  | 3481da8,34026311 | 
					
						
							|  |  |  | 3481dac,15e20002 | 
					
						
							|  |  |  | 3481db4,24190003 | 
					
						
							|  |  |  | 3481db8,3e00008 | 
					
						
							|  |  |  | 3481dc0,330821 | 
					
						
							|  |  |  | 3481dc4,3c028012 | 
					
						
							|  |  |  | 3481dc8,8c42a5d4 | 
					
						
							|  |  |  | 3481dcc,8e6f00a4 | 
					
						
							|  |  |  | 3481dd0,f7a03 | 
					
						
							|  |  |  | 3481dd4,14400005 | 
					
						
							|  |  |  | 3481dd8,34024830 | 
					
						
							|  |  |  | 3481ddc,15e20007 | 
					
						
							|  |  |  | 3481de4,24190003 | 
					
						
							|  |  |  | 3481de8,10000004 | 
					
						
							|  |  |  | 3481dec,34026311 | 
					
						
							|  |  |  | 3481df0,15e20002 | 
					
						
							|  |  |  | 3481df8,24190003 | 
					
						
							|  |  |  | 3481dfc,3e00008 | 
					
						
							|  |  |  | 3481e04,34010018 | 
					
						
							|  |  |  | 3481e08,14810015 | 
					
						
							|  |  |  | 3481e10,14400013 | 
					
						
							|  |  |  | 3481e18,3c0a8012 | 
					
						
							|  |  |  | 3481e1c,254aa5d0 | 
					
						
							|  |  |  | 3481e20,814800a6 | 
					
						
							|  |  |  | 3481e24,31080020 | 
					
						
							|  |  |  | 3481e28,1100000d | 
					
						
							|  |  |  | 3481e2c,34020000 | 
					
						
							|  |  |  | 3481e30,8148007b | 
					
						
							|  |  |  | 3481e34,34090007 | 
					
						
							|  |  |  | 3481e38,11090005 | 
					
						
							|  |  |  | 3481e3c,34090008 | 
					
						
							|  |  |  | 3481e40,11090003 | 
					
						
							|  |  |  | 3481e48,8100798 | 
					
						
							|  |  |  | 3481e4c,34020000 | 
					
						
							|  |  |  | 3481e50,81480ed6 | 
					
						
							|  |  |  | 3481e54,35080001 | 
					
						
							|  |  |  | 3481e58,a1480ed6 | 
					
						
							|  |  |  | 3481e5c,34020001 | 
					
						
							|  |  |  | 3481e60,3e00008 | 
					
						
							|  |  |  | 3481e68,3c018040 | 
					
						
							|  |  |  | 3481e6c,8c210ccc | 
					
						
							|  |  |  | 3481e70,10200006 | 
					
						
							|  |  |  | 3481e78,94480670 | 
					
						
							|  |  |  | 3481e7c,31010800 | 
					
						
							|  |  |  | 3481e80,34080800 | 
					
						
							|  |  |  | 3481e84,3e00008 | 
					
						
							|  |  |  | 3481e8c,950804c6 | 
					
						
							|  |  |  | 3481e90,3401000b | 
					
						
							|  |  |  | 3481e94,3e00008 | 
					
						
							|  |  |  | 3481e9c,27bdffe8 | 
					
						
							|  |  |  | 3481ea0,afa50000 | 
					
						
							|  |  |  | 3481ea4,afa60004 | 
					
						
							|  |  |  | 3481ea8,afa70008 | 
					
						
							|  |  |  | 3481eac,afbf0010 | 
					
						
							|  |  |  | 3481eb0,80a80000 | 
					
						
							|  |  |  | 3481eb4,25090001 | 
					
						
							|  |  |  | 3481eb8,15200005 | 
					
						
							|  |  |  | 3481ec0,52025 | 
					
						
							|  |  |  | 3481ec4,24a50008 | 
					
						
							|  |  |  | 3481ec8,c015c0c | 
					
						
							|  |  |  | 3481ecc,24c6fff8 | 
					
						
							|  |  |  | 3481ed0,c102544 | 
					
						
							|  |  |  | 3481ed8,8fbf0010 | 
					
						
							|  |  |  | 3481edc,8fa70008 | 
					
						
							|  |  |  | 3481ee0,8fa60004 | 
					
						
							|  |  |  | 3481ee4,8fa50000 | 
					
						
							|  |  |  | 3481ee8,8015c0c | 
					
						
							|  |  |  | 3481eec,27bd0018 | 
					
						
							|  |  |  | 3481ef0,ac4d066c | 
					
						
							|  |  |  | 3481ef4,a0400141 | 
					
						
							|  |  |  | 3481ef8,a0400144 | 
					
						
							|  |  |  | 3481efc,340e00fe | 
					
						
							|  |  |  | 3481f00,3e00008 | 
					
						
							|  |  |  | 3481f04,a04e0142 | 
					
						
							|  |  |  | 3481f08,a2250021 | 
					
						
							|  |  |  | 3481f0c,3c108040 | 
					
						
							|  |  |  | 3481f10,26100898 | 
					
						
							|  |  |  | 3481f14,26100004 | 
					
						
							|  |  |  | 3481f18,8e0a0000 | 
					
						
							|  |  |  | 3481f1c,1140000b | 
					
						
							|  |  |  | 3481f24,a7c02 | 
					
						
							|  |  |  | 3481f28,1f17820 | 
					
						
							|  |  |  | 3481f2c,3158ff00 | 
					
						
							|  |  |  | 3481f30,18c202 | 
					
						
							|  |  |  | 3481f34,17000003 | 
					
						
							|  |  |  | 3481f38,315900ff | 
					
						
							|  |  |  | 3481f3c,81ea0000 | 
					
						
							|  |  |  | 3481f40,32ac825 | 
					
						
							|  |  |  | 3481f44,81007c5 | 
					
						
							|  |  |  | 3481f48,a1f90000 | 
					
						
							|  |  |  | 3481f4c,3e00008 | 
					
						
							|  |  |  | 3481f54,27bdfff0 | 
					
						
							|  |  |  | 3481f58,afbf0008 | 
					
						
							|  |  |  | 3481f5c,c1007e3 | 
					
						
							|  |  |  | 3481f60,2264ffff | 
					
						
							|  |  |  | 3481f64,344a0000 | 
					
						
							|  |  |  | 3481f68,8fbf0008 | 
					
						
							|  |  |  | 3481f6c,27bd0010 | 
					
						
							|  |  |  | 3481f70,27bdfff0 | 
					
						
							|  |  |  | 3481f74,afbf0008 | 
					
						
							|  |  |  | 3481f78,c1007e3 | 
					
						
							|  |  |  | 3481f7c,36440000 | 
					
						
							|  |  |  | 3481f80,34500000 | 
					
						
							|  |  |  | 3481f84,8fbf0008 | 
					
						
							|  |  |  | 3481f88,27bd0010 | 
					
						
							|  |  |  | 3481f8c,3c088040 | 
					
						
							|  |  |  | 3481f90,25080025 | 
					
						
							|  |  |  | 3481f94,91080000 | 
					
						
							|  |  |  | 3481f98,15000007 | 
					
						
							|  |  |  | 3481fa0,3c088012 | 
					
						
							|  |  |  | 3481fa4,2508a5d0 | 
					
						
							|  |  |  | 3481fa8,1044020 | 
					
						
							|  |  |  | 3481fac,91020024 | 
					
						
							|  |  |  | 3481fb0,10000007 | 
					
						
							|  |  |  | 3481fb8,840c0 | 
					
						
							|  |  |  | 3481fbc,3c028040 | 
					
						
							|  |  |  | 3481fc0,24420034 | 
					
						
							|  |  |  | 3481fc4,1024020 | 
					
						
							|  |  |  | 3481fc8,1044020 | 
					
						
							|  |  |  | 3481fcc,91020000 | 
					
						
							|  |  |  | 3481fd0,3e00008 | 
					
						
							|  |  |  | 3481fd8,8fb60030 | 
					
						
							|  |  |  | 3481fdc,8fb70034 | 
					
						
							|  |  |  | 3481fe0,8fbe0038 | 
					
						
							|  |  |  | 3481fe4,3c088040 | 
					
						
							|  |  |  | 3481fe8,25080025 | 
					
						
							|  |  |  | 3481fec,a1000000 | 
					
						
							|  |  |  | 3481ff0,3e00008 | 
					
						
							|  |  |  | 3481ff8,3c0a8012 | 
					
						
							|  |  |  | 3481ffc,8d4aa5d4 | 
					
						
							|  |  |  | 3482000,15400006 | 
					
						
							|  |  |  | 3482004,31780001 | 
					
						
							|  |  |  | 3482008,17000007 | 
					
						
							|  |  |  | 348200c,3c184230 | 
					
						
							|  |  |  | 3482010,3c184250 | 
					
						
							|  |  |  | 3482014,3e00008 | 
					
						
							|  |  |  | 348201c,17000002 | 
					
						
							|  |  |  | 3482020,3c184210 | 
					
						
							|  |  |  | 3482024,3c184238 | 
					
						
							|  |  |  | 3482028,3e00008 | 
					
						
							|  |  |  | 3482030,906e13e2 | 
					
						
							|  |  |  | 3482034,90620068 | 
					
						
							|  |  |  | 3482038,34010059 | 
					
						
							|  |  |  | 348203c,10410002 | 
					
						
							|  |  |  | 3482040,34010fff | 
					
						
							|  |  |  | 3482044,340100ff | 
					
						
							|  |  |  | 3482048,3e00008 | 
					
						
							|  |  |  | 3482050,3c048012 | 
					
						
							|  |  |  | 3482054,2484a5d0 | 
					
						
							|  |  |  | 3482058,908e13e2 | 
					
						
							|  |  |  | 348205c,90820068 | 
					
						
							|  |  |  | 3482060,34010059 | 
					
						
							|  |  |  | 3482064,10410002 | 
					
						
							|  |  |  | 3482068,34010fff | 
					
						
							|  |  |  | 348206c,340100ff | 
					
						
							|  |  |  | 3482070,3e00008 | 
					
						
							|  |  |  | 3482078,3c08801f | 
					
						
							|  |  |  | 348207c,25085de0 | 
					
						
							|  |  |  | 3482080,8d01009c | 
					
						
							|  |  |  | 3482084,14200003 | 
					
						
							|  |  |  | 3482088,46025102 | 
					
						
							|  |  |  | 348208c,3c083f80 | 
					
						
							|  |  |  | 3482090,44882000 | 
					
						
							|  |  |  | 3482094,3e00008 | 
					
						
							|  |  |  | 348209c,ac800118 | 
					
						
							|  |  |  | 34820a0,27ff0030 | 
					
						
							|  |  |  | 34820a4,3e00008 | 
					
						
							|  |  |  | 34820a8,ac8e0180 | 
					
						
							|  |  |  | 34820ac,3c018040 | 
					
						
							|  |  |  | 34820b0,8c210cbc | 
					
						
							|  |  |  | 34820b4,10200008 | 
					
						
							|  |  |  | 34820bc,81efa64c | 
					
						
							|  |  |  | 34820c0,34180009 | 
					
						
							|  |  |  | 34820c4,11f80002 | 
					
						
							|  |  |  | 34820c8,34180001 | 
					
						
							|  |  |  | 34820cc,34180000 | 
					
						
							|  |  |  | 34820d0,3e00008 | 
					
						
							|  |  |  | 34820d8,8defa670 | 
					
						
							|  |  |  | 34820dc,31f80018 | 
					
						
							|  |  |  | 34820e0,3e00008 | 
					
						
							|  |  |  | 34820e8,3c018040 | 
					
						
							|  |  |  | 34820ec,8c210cbc | 
					
						
							|  |  |  | 34820f0,10200008 | 
					
						
							|  |  |  | 34820f8,816ba64c | 
					
						
							|  |  |  | 34820fc,340c0009 | 
					
						
							|  |  |  | 3482100,116c0002 | 
					
						
							|  |  |  | 3482104,340c0001 | 
					
						
							|  |  |  | 3482108,340c0000 | 
					
						
							|  |  |  | 348210c,3e00008 | 
					
						
							|  |  |  | 3482114,8d6ba670 | 
					
						
							|  |  |  | 3482118,316c0018 | 
					
						
							|  |  |  | 348211c,3e00008 | 
					
						
							|  |  |  | 3482124,3c018040 | 
					
						
							|  |  |  | 3482128,8c210cbc | 
					
						
							|  |  |  | 348212c,10200008 | 
					
						
							|  |  |  | 3482134,3c098012 | 
					
						
							|  |  |  | 3482138,812aa64c | 
					
						
							|  |  |  | 348213c,340b0009 | 
					
						
							|  |  |  | 3482140,114b0009 | 
					
						
							|  |  |  | 3482144,34020000 | 
					
						
							|  |  |  | 3482148,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348214c,34020002 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3482150,3c098012 | 
					
						
							|  |  |  | 3482154,812aa673 | 
					
						
							|  |  |  | 3482158,314a0038 | 
					
						
							|  |  |  | 348215c,15400002 | 
					
						
							|  |  |  | 3482160,34020000 | 
					
						
							|  |  |  | 3482164,34020002 | 
					
						
							|  |  |  | 3482168,3e00008 | 
					
						
							|  |  |  | 3482170,3c0a8040 | 
					
						
							|  |  |  | 3482174,8d4a0cc0 | 
					
						
							|  |  |  | 3482178,1140000a | 
					
						
							|  |  |  | 348217c,34010001 | 
					
						
							|  |  |  | 3482180,1141000b | 
					
						
							|  |  |  | 3482184,34010002 | 
					
						
							|  |  |  | 3482188,11410026 | 
					
						
							|  |  |  | 348218c,34010003 | 
					
						
							|  |  |  | 3482190,11410051 | 
					
						
							|  |  |  | 3482194,34010004 | 
					
						
							|  |  |  | 3482198,11410069 | 
					
						
							|  |  |  | 348219c,34010005 | 
					
						
							|  |  |  | 34821a0,11410061 | 
					
						
							|  |  |  | 34821a4,34010000 | 
					
						
							|  |  |  | 34821a8,3e00008 | 
					
						
							|  |  |  | 34821ac,340a0000 | 
					
						
							|  |  |  | 34821b0,3401003f | 
					
						
							|  |  |  | 34821b4,415024 | 
					
						
							|  |  |  | 34821b8,340f0000 | 
					
						
							|  |  |  | 34821bc,31580001 | 
					
						
							|  |  |  | 34821c0,13000002 | 
					
						
							|  |  |  | 34821c8,25ef0001 | 
					
						
							|  |  |  | 34821cc,31580002 | 
					
						
							|  |  |  | 34821d0,13000002 | 
					
						
							|  |  |  | 34821d8,25ef0001 | 
					
						
							|  |  |  | 34821dc,31580004 | 
					
						
							|  |  |  | 34821e0,13000002 | 
					
						
							|  |  |  | 34821e8,25ef0001 | 
					
						
							|  |  |  | 34821ec,31580008 | 
					
						
							|  |  |  | 34821f0,13000002 | 
					
						
							|  |  |  | 34821f8,25ef0001 | 
					
						
							|  |  |  | 34821fc,31580010 | 
					
						
							|  |  |  | 3482200,13000002 | 
					
						
							|  |  |  | 3482208,25ef0001 | 
					
						
							|  |  |  | 348220c,31580020 | 
					
						
							|  |  |  | 3482210,13000002 | 
					
						
							|  |  |  | 3482218,25ef0001 | 
					
						
							|  |  |  | 348221c,10000043 | 
					
						
							|  |  |  | 3482224,3c01001c | 
					
						
							|  |  |  | 3482228,2421003f | 
					
						
							|  |  |  | 348222c,415024 | 
					
						
							|  |  |  | 3482230,340f0000 | 
					
						
							|  |  |  | 3482234,31580001 | 
					
						
							|  |  |  | 3482238,13000002 | 
					
						
							|  |  |  | 3482240,25ef0001 | 
					
						
							|  |  |  | 3482244,31580002 | 
					
						
							|  |  |  | 3482248,13000002 | 
					
						
							|  |  |  | 3482250,25ef0001 | 
					
						
							|  |  |  | 3482254,31580004 | 
					
						
							|  |  |  | 3482258,13000002 | 
					
						
							|  |  |  | 3482260,25ef0001 | 
					
						
							|  |  |  | 3482264,31580008 | 
					
						
							|  |  |  | 3482268,13000002 | 
					
						
							|  |  |  | 3482270,25ef0001 | 
					
						
							|  |  |  | 3482274,31580010 | 
					
						
							|  |  |  | 3482278,13000002 | 
					
						
							|  |  |  | 3482280,25ef0001 | 
					
						
							|  |  |  | 3482284,31580020 | 
					
						
							|  |  |  | 3482288,13000002 | 
					
						
							|  |  |  | 3482290,25ef0001 | 
					
						
							|  |  |  | 3482294,3c180004 | 
					
						
							|  |  |  | 3482298,158c024 | 
					
						
							|  |  |  | 348229c,13000002 | 
					
						
							|  |  |  | 34822a4,25ef0001 | 
					
						
							|  |  |  | 34822a8,3c180008 | 
					
						
							|  |  |  | 34822ac,158c024 | 
					
						
							|  |  |  | 34822b0,13000002 | 
					
						
							|  |  |  | 34822b8,25ef0001 | 
					
						
							|  |  |  | 34822bc,3c180010 | 
					
						
							|  |  |  | 34822c0,158c024 | 
					
						
							|  |  |  | 34822c4,13000002 | 
					
						
							|  |  |  | 34822cc,25ef0001 | 
					
						
							|  |  |  | 34822d0,10000016 | 
					
						
							|  |  |  | 34822d8,3c01001c | 
					
						
							|  |  |  | 34822dc,415024 | 
					
						
							|  |  |  | 34822e0,340f0000 | 
					
						
							|  |  |  | 34822e4,3c180004 | 
					
						
							|  |  |  | 34822e8,158c024 | 
					
						
							|  |  |  | 34822ec,13000002 | 
					
						
							|  |  |  | 34822f4,25ef0001 | 
					
						
							|  |  |  | 34822f8,3c180008 | 
					
						
							|  |  |  | 34822fc,158c024 | 
					
						
							|  |  |  | 3482300,13000002 | 
					
						
							|  |  |  | 3482308,25ef0001 | 
					
						
							|  |  |  | 348230c,3c180010 | 
					
						
							|  |  |  | 3482310,158c024 | 
					
						
							|  |  |  | 3482314,13000002 | 
					
						
							|  |  |  | 348231c,25ef0001 | 
					
						
							|  |  |  | 3482320,10000002 | 
					
						
							|  |  |  | 3482328,84ef00d0 | 
					
						
							|  |  |  | 348232c,34010000 | 
					
						
							|  |  |  | 3482330,3c188040 | 
					
						
							|  |  |  | 3482334,87180cd0 | 
					
						
							|  |  |  | 3482338,3e00008 | 
					
						
							|  |  |  | 348233c,1f8502a | 
					
						
							|  |  |  | 3482340,34010018 | 
					
						
							|  |  |  | 3482344,415024 | 
					
						
							|  |  |  | 3482348,15410006 | 
					
						
							|  |  |  | 3482350,90ef0084 | 
					
						
							|  |  |  | 3482354,340a0012 | 
					
						
							|  |  |  | 3482358,114f0002 | 
					
						
							|  |  |  | 3482360,3401ffff | 
					
						
							|  |  |  | 3482364,3e00008 | 
					
						
							|  |  |  | 3482368,415024 | 
					
						
							|  |  |  | 348236c,3c098040 | 
					
						
							|  |  |  | 3482370,8d290cc4 | 
					
						
							|  |  |  | 3482374,340a0001 | 
					
						
							|  |  |  | 3482378,112a000e | 
					
						
							|  |  |  | 348237c,340a0002 | 
					
						
							|  |  |  | 3482380,112a0029 | 
					
						
							|  |  |  | 3482384,340a0003 | 
					
						
							|  |  |  | 3482388,112a0054 | 
					
						
							|  |  |  | 348238c,340a0004 | 
					
						
							|  |  |  | 3482390,112a0066 | 
					
						
							|  |  |  | 3482398,340b0018 | 
					
						
							|  |  |  | 348239c,4b5024 | 
					
						
							|  |  |  | 34823a0,156a0002 | 
					
						
							|  |  |  | 34823a4,34030000 | 
					
						
							|  |  |  | 34823a8,34030001 | 
					
						
							|  |  |  | 34823ac,3e00008 | 
					
						
							|  |  |  | 34823b4,3401003f | 
					
						
							|  |  |  | 34823b8,415024 | 
					
						
							|  |  |  | 34823bc,340c0000 | 
					
						
							|  |  |  | 34823c0,314b0001 | 
					
						
							|  |  |  | 34823c4,11600002 | 
					
						
							|  |  |  | 34823cc,258c0001 | 
					
						
							|  |  |  | 34823d0,314b0002 | 
					
						
							|  |  |  | 34823d4,11600002 | 
					
						
							|  |  |  | 34823dc,258c0001 | 
					
						
							|  |  |  | 34823e0,314b0004 | 
					
						
							|  |  |  | 34823e4,11600002 | 
					
						
							|  |  |  | 34823ec,258c0001 | 
					
						
							|  |  |  | 34823f0,314b0008 | 
					
						
							|  |  |  | 34823f4,11600002 | 
					
						
							|  |  |  | 34823fc,258c0001 | 
					
						
							|  |  |  | 3482400,314b0010 | 
					
						
							|  |  |  | 3482404,11600002 | 
					
						
							|  |  |  | 348240c,258c0001 | 
					
						
							|  |  |  | 3482410,314b0020 | 
					
						
							|  |  |  | 3482414,11600002 | 
					
						
							|  |  |  | 348241c,258c0001 | 
					
						
							|  |  |  | 3482420,10000043 | 
					
						
							|  |  |  | 3482428,3c01001c | 
					
						
							|  |  |  | 348242c,2421003f | 
					
						
							|  |  |  | 3482430,415024 | 
					
						
							|  |  |  | 3482434,340c0000 | 
					
						
							|  |  |  | 3482438,314b0001 | 
					
						
							|  |  |  | 348243c,11600002 | 
					
						
							|  |  |  | 3482444,258c0001 | 
					
						
							|  |  |  | 3482448,314b0002 | 
					
						
							|  |  |  | 348244c,11600002 | 
					
						
							|  |  |  | 3482454,258c0001 | 
					
						
							|  |  |  | 3482458,314b0004 | 
					
						
							|  |  |  | 348245c,11600002 | 
					
						
							|  |  |  | 3482464,258c0001 | 
					
						
							|  |  |  | 3482468,314b0008 | 
					
						
							|  |  |  | 348246c,11600002 | 
					
						
							|  |  |  | 3482474,258c0001 | 
					
						
							|  |  |  | 3482478,314b0010 | 
					
						
							|  |  |  | 348247c,11600002 | 
					
						
							|  |  |  | 3482484,258c0001 | 
					
						
							|  |  |  | 3482488,314b0020 | 
					
						
							|  |  |  | 348248c,11600002 | 
					
						
							|  |  |  | 3482494,258c0001 | 
					
						
							|  |  |  | 3482498,3c0b0004 | 
					
						
							|  |  |  | 348249c,14b5824 | 
					
						
							|  |  |  | 34824a0,11600002 | 
					
						
							|  |  |  | 34824a8,258c0001 | 
					
						
							|  |  |  | 34824ac,3c0b0008 | 
					
						
							|  |  |  | 34824b0,14b5824 | 
					
						
							|  |  |  | 34824b4,11600002 | 
					
						
							|  |  |  | 34824bc,258c0001 | 
					
						
							|  |  |  | 34824c0,3c0b0010 | 
					
						
							|  |  |  | 34824c4,14b5824 | 
					
						
							|  |  |  | 34824c8,11600002 | 
					
						
							|  |  |  | 34824d0,258c0001 | 
					
						
							|  |  |  | 34824d4,10000016 | 
					
						
							|  |  |  | 34824dc,3c01001c | 
					
						
							|  |  |  | 34824e0,415024 | 
					
						
							|  |  |  | 34824e4,340c0000 | 
					
						
							|  |  |  | 34824e8,3c0b0004 | 
					
						
							|  |  |  | 34824ec,14b5824 | 
					
						
							|  |  |  | 34824f0,11600002 | 
					
						
							|  |  |  | 34824f8,258c0001 | 
					
						
							|  |  |  | 34824fc,3c0b0008 | 
					
						
							|  |  |  | 3482500,14b5824 | 
					
						
							|  |  |  | 3482504,11600002 | 
					
						
							|  |  |  | 348250c,258c0001 | 
					
						
							|  |  |  | 3482510,3c0b0010 | 
					
						
							|  |  |  | 3482514,14b5824 | 
					
						
							|  |  |  | 3482518,11600002 | 
					
						
							|  |  |  | 3482520,258c0001 | 
					
						
							|  |  |  | 3482524,10000002 | 
					
						
							|  |  |  | 348252c,860c00d0 | 
					
						
							|  |  |  | 3482530,34010000 | 
					
						
							|  |  |  | 3482534,3c0b8040 | 
					
						
							|  |  |  | 3482538,856b0cd2 | 
					
						
							|  |  |  | 348253c,18b602a | 
					
						
							|  |  |  | 3482540,15800002 | 
					
						
							|  |  |  | 3482544,34030000 | 
					
						
							|  |  |  | 3482548,34030001 | 
					
						
							|  |  |  | 348254c,3e00008 | 
					
						
							|  |  |  | 3482554,27bdffe4 | 
					
						
							|  |  |  | 3482558,afb10014 | 
					
						
							|  |  |  | 348255c,afbf0018 | 
					
						
							|  |  |  | 3482560,3c038012 | 
					
						
							|  |  |  | 3482564,2463a5d0 | 
					
						
							|  |  |  | 3482568,860f001c | 
					
						
							|  |  |  | 348256c,31f800ff | 
					
						
							|  |  |  | 3482570,340100ff | 
					
						
							|  |  |  | 3482574,17010004 | 
					
						
							|  |  |  | 3482578,27110400 | 
					
						
							|  |  |  | 348257c,90781397 | 
					
						
							|  |  |  | 3482580,3318001f | 
					
						
							|  |  |  | 3482584,27110430 | 
					
						
							|  |  |  | 3482588,31e18000 | 
					
						
							|  |  |  | 348258c,14200015 | 
					
						
							|  |  |  | 3482594,3c088040 | 
					
						
							|  |  |  | 3482598,8d080cc8 | 
					
						
							|  |  |  | 348259c,1100000b | 
					
						
							|  |  |  | 34825a0,34010001 | 
					
						
							|  |  |  | 34825a4,11010003 | 
					
						
							|  |  |  | 34825ac,1000000d | 
					
						
							|  |  |  | 34825b4,806100a5 | 
					
						
							|  |  |  | 34825b8,30210020 | 
					
						
							|  |  |  | 34825bc,10200008 | 
					
						
							|  |  |  | 34825c4,10000007 | 
					
						
							|  |  |  | 34825cc,c01e6d1 | 
					
						
							|  |  |  | 34825d4,34010008 | 
					
						
							|  |  |  | 34825d8,10410002 | 
					
						
							|  |  |  | 34825e0,34112053 | 
					
						
							|  |  |  | 34825e4,a611010e | 
					
						
							|  |  |  | 34825e8,8fbf0018 | 
					
						
							|  |  |  | 34825ec,8fb10014 | 
					
						
							|  |  |  | 34825f0,3e00008 | 
					
						
							|  |  |  | 34825f4,27bd001c | 
					
						
							|  |  |  | 34825f8,9059008a | 
					
						
							|  |  |  | 34825fc,340900ff | 
					
						
							|  |  |  | 3482600,11390007 | 
					
						
							|  |  |  | 3482608,2b290031 | 
					
						
							|  |  |  | 348260c,15200005 | 
					
						
							|  |  |  | 3482610,34190000 | 
					
						
							|  |  |  | 3482614,34190001 | 
					
						
							|  |  |  | 3482618,10000002 | 
					
						
							|  |  |  | 3482620,34190000 | 
					
						
							|  |  |  | 3482624,3e00008 | 
					
						
							|  |  |  | 348262c,27bdfff0 | 
					
						
							|  |  |  | 3482630,afa80000 | 
					
						
							|  |  |  | 3482634,e7a20004 | 
					
						
							|  |  |  | 3482638,e7a40008 | 
					
						
							|  |  |  | 348263c,3c088040 | 
					
						
							|  |  |  | 3482640,25080cd4 | 
					
						
							|  |  |  | 3482644,91080000 | 
					
						
							|  |  |  | 3482648,1100000f | 
					
						
							|  |  |  | 348264c,340d0200 | 
					
						
							|  |  |  | 3482650,3c08801e | 
					
						
							|  |  |  | 3482654,2508aa30 | 
					
						
							|  |  |  | 3482658,c5020028 | 
					
						
							|  |  |  | 348265c,3c08c496 | 
					
						
							|  |  |  | 3482660,44882000 | 
					
						
							|  |  |  | 3482668,4604103c | 
					
						
							|  |  |  | 3482670,45010004 | 
					
						
							|  |  |  | 3482678,340d0200 | 
					
						
							|  |  |  | 348267c,10000002 | 
					
						
							|  |  |  | 3482684,340d00c0 | 
					
						
							|  |  |  | 3482688,c7a40008 | 
					
						
							|  |  |  | 348268c,c7a20004 | 
					
						
							|  |  |  | 3482690,8fa80000 | 
					
						
							|  |  |  | 3482694,3e00008 | 
					
						
							|  |  |  | 3482698,27bd0010 | 
					
						
							|  |  |  | 348269c,8e2a1d44 | 
					
						
							|  |  |  | 34826a0,314a0100 | 
					
						
							|  |  |  | 34826a4,1540000a | 
					
						
							|  |  |  | 34826ac,8e2a1d48 | 
					
						
							|  |  |  | 34826b0,314a0100 | 
					
						
							|  |  |  | 34826b4,15400007 | 
					
						
							|  |  |  | 34826bc,8e211d48 | 
					
						
							|  |  |  | 34826c0,342a0100 | 
					
						
							|  |  |  | 34826c4,ae2a1d48 | 
					
						
							|  |  |  | 34826c8,10000003 | 
					
						
							|  |  |  | 34826cc,5024 | 
					
						
							|  |  |  | 34826d0,240c0000 | 
					
						
							|  |  |  | 34826d4,340a0001 | 
					
						
							|  |  |  | 34826d8,3e00008 | 
					
						
							|  |  |  | 34826e0,27bdfff0 | 
					
						
							|  |  |  | 34826e4,afbf0000 | 
					
						
							|  |  |  | 34826e8,c101047 | 
					
						
							|  |  |  | 34826f0,8ece1c44 | 
					
						
							|  |  |  | 34826f4,3c18db06 | 
					
						
							|  |  |  | 34826f8,8fbf0000 | 
					
						
							|  |  |  | 34826fc,3e00008 | 
					
						
							|  |  |  | 3482700,27bd0010 | 
					
						
							|  |  |  | 3482708,a21901e9 | 
					
						
							|  |  |  | 348270c,27bdffe0 | 
					
						
							|  |  |  | 3482710,afbf0004 | 
					
						
							|  |  |  | 3482714,afa40008 | 
					
						
							|  |  |  | 3482718,afa5000c | 
					
						
							|  |  |  | 348271c,afa80010 | 
					
						
							|  |  |  | 3482720,e7aa0014 | 
					
						
							|  |  |  | 3482724,e7b00018 | 
					
						
							|  |  |  | 3482728,c100f60 | 
					
						
							|  |  |  | 348272c,2002021 | 
					
						
							|  |  |  | 3482730,8fbf0004 | 
					
						
							|  |  |  | 3482734,8fa40008 | 
					
						
							|  |  |  | 3482738,8fa5000c | 
					
						
							|  |  |  | 348273c,8fa80010 | 
					
						
							|  |  |  | 3482740,c7aa0014 | 
					
						
							|  |  |  | 3482744,c7b00018 | 
					
						
							|  |  |  | 3482748,3e00008 | 
					
						
							|  |  |  | 348274c,27bd0020 | 
					
						
							|  |  |  | 3482750,3f800000 | 
					
						
							|  |  |  | 3482754,34080004 | 
					
						
							|  |  |  | 3482758,3c09801d | 
					
						
							|  |  |  | 348275c,252984a0 | 
					
						
							|  |  |  | 3482760,8d291c44 | 
					
						
							|  |  |  | 3482764,11200016 | 
					
						
							|  |  |  | 348276c,3c018040 | 
					
						
							|  |  |  | 3482770,c4362750 | 
					
						
							|  |  |  | 3482778,46166302 | 
					
						
							|  |  |  | 348277c,9127014f | 
					
						
							|  |  |  | 3482780,1507000f | 
					
						
							|  |  |  | 3482784,448f2000 | 
					
						
							|  |  |  | 3482788,3c07803a | 
					
						
							|  |  |  | 348278c,24e78bc0 | 
					
						
							|  |  |  | 3482790,8d280664 | 
					
						
							|  |  |  | 3482794,1507000a | 
					
						
							|  |  |  | 348279c,3c088040 | 
					
						
							|  |  |  | 34827a0,25080cdf | 
					
						
							|  |  |  | 34827a4,91080000 | 
					
						
							|  |  |  | 34827a8,11000005 | 
					
						
							|  |  |  | 34827b0,3c083fc0 | 
					
						
							|  |  |  | 34827b4,4488b000 | 
					
						
							|  |  |  | 34827bc,46166302 | 
					
						
							|  |  |  | 34827c4,44056000 | 
					
						
							|  |  |  | 34827c8,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34827d0,3c188040 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34827d4,97180848 | 
					
						
							|  |  |  | 34827d8,a5d80794 | 
					
						
							|  |  |  | 34827dc,3c188040 | 
					
						
							|  |  |  | 34827e0,9718084a | 
					
						
							|  |  |  | 34827e4,a5d80796 | 
					
						
							|  |  |  | 34827e8,3c188040 | 
					
						
							|  |  |  | 34827ec,9718084c | 
					
						
							|  |  |  | 34827f0,a5d80798 | 
					
						
							|  |  |  | 34827f4,ec021 | 
					
						
							|  |  |  | 34827f8,3e00008 | 
					
						
							|  |  |  | 3482800,27bdffe8 | 
					
						
							|  |  |  | 3482804,afbf0004 | 
					
						
							|  |  |  | 3482808,afb00008 | 
					
						
							|  |  |  | 348280c,808021 | 
					
						
							|  |  |  | 3482810,3c048040 | 
					
						
							|  |  |  | 3482814,9484086c | 
					
						
							|  |  |  | 3482818,c100a1a | 
					
						
							|  |  |  | 3482820,ae02022c | 
					
						
							|  |  |  | 3482824,3c048040 | 
					
						
							|  |  |  | 3482828,9484086e | 
					
						
							|  |  |  | 348282c,c100a1a | 
					
						
							|  |  |  | 3482834,ae020230 | 
					
						
							|  |  |  | 3482838,3c048040 | 
					
						
							|  |  |  | 348283c,94840870 | 
					
						
							|  |  |  | 3482840,c100a1a | 
					
						
							|  |  |  | 3482848,ae020234 | 
					
						
							|  |  |  | 348284c,c100a1a | 
					
						
							|  |  |  | 3482850,340400ff | 
					
						
							|  |  |  | 3482854,ae020238 | 
					
						
							|  |  |  | 3482858,8fbf0004 | 
					
						
							|  |  |  | 348285c,8fb00008 | 
					
						
							|  |  |  | 3482860,3e00008 | 
					
						
							|  |  |  | 3482864,27bd0018 | 
					
						
							|  |  |  | 3482868,28810020 | 
					
						
							|  |  |  | 348286c,14200005 | 
					
						
							|  |  |  | 3482870,288100e0 | 
					
						
							|  |  |  | 3482874,10200003 | 
					
						
							|  |  |  | 348287c,10000002 | 
					
						
							|  |  |  | 3482880,861023 | 
					
						
							|  |  |  | 3482884,851023 | 
					
						
							|  |  |  | 3482888,3e00008 | 
					
						
							|  |  |  | 348288c,304200ff | 
					
						
							|  |  |  | 3482894,2b010192 | 
					
						
							|  |  |  | 3482898,10200004 | 
					
						
							|  |  |  | 34828a0,3c088010 | 
					
						
							|  |  |  | 34828a4,3e00008 | 
					
						
							|  |  |  | 34828a8,25088ff8 | 
					
						
							|  |  |  | 34828ac,3c088040 | 
					
						
							|  |  |  | 34828b0,25080c9c | 
					
						
							|  |  |  | 34828b4,3e00008 | 
					
						
							|  |  |  | 34828b8,2718fe6d | 
					
						
							|  |  |  | 34828bc,8e1821 | 
					
						
							|  |  |  | 34828c0,28c10192 | 
					
						
							|  |  |  | 34828c4,10200004 | 
					
						
							|  |  |  | 34828cc,3c198010 | 
					
						
							|  |  |  | 34828d0,3e00008 | 
					
						
							|  |  |  | 34828d4,27398ff8 | 
					
						
							|  |  |  | 34828d8,3c198040 | 
					
						
							|  |  |  | 34828dc,27390c9c | 
					
						
							|  |  |  | 34828e0,3e00008 | 
					
						
							|  |  |  | 34828e4,24c6fe6d | 
					
						
							|  |  |  | 34828e8,86190000 | 
					
						
							|  |  |  | 34828ec,8e050004 | 
					
						
							|  |  |  | 34828f0,26040008 | 
					
						
							|  |  |  | 34828f4,194023 | 
					
						
							|  |  |  | 34828f8,29010192 | 
					
						
							|  |  |  | 34828fc,10200004 | 
					
						
							|  |  |  | 3482904,3c138010 | 
					
						
							|  |  |  | 3482908,3e00008 | 
					
						
							|  |  |  | 348290c,26738ff8 | 
					
						
							|  |  |  | 3482910,3c138040 | 
					
						
							|  |  |  | 3482914,26730c9c | 
					
						
							|  |  |  | 3482918,3e00008 | 
					
						
							|  |  |  | 348291c,2508fe6d | 
					
						
							|  |  |  | 3482920,8e040010 | 
					
						
							|  |  |  | 3482924,28610192 | 
					
						
							|  |  |  | 3482928,10200004 | 
					
						
							|  |  |  | 3482930,3c138010 | 
					
						
							|  |  |  | 3482934,8100a52 | 
					
						
							|  |  |  | 3482938,26738ff8 | 
					
						
							|  |  |  | 348293c,3c138040 | 
					
						
							|  |  |  | 3482940,26730c9c | 
					
						
							|  |  |  | 3482944,2463fe6d | 
					
						
							|  |  |  | 3482948,378c0 | 
					
						
							|  |  |  | 348294c,26f1021 | 
					
						
							|  |  |  | 3482950,3e00008 | 
					
						
							|  |  |  | 3482954,8c450000 | 
					
						
							|  |  |  | 3482958,8fa40020 | 
					
						
							|  |  |  | 348295c,3c088040 | 
					
						
							|  |  |  | 3482960,81080cd7 | 
					
						
							|  |  |  | 3482964,24060050 | 
					
						
							|  |  |  | 3482968,1100000b | 
					
						
							|  |  |  | 3482970,84860014 | 
					
						
							|  |  |  | 3482974,50c00008 | 
					
						
							|  |  |  | 3482978,24060050 | 
					
						
							|  |  |  | 348297c,80a81d44 | 
					
						
							|  |  |  | 3482980,c85824 | 
					
						
							|  |  |  | 3482984,55600004 | 
					
						
							|  |  |  | 3482988,24060050 | 
					
						
							|  |  |  | 348298c,1064025 | 
					
						
							|  |  |  | 3482990,a0a81d44 | 
					
						
							|  |  |  | 3482994,24c60014 | 
					
						
							|  |  |  | 3482998,3e00008 | 
					
						
							|  |  |  | 34829a0,27bdfff0 | 
					
						
							|  |  |  | 34829a4,afbf0004 | 
					
						
							|  |  |  | 34829a8,afa80008 | 
					
						
							|  |  |  | 34829ac,afa9000c | 
					
						
							|  |  |  | 34829b0,3c088040 | 
					
						
							|  |  |  | 34829b4,81080cd7 | 
					
						
							|  |  |  | 34829b8,11000009 | 
					
						
							|  |  |  | 34829c0,86080014 | 
					
						
							|  |  |  | 34829c4,11000006 | 
					
						
							|  |  |  | 34829cc,82291d44 | 
					
						
							|  |  |  | 34829d0,1094024 | 
					
						
							|  |  |  | 34829d4,24020001 | 
					
						
							|  |  |  | 34829d8,11000003 | 
					
						
							|  |  |  | 34829e0,c01c6a5 | 
					
						
							|  |  |  | 34829e8,8fbf0004 | 
					
						
							|  |  |  | 34829ec,8fa80008 | 
					
						
							|  |  |  | 34829f0,8fa9000c | 
					
						
							|  |  |  | 34829f4,27bd0010 | 
					
						
							|  |  |  | 34829f8,3e00008 | 
					
						
							|  |  |  | 3482a00,8fb00034 | 
					
						
							|  |  |  | 3482a04,848800b4 | 
					
						
							|  |  |  | 3482a08,11000002 | 
					
						
							|  |  |  | 3482a10,a48000b0 | 
					
						
							|  |  |  | 3482a14,3e00008 | 
					
						
							|  |  |  | 3482a1c,1b9fcd5 | 
					
						
							|  |  |  | 3482a20,fb251ad2 | 
					
						
							|  |  |  | 3482a24,f2dc | 
					
						
							|  |  |  | 3482a28,8022 | 
					
						
							|  |  |  | 3482a2c,23bdffec | 
					
						
							|  |  |  | 3482a30,afbf0010 | 
					
						
							|  |  |  | 3482a34,9608001c | 
					
						
							|  |  |  | 3482a38,31088000 | 
					
						
							|  |  |  | 3482a3c,1100000f | 
					
						
							|  |  |  | 3482a44,3c038012 | 
					
						
							|  |  |  | 3482a48,2463a5d0 | 
					
						
							|  |  |  | 3482a4c,946d0edc | 
					
						
							|  |  |  | 3482a50,31ad0400 | 
					
						
							|  |  |  | 3482a54,11a0000b | 
					
						
							|  |  |  | 3482a5c,8c6e0004 | 
					
						
							|  |  |  | 3482a60,15c00008 | 
					
						
							|  |  |  | 3482a68,948d1d2a | 
					
						
							|  |  |  | 3482a6c,35ae0001 | 
					
						
							|  |  |  | 3482a70,a48e1d2a | 
					
						
							|  |  |  | 3482a74,10000003 | 
					
						
							|  |  |  | 3482a7c,c037385 | 
					
						
							|  |  |  | 3482a84,8fbf0010 | 
					
						
							|  |  |  | 3482a88,23bd0014 | 
					
						
							|  |  |  | 3482a8c,3e00008 | 
					
						
							|  |  |  | 3482a94,8c6e0004 | 
					
						
							|  |  |  | 3482a98,3e00008 | 
					
						
							|  |  |  | 3482aa0,8488001c | 
					
						
							|  |  |  | 3482aa4,34010002 | 
					
						
							|  |  |  | 3482aa8,15010015 | 
					
						
							|  |  |  | 3482ab0,3c028012 | 
					
						
							|  |  |  | 3482ab4,2442a5d0 | 
					
						
							|  |  |  | 3482ab8,8c4b0004 | 
					
						
							|  |  |  | 3482abc,15600012 | 
					
						
							|  |  |  | 3482ac4,3c098040 | 
					
						
							|  |  |  | 3482ac8,25292b10 | 
					
						
							|  |  |  | 3482acc,ac890154 | 
					
						
							|  |  |  | 3482ad0,27bdffe0 | 
					
						
							|  |  |  | 3482ad4,afbf0010 | 
					
						
							|  |  |  | 3482ad8,afa50014 | 
					
						
							|  |  |  | 3482adc,8fa60014 | 
					
						
							|  |  |  | 3482ae0,3c058040 | 
					
						
							|  |  |  | 3482ae4,24a52a1c | 
					
						
							|  |  |  | 3482ae8,c009571 | 
					
						
							|  |  |  | 3482aec,24c41c24 | 
					
						
							|  |  |  | 3482af0,8fbf0010 | 
					
						
							|  |  |  | 3482af4,27bd0020 | 
					
						
							|  |  |  | 3482af8,10000003 | 
					
						
							|  |  |  | 3482b00,afa40000 | 
					
						
							|  |  |  | 3482b04,afa50004 | 
					
						
							|  |  |  | 3482b08,3e00008 | 
					
						
							|  |  |  | 3482b10,27bdffd8 | 
					
						
							|  |  |  | 3482b14,afb00020 | 
					
						
							|  |  |  | 3482b18,afbf0024 | 
					
						
							|  |  |  | 3482b1c,afa5002c | 
					
						
							|  |  |  | 3482b20,808025 | 
					
						
							|  |  |  | 3482b24,c600015c | 
					
						
							|  |  |  | 3482b28,3c01c4a4 | 
					
						
							|  |  |  | 3482b2c,24212000 | 
					
						
							|  |  |  | 3482b30,44811000 | 
					
						
							|  |  |  | 3482b34,3c028012 | 
					
						
							|  |  |  | 3482b38,2442a5d0 | 
					
						
							|  |  |  | 3482b3c,944b0edc | 
					
						
							|  |  |  | 3482b40,316c0400 | 
					
						
							|  |  |  | 3482b44,944b0ee0 | 
					
						
							|  |  |  | 3482b48,11800031 | 
					
						
							|  |  |  | 3482b50,94ad1d2a | 
					
						
							|  |  |  | 3482b54,31ae0001 | 
					
						
							|  |  |  | 3482b58,11c00006 | 
					
						
							|  |  |  | 3482b60,31adfffe | 
					
						
							|  |  |  | 3482b64,a4ad1d2a | 
					
						
							|  |  |  | 3482b68,34010200 | 
					
						
							|  |  |  | 3482b6c,1615826 | 
					
						
							|  |  |  | 3482b70,a44b0ee0 | 
					
						
							|  |  |  | 3482b74,316c0200 | 
					
						
							|  |  |  | 3482b78,1180000b | 
					
						
							|  |  |  | 3482b80,34010000 | 
					
						
							|  |  |  | 3482b84,44812000 | 
					
						
							|  |  |  | 3482b88,3c064080 | 
					
						
							|  |  |  | 3482b8c,44863000 | 
					
						
							|  |  |  | 3482b94,46060200 | 
					
						
							|  |  |  | 3482b98,4604403c | 
					
						
							|  |  |  | 3482ba0,10000009 | 
					
						
							|  |  |  | 3482ba8,3c01c42a | 
					
						
							|  |  |  | 3482bac,44812000 | 
					
						
							|  |  |  | 3482bb0,3c06c080 | 
					
						
							|  |  |  | 3482bb4,44863000 | 
					
						
							|  |  |  | 3482bbc,46060200 | 
					
						
							|  |  |  | 3482bc0,4608203c | 
					
						
							|  |  |  | 3482bc8,45000005 | 
					
						
							|  |  |  | 3482bd0,46004106 | 
					
						
							|  |  |  | 3482bd4,c008c42 | 
					
						
							|  |  |  | 3482bd8,3405205e | 
					
						
							|  |  |  | 3482bdc,2002025 | 
					
						
							|  |  |  | 3482be0,e604015c | 
					
						
							|  |  |  | 3482be4,46022100 | 
					
						
							|  |  |  | 3482be8,e6040028 | 
					
						
							|  |  |  | 3482bec,4600240d | 
					
						
							|  |  |  | 3482bf0,44098000 | 
					
						
							|  |  |  | 3482bf4,8fa2002c | 
					
						
							|  |  |  | 3482bf8,8c5807c0 | 
					
						
							|  |  |  | 3482bfc,8f190028 | 
					
						
							|  |  |  | 3482c00,240ffb57 | 
					
						
							|  |  |  | 3482c04,a72f0012 | 
					
						
							|  |  |  | 3482c08,a7290022 | 
					
						
							|  |  |  | 3482c0c,a7290032 | 
					
						
							|  |  |  | 3482c10,8fbf0024 | 
					
						
							|  |  |  | 3482c14,8fb00020 | 
					
						
							|  |  |  | 3482c18,27bd0028 | 
					
						
							|  |  |  | 3482c1c,3e00008 | 
					
						
							|  |  |  | 3482c24,ac20753c | 
					
						
							|  |  |  | 3482c28,3c018040 | 
					
						
							|  |  |  | 3482c2c,90210cdc | 
					
						
							|  |  |  | 3482c30,10200008 | 
					
						
							|  |  |  | 3482c34,3c01801d | 
					
						
							|  |  |  | 3482c38,242184a0 | 
					
						
							|  |  |  | 3482c3c,94211d2c | 
					
						
							|  |  |  | 3482c40,302100c0 | 
					
						
							|  |  |  | 3482c44,14200003 | 
					
						
							|  |  |  | 3482c4c,801ce4c | 
					
						
							|  |  |  | 3482c54,801ce45 | 
					
						
							|  |  |  | 3482c5c,3c088012 | 
					
						
							|  |  |  | 3482c60,2508a5d0 | 
					
						
							|  |  |  | 3482c64,8d0a0004 | 
					
						
							|  |  |  | 3482c68,11400006 | 
					
						
							|  |  |  | 3482c6c,8d090000 | 
					
						
							|  |  |  | 3482c70,3401003b | 
					
						
							|  |  |  | 3482c74,15210008 | 
					
						
							|  |  |  | 3482c7c,3c0bc47a | 
					
						
							|  |  |  | 3482c80,ac8b0028 | 
					
						
							|  |  |  | 3482c84,3401016d | 
					
						
							|  |  |  | 3482c88,15210003 | 
					
						
							|  |  |  | 3482c90,3c0bc47a | 
					
						
							|  |  |  | 3482c94,ac8b0028 | 
					
						
							|  |  |  | 3482c98,3e00008 | 
					
						
							|  |  |  | 3482c9c,340e0001 | 
					
						
							|  |  |  | 3482ca4,3c0f8040 | 
					
						
							|  |  |  | 3482ca8,25ef2ca0 | 
					
						
							|  |  |  | 3482cac,81ef0000 | 
					
						
							|  |  |  | 3482cb0,3c188040 | 
					
						
							|  |  |  | 3482cb4,27182ca1 | 
					
						
							|  |  |  | 3482cb8,83180000 | 
					
						
							|  |  |  | 3482cbc,1f87820 | 
					
						
							|  |  |  | 3482cc0,5e00007 | 
					
						
							|  |  |  | 3482cc4,34010003 | 
					
						
							|  |  |  | 3482cc8,1e1082a | 
					
						
							|  |  |  | 3482ccc,14200002 | 
					
						
							|  |  |  | 3482cd4,340f0008 | 
					
						
							|  |  |  | 3482cd8,10000003 | 
					
						
							|  |  |  | 3482cdc,1f08004 | 
					
						
							|  |  |  | 3482ce0,f7822 | 
					
						
							|  |  |  | 3482ce4,1f08007 | 
					
						
							|  |  |  | 3482ce8,90af003d | 
					
						
							|  |  |  | 3482cec,11e00004 | 
					
						
							|  |  |  | 3482cf4,108043 | 
					
						
							|  |  |  | 3482cf8,108400 | 
					
						
							|  |  |  | 3482cfc,108403 | 
					
						
							|  |  |  | 3482d00,3e00008 | 
					
						
							|  |  |  | 3482d0c,4f1021 | 
					
						
							|  |  |  | 3482d10,3c098040 | 
					
						
							|  |  |  | 3482d14,81292d08 | 
					
						
							|  |  |  | 3482d18,11200008 | 
					
						
							|  |  |  | 3482d1c,8042a65c | 
					
						
							|  |  |  | 3482d20,3c0a801d | 
					
						
							|  |  |  | 3482d24,254a84a0 | 
					
						
							|  |  |  | 3482d28,8d491d44 | 
					
						
							|  |  |  | 3482d2c,31210002 | 
					
						
							|  |  |  | 3482d30,14200002 | 
					
						
							|  |  |  | 3482d34,3402000a | 
					
						
							|  |  |  | 3482d38,34020000 | 
					
						
							|  |  |  | 3482d3c,3e00008 | 
					
						
							|  |  |  | 3482d44,594021 | 
					
						
							|  |  |  | 3482d48,3c0a8040 | 
					
						
							|  |  |  | 3482d4c,814a2d08 | 
					
						
							|  |  |  | 3482d50,11400002 | 
					
						
							|  |  |  | 3482d54,8109008c | 
					
						
							|  |  |  | 3482d58,34090000 | 
					
						
							|  |  |  | 3482d5c,3e00008 | 
					
						
							|  |  |  | 3482d64,1ee7821 | 
					
						
							|  |  |  | 3482d68,3c0a8040 | 
					
						
							|  |  |  | 3482d6c,814a2d08 | 
					
						
							|  |  |  | 3482d70,11400002 | 
					
						
							|  |  |  | 3482d74,81efa65c | 
					
						
							|  |  |  | 3482d78,340f0000 | 
					
						
							|  |  |  | 3482d7c,3e00008 | 
					
						
							|  |  |  | 3482d84,3c098040 | 
					
						
							|  |  |  | 3482d88,81292d08 | 
					
						
							|  |  |  | 3482d8c,11200005 | 
					
						
							|  |  |  | 3482d90,3c0a801d | 
					
						
							|  |  |  | 3482d94,254a84a0 | 
					
						
							|  |  |  | 3482d98,8d491d44 | 
					
						
							|  |  |  | 3482d9c,35290002 | 
					
						
							|  |  |  | 3482da0,ad491d44 | 
					
						
							|  |  |  | 3482da4,3e00008 | 
					
						
							|  |  |  | 3482da8,afa50024 | 
					
						
							|  |  |  | 3482e70,ff00 | 
					
						
							|  |  |  | 3482e74,3c0a8040 | 
					
						
							|  |  |  | 3482e78,254a2e72 | 
					
						
							|  |  |  | 3482e7c,914b0000 | 
					
						
							|  |  |  | 3482e80,340c00ff | 
					
						
							|  |  |  | 3482e84,a14c0000 | 
					
						
							|  |  |  | 3482e88,34087fff | 
					
						
							|  |  |  | 3482e8c,15c80006 | 
					
						
							|  |  |  | 3482e90,3c098040 | 
					
						
							|  |  |  | 3482e94,25292e30 | 
					
						
							|  |  |  | 3482e98,116c000c | 
					
						
							|  |  |  | 3482e9c,b5840 | 
					
						
							|  |  |  | 3482ea0,12b4821 | 
					
						
							|  |  |  | 3482ea4,952e0000 | 
					
						
							|  |  |  | 3482ea8,27bdfff0 | 
					
						
							|  |  |  | 3482eac,afbf0004 | 
					
						
							|  |  |  | 3482eb0,afa40008 | 
					
						
							|  |  |  | 3482eb4,c100bc7 | 
					
						
							|  |  |  | 3482eb8,1c02021 | 
					
						
							|  |  |  | 3482ebc,407021 | 
					
						
							|  |  |  | 3482ec0,8fbf0004 | 
					
						
							|  |  |  | 3482ec4,8fa40008 | 
					
						
							|  |  |  | 3482ec8,27bd0010 | 
					
						
							|  |  |  | 3482ecc,3e00008 | 
					
						
							|  |  |  | 3482ed0,a42e1e1a | 
					
						
							|  |  |  | 3482ed4,9608001c | 
					
						
							|  |  |  | 3482ed8,84303 | 
					
						
							|  |  |  | 3482edc,3108000f | 
					
						
							|  |  |  | 3482ee0,29090002 | 
					
						
							|  |  |  | 3482ee4,1520000b | 
					
						
							|  |  |  | 3482eec,960d0018 | 
					
						
							|  |  |  | 3482ef0,27bdfff0 | 
					
						
							|  |  |  | 3482ef4,afbf0004 | 
					
						
							|  |  |  | 3482ef8,afa40008 | 
					
						
							|  |  |  | 3482efc,c100bc7 | 
					
						
							|  |  |  | 3482f00,1a02021 | 
					
						
							|  |  |  | 3482f04,406821 | 
					
						
							|  |  |  | 3482f08,8fbf0004 | 
					
						
							|  |  |  | 3482f0c,8fa40008 | 
					
						
							|  |  |  | 3482f10,27bd0010 | 
					
						
							|  |  |  | 3482f14,3e00008 | 
					
						
							|  |  |  | 3482f18,270821 | 
					
						
							|  |  |  | 3482f1c,34087ff9 | 
					
						
							|  |  |  | 3482f20,884022 | 
					
						
							|  |  |  | 3482f24,501000f | 
					
						
							|  |  |  | 3482f28,34081000 | 
					
						
							|  |  |  | 3482f2c,884022 | 
					
						
							|  |  |  | 3482f30,500000c | 
					
						
							|  |  |  | 3482f34,3c098012 | 
					
						
							|  |  |  | 3482f38,2529a5d0 | 
					
						
							|  |  |  | 3482f3c,3c0a8040 | 
					
						
							|  |  |  | 3482f40,254a2dac | 
					
						
							|  |  |  | 3482f44,3c0b8040 | 
					
						
							|  |  |  | 3482f48,256b2e72 | 
					
						
							|  |  |  | 3482f4c,a1680000 | 
					
						
							|  |  |  | 3482f50,84080 | 
					
						
							|  |  |  | 3482f54,1485021 | 
					
						
							|  |  |  | 3482f58,95440000 | 
					
						
							|  |  |  | 3482f5c,91480002 | 
					
						
							|  |  |  | 3482f60,a1281397 | 
					
						
							|  |  |  | 3482f64,3e00008 | 
					
						
							|  |  |  | 3482f68,801021 | 
					
						
							|  |  |  | 3482f6c,8c6d0004 | 
					
						
							|  |  |  | 3482f70,3c0e8040 | 
					
						
							|  |  |  | 3482f74,81ce0cdd | 
					
						
							|  |  |  | 3482f78,1ae7825 | 
					
						
							|  |  |  | 3482f7c,11e0000a | 
					
						
							|  |  |  | 3482f84,11c00006 | 
					
						
							|  |  |  | 3482f8c,946e0ed4 | 
					
						
							|  |  |  | 3482f90,31ce0010 | 
					
						
							|  |  |  | 3482f94,1cd7025 | 
					
						
							|  |  |  | 3482f98,11c00003 | 
					
						
							|  |  |  | 3482fa0,3e00008 | 
					
						
							|  |  |  | 3482fa4,340f0001 | 
					
						
							|  |  |  | 3482fa8,3e00008 | 
					
						
							|  |  |  | 3482fac,340f0000 | 
					
						
							|  |  |  | 3482fb0,1000 | 
					
						
							|  |  |  | 3482fb4,4800 | 
					
						
							|  |  |  | 3482fbc,7000 | 
					
						
							|  |  |  | 3482fc0,4800 | 
					
						
							|  |  |  | 3482fc8,8040f330 | 
					
						
							|  |  |  | 3482fcc,42890 | 
					
						
							|  |  |  | 3482fd0,34191000 | 
					
						
							|  |  |  | 3482fd4,340a4800 | 
					
						
							|  |  |  | 3482fd8,340d0000 | 
					
						
							|  |  |  | 3482fdc,340c7000 | 
					
						
							|  |  |  | 3482fe0,340e4800 | 
					
						
							|  |  |  | 3482fe4,3e00008 | 
					
						
							|  |  |  | 3482fe8,34180000 | 
					
						
							|  |  |  | 3482ff0,3c088012 | 
					
						
							|  |  |  | 3482ff4,2508a5d0 | 
					
						
							|  |  |  | 3482ff8,95090eda | 
					
						
							|  |  |  | 3482ffc,31290008 | 
					
						
							|  |  |  | 3483000,15200008 | 
					
						
							|  |  |  | 3483004,8d090004 | 
					
						
							|  |  |  | 3483008,15200004 | 
					
						
							|  |  |  | 348300c,3c098040 | 
					
						
							|  |  |  | 3483010,81292fec | 
					
						
							|  |  |  | 3483014,15200003 | 
					
						
							|  |  |  | 348301c,3e00008 | 
					
						
							|  |  |  | 3483020,34090000 | 
					
						
							|  |  |  | 3483024,3e00008 | 
					
						
							|  |  |  | 3483028,34090001 | 
					
						
							|  |  |  | 348302c,3c08801d | 
					
						
							|  |  |  | 3483030,25082578 | 
					
						
							|  |  |  | 3483034,3409006c | 
					
						
							|  |  |  | 3483038,8d0a6300 | 
					
						
							|  |  |  | 348303c,112a0009 | 
					
						
							|  |  |  | 3483040,340a0001 | 
					
						
							|  |  |  | 3483044,340b0036 | 
					
						
							|  |  |  | 3483048,ad0a6300 | 
					
						
							|  |  |  | 348304c,a10b6304 | 
					
						
							|  |  |  | 3483050,240cffff | 
					
						
							|  |  |  | 3483054,810e63e7 | 
					
						
							|  |  |  | 3483058,15cc0002 | 
					
						
							|  |  |  | 348305c,340d0002 | 
					
						
							|  |  |  | 3483060,a10d63e7 | 
					
						
							|  |  |  | 3483064,3e00008 | 
					
						
							|  |  |  | 3483068,24060022 | 
					
						
							|  |  |  | 3483074,afb0003c | 
					
						
							|  |  |  | 3483078,27bdffe0 | 
					
						
							|  |  |  | 348307c,afbf0014 | 
					
						
							|  |  |  | 3483080,3c098040 | 
					
						
							|  |  |  | 3483084,2529306c | 
					
						
							|  |  |  | 3483088,812a0000 | 
					
						
							|  |  |  | 348308c,1540000a | 
					
						
							|  |  |  | 3483094,8e4b0028 | 
					
						
							|  |  |  | 3483098,3c0c4370 | 
					
						
							|  |  |  | 348309c,16c082a | 
					
						
							|  |  |  | 34830a0,14200005 | 
					
						
							|  |  |  | 34830a4,340d0001 | 
					
						
							|  |  |  | 34830a8,a12d0000 | 
					
						
							|  |  |  | 34830ac,3404001b | 
					
						
							|  |  |  | 34830b0,c032a9c | 
					
						
							|  |  |  | 34830b8,8fbf0014 | 
					
						
							|  |  |  | 34830bc,3e00008 | 
					
						
							|  |  |  | 34830c0,27bd0020 | 
					
						
							|  |  |  | 34830c4,8e721c44 | 
					
						
							|  |  |  | 34830c8,240e0003 | 
					
						
							|  |  |  | 34830cc,a22e05b0 | 
					
						
							|  |  |  | 34830d0,926f07af | 
					
						
							|  |  |  | 34830d4,4406b000 | 
					
						
							|  |  |  | 34830d8,4407a000 | 
					
						
							|  |  |  | 34830dc,3e00008 | 
					
						
							|  |  |  | 34830e4,90580000 | 
					
						
							|  |  |  | 34830e8,27bdffd0 | 
					
						
							|  |  |  | 34830ec,afbf0014 | 
					
						
							|  |  |  | 34830f0,afa40018 | 
					
						
							|  |  |  | 34830f4,afa5001c | 
					
						
							|  |  |  | 34830f8,afa60020 | 
					
						
							|  |  |  | 34830fc,afa70024 | 
					
						
							|  |  |  | 3483100,3c048040 | 
					
						
							|  |  |  | 3483104,8084306c | 
					
						
							|  |  |  | 3483108,1080001b | 
					
						
							|  |  |  | 3483110,3c048040 | 
					
						
							|  |  |  | 3483114,8c843070 | 
					
						
							|  |  |  | 3483118,2885001e | 
					
						
							|  |  |  | 348311c,14a00016 | 
					
						
							|  |  |  | 3483124,28850050 | 
					
						
							|  |  |  | 3483128,10a0000c | 
					
						
							|  |  |  | 3483130,3c043d4d | 
					
						
							|  |  |  | 3483134,2484cccd | 
					
						
							|  |  |  | 3483138,ae4404d0 | 
					
						
							|  |  |  | 348313c,2402025 | 
					
						
							|  |  |  | 3483140,248404c8 | 
					
						
							|  |  |  | 3483144,3c05437f | 
					
						
							|  |  |  | 3483148,3c063f80 | 
					
						
							|  |  |  | 348314c,3c074120 | 
					
						
							|  |  |  | 3483150,c0190a0 | 
					
						
							|  |  |  | 3483158,10000007 | 
					
						
							|  |  |  | 348315c,2402025 | 
					
						
							|  |  |  | 3483160,248404c8 | 
					
						
							|  |  |  | 3483164,34050000 | 
					
						
							|  |  |  | 3483168,3c063f80 | 
					
						
							|  |  |  | 348316c,3c074120 | 
					
						
							|  |  |  | 3483170,c0190a0 | 
					
						
							|  |  |  | 3483178,8fbf0014 | 
					
						
							|  |  |  | 348317c,8fa40018 | 
					
						
							|  |  |  | 3483180,8fa5001c | 
					
						
							|  |  |  | 3483184,8fa60020 | 
					
						
							|  |  |  | 3483188,8fa70024 | 
					
						
							|  |  |  | 348318c,3e00008 | 
					
						
							|  |  |  | 3483190,27bd0030 | 
					
						
							|  |  |  | 3483194,860800b6 | 
					
						
							|  |  |  | 3483198,25084000 | 
					
						
							|  |  |  | 348319c,a60800b6 | 
					
						
							|  |  |  | 34831a0,34080001 | 
					
						
							|  |  |  | 34831a4,a20805e8 | 
					
						
							|  |  |  | 34831a8,a2000554 | 
					
						
							|  |  |  | 34831ac,8e090004 | 
					
						
							|  |  |  | 34831b0,240afffe | 
					
						
							|  |  |  | 34831b4,1495824 | 
					
						
							|  |  |  | 34831b8,ae0b0004 | 
					
						
							|  |  |  | 34831bc,3c088040 | 
					
						
							|  |  |  | 34831c0,25083204 | 
					
						
							|  |  |  | 34831c4,3e00008 | 
					
						
							|  |  |  | 34831c8,ae08013c | 
					
						
							|  |  |  | 34831cc,860800b6 | 
					
						
							|  |  |  | 34831d0,2508c000 | 
					
						
							|  |  |  | 34831d4,a60800b6 | 
					
						
							|  |  |  | 34831d8,34080001 | 
					
						
							|  |  |  | 34831dc,a20805e8 | 
					
						
							|  |  |  | 34831e0,a2000554 | 
					
						
							|  |  |  | 34831e4,8e090004 | 
					
						
							|  |  |  | 34831e8,240afffe | 
					
						
							|  |  |  | 34831ec,1495824 | 
					
						
							|  |  |  | 34831f0,ae0b0004 | 
					
						
							|  |  |  | 34831f4,3c088040 | 
					
						
							|  |  |  | 34831f8,25083204 | 
					
						
							|  |  |  | 34831fc,3e00008 | 
					
						
							|  |  |  | 3483200,ae08013c | 
					
						
							|  |  |  | 3483204,27bdffd0 | 
					
						
							|  |  |  | 3483208,afbf0014 | 
					
						
							|  |  |  | 348320c,afa40018 | 
					
						
							|  |  |  | 3483210,afa5001c | 
					
						
							|  |  |  | 3483214,34080001 | 
					
						
							|  |  |  | 3483218,a0880554 | 
					
						
							|  |  |  | 348321c,8488001c | 
					
						
							|  |  |  | 3483220,11000006 | 
					
						
							|  |  |  | 3483228,3c048040 | 
					
						
							|  |  |  | 348322c,8c843070 | 
					
						
							|  |  |  | 3483230,24850001 | 
					
						
							|  |  |  | 3483234,3c018040 | 
					
						
							|  |  |  | 3483238,ac253070 | 
					
						
							|  |  |  | 348323c,3c048040 | 
					
						
							|  |  |  | 3483240,8c843070 | 
					
						
							|  |  |  | 3483244,34050003 | 
					
						
							|  |  |  | 3483248,14850009 | 
					
						
							|  |  |  | 3483250,8fa40018 | 
					
						
							|  |  |  | 3483254,8488001c | 
					
						
							|  |  |  | 3483258,34090001 | 
					
						
							|  |  |  | 348325c,11090002 | 
					
						
							|  |  |  | 3483260,240539b0 | 
					
						
							|  |  |  | 3483264,240539b1 | 
					
						
							|  |  |  | 3483268,c008bf4 | 
					
						
							|  |  |  | 3483270,28850028 | 
					
						
							|  |  |  | 3483274,14a0001a | 
					
						
							|  |  |  | 348327c,8fa40018 | 
					
						
							|  |  |  | 3483280,24840028 | 
					
						
							|  |  |  | 3483284,3c0543c8 | 
					
						
							|  |  |  | 3483288,3c063f80 | 
					
						
							|  |  |  | 348328c,3c0740c0 | 
					
						
							|  |  |  | 3483290,c0190a0 | 
					
						
							|  |  |  | 3483298,8fa40018 | 
					
						
							|  |  |  | 348329c,24840558 | 
					
						
							|  |  |  | 34832a0,c023270 | 
					
						
							|  |  |  | 34832a8,8fa40018 | 
					
						
							|  |  |  | 34832ac,c008bf4 | 
					
						
							|  |  |  | 34832b0,2405311f | 
					
						
							|  |  |  | 34832b4,3c048040 | 
					
						
							|  |  |  | 34832b8,8c843070 | 
					
						
							|  |  |  | 34832bc,34080061 | 
					
						
							|  |  |  | 34832c0,14880007 | 
					
						
							|  |  |  | 34832c8,8fa40018 | 
					
						
							|  |  |  | 34832cc,8fa5001c | 
					
						
							|  |  |  | 34832d0,8c8b0138 | 
					
						
							|  |  |  | 34832d4,8d6b0010 | 
					
						
							|  |  |  | 34832d8,256913ec | 
					
						
							|  |  |  | 34832dc,ac89013c | 
					
						
							|  |  |  | 34832e0,8fbf0014 | 
					
						
							|  |  |  | 34832e4,3e00008 | 
					
						
							|  |  |  | 34832e8,27bd0030 | 
					
						
							|  |  |  | 34832ec,3c01c416 | 
					
						
							|  |  |  | 34832f0,44816000 | 
					
						
							|  |  |  | 34832f4,3e00008 | 
					
						
							|  |  |  | 34832f8,3025 | 
					
						
							|  |  |  | 34832fc,3c014416 | 
					
						
							|  |  |  | 3483300,44816000 | 
					
						
							|  |  |  | 3483304,3e00008 | 
					
						
							|  |  |  | 3483308,3025 | 
					
						
							|  |  |  | 348330c,afa40018 | 
					
						
							|  |  |  | 3483310,3c08801e | 
					
						
							|  |  |  | 3483314,2508aa30 | 
					
						
							|  |  |  | 3483318,3e00008 | 
					
						
							|  |  |  | 348331c,ad000678 | 
					
						
							|  |  |  | 3483320,27bdffe8 | 
					
						
							|  |  |  | 3483324,afaa0004 | 
					
						
							|  |  |  | 3483328,846f4a2a | 
					
						
							|  |  |  | 348332c,340a0002 | 
					
						
							|  |  |  | 3483330,15ea0002 | 
					
						
							|  |  |  | 3483334,340a0001 | 
					
						
							|  |  |  | 3483338,a46a4a2a | 
					
						
							|  |  |  | 348333c,846f4a2a | 
					
						
							|  |  |  | 3483340,8faa0004 | 
					
						
							|  |  |  | 3483344,3e00008 | 
					
						
							|  |  |  | 3483348,27bd0018 | 
					
						
							|  |  |  | 348334c,27bdffe8 | 
					
						
							|  |  |  | 3483350,afaa0004 | 
					
						
							|  |  |  | 3483354,846e4a2a | 
					
						
							|  |  |  | 3483358,340a0002 | 
					
						
							|  |  |  | 348335c,15ca0002 | 
					
						
							|  |  |  | 3483360,340a0003 | 
					
						
							|  |  |  | 3483364,a46a4a2a | 
					
						
							|  |  |  | 3483368,846e4a2a | 
					
						
							|  |  |  | 348336c,8faa0004 | 
					
						
							|  |  |  | 3483370,3e00008 | 
					
						
							|  |  |  | 3483374,27bd0018 | 
					
						
							|  |  |  | 3483378,27bdffe8 | 
					
						
							|  |  |  | 348337c,afaa0004 | 
					
						
							|  |  |  | 3483380,85034a2a | 
					
						
							|  |  |  | 3483384,340a0002 | 
					
						
							|  |  |  | 3483388,146a0002 | 
					
						
							|  |  |  | 348338c,340a0001 | 
					
						
							|  |  |  | 3483390,a50a4a2a | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3483394,85034a2a | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3483398,8faa0004 | 
					
						
							|  |  |  | 348339c,3e00008 | 
					
						
							|  |  |  | 34833a0,27bd0018 | 
					
						
							|  |  |  | 34833a4,27bdffe8 | 
					
						
							|  |  |  | 34833a8,afaa0004 | 
					
						
							|  |  |  | 34833ac,85034a2a | 
					
						
							|  |  |  | 34833b0,340a0002 | 
					
						
							|  |  |  | 34833b4,146a0002 | 
					
						
							|  |  |  | 34833b8,340a0003 | 
					
						
							|  |  |  | 34833bc,a50a4a2a | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34833c0,85034a2a | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34833c4,8faa0004 | 
					
						
							|  |  |  | 34833c8,3e00008 | 
					
						
							|  |  |  | 34833cc,27bd0018 | 
					
						
							|  |  |  | 34833d0,27bdffe8 | 
					
						
							|  |  |  | 34833d4,afaa0004 | 
					
						
							|  |  |  | 34833d8,85034a2a | 
					
						
							|  |  |  | 34833dc,340a0002 | 
					
						
							|  |  |  | 34833e0,146a0002 | 
					
						
							|  |  |  | 34833e4,340a0001 | 
					
						
							|  |  |  | 34833e8,a50a4a2a | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34833ec,85034a2a | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34833f0,8faa0004 | 
					
						
							|  |  |  | 34833f4,3e00008 | 
					
						
							|  |  |  | 34833f8,27bd0018 | 
					
						
							|  |  |  | 34833fc,27bdffe8 | 
					
						
							|  |  |  | 3483400,afaa0004 | 
					
						
							|  |  |  | 3483404,85034a2a | 
					
						
							|  |  |  | 3483408,340a0002 | 
					
						
							|  |  |  | 348340c,146a0002 | 
					
						
							|  |  |  | 3483410,340a0003 | 
					
						
							|  |  |  | 3483414,a50a4a2a | 
					
						
							|  |  |  | 3483418,85034a2a | 
					
						
							|  |  |  | 348341c,8faa0004 | 
					
						
							|  |  |  | 3483420,3e00008 | 
					
						
							|  |  |  | 3483424,27bd0018 | 
					
						
							|  |  |  | 3483428,27bdffe8 | 
					
						
							|  |  |  | 348342c,afaa0004 | 
					
						
							|  |  |  | 3483430,a42bca2a | 
					
						
							|  |  |  | 3483434,340a0002 | 
					
						
							|  |  |  | 3483438,156a0002 | 
					
						
							|  |  |  | 348343c,340a0003 | 
					
						
							|  |  |  | 3483440,a50a4a2a | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3483444,85034a2a | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3483448,8faa0004 | 
					
						
							|  |  |  | 348344c,3e00008 | 
					
						
							|  |  |  | 3483450,27bd0018 | 
					
						
							|  |  |  | 3483454,27bdffe8 | 
					
						
							|  |  |  | 3483458,afaa0004 | 
					
						
							|  |  |  | 348345c,85034a2a | 
					
						
							|  |  |  | 3483460,340a0002 | 
					
						
							|  |  |  | 3483464,146a0002 | 
					
						
							|  |  |  | 3483468,340a0001 | 
					
						
							|  |  |  | 348346c,a50a4a2a | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3483470,85034a2a | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3483474,8faa0004 | 
					
						
							|  |  |  | 3483478,3e00008 | 
					
						
							|  |  |  | 348347c,27bd0018 | 
					
						
							|  |  |  | 3483480,27bdffe8 | 
					
						
							|  |  |  | 3483484,afaa0004 | 
					
						
							|  |  |  | 3483488,85034a2a | 
					
						
							|  |  |  | 348348c,340a0002 | 
					
						
							|  |  |  | 3483490,146a0002 | 
					
						
							|  |  |  | 3483494,340a0003 | 
					
						
							|  |  |  | 3483498,a50a4a2a | 
					
						
							|  |  |  | 348349c,85034a2a | 
					
						
							|  |  |  | 34834a0,8faa0004 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34834a4,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34834a8,27bd0018 | 
					
						
							|  |  |  | 34834ac,3c08801e | 
					
						
							|  |  |  | 34834b0,25084ee8 | 
					
						
							|  |  |  | 34834b4,3409f000 | 
					
						
							|  |  |  | 34834b8,a5090000 | 
					
						
							|  |  |  | 34834bc,3e00008 | 
					
						
							|  |  |  | 34834c0,84cb4a2e | 
					
						
							|  |  |  | 34834c4,24a56f04 | 
					
						
							|  |  |  | 34834c8,8c880144 | 
					
						
							|  |  |  | 34834cc,11050007 | 
					
						
							|  |  |  | 34834d0,3c09801e | 
					
						
							|  |  |  | 34834d4,2529aa30 | 
					
						
							|  |  |  | 34834d8,3c0a446a | 
					
						
							|  |  |  | 34834dc,254ac000 | 
					
						
							|  |  |  | 34834e0,3c0bc324 | 
					
						
							|  |  |  | 34834e4,ad2a0024 | 
					
						
							|  |  |  | 34834e8,ad2b002c | 
					
						
							|  |  |  | 34834ec,3e00008 | 
					
						
							|  |  |  | 34834f4,27bdffd8 | 
					
						
							|  |  |  | 34834f8,afbf0024 | 
					
						
							|  |  |  | 34834fc,afa40028 | 
					
						
							|  |  |  | 3483500,afa5002c | 
					
						
							|  |  |  | 3483504,afa60030 | 
					
						
							|  |  |  | 3483508,c022865 | 
					
						
							|  |  |  | 348350c,8fa40030 | 
					
						
							|  |  |  | 3483510,44822000 | 
					
						
							|  |  |  | 3483514,44800000 | 
					
						
							|  |  |  | 3483518,240e0002 | 
					
						
							|  |  |  | 348351c,468021a0 | 
					
						
							|  |  |  | 3483520,afae0018 | 
					
						
							|  |  |  | 3483524,8fa40028 | 
					
						
							|  |  |  | 3483528,8fa5002c | 
					
						
							|  |  |  | 348352c,8fa60030 | 
					
						
							|  |  |  | 3483530,3c073f80 | 
					
						
							|  |  |  | 3483534,3c080400 | 
					
						
							|  |  |  | 3483538,250832b0 | 
					
						
							|  |  |  | 348353c,14c80002 | 
					
						
							|  |  |  | 3483544,3c074040 | 
					
						
							|  |  |  | 3483548,e7a60014 | 
					
						
							|  |  |  | 348354c,e7a00010 | 
					
						
							|  |  |  | 3483550,c023000 | 
					
						
							|  |  |  | 3483554,e7a0001c | 
					
						
							|  |  |  | 3483558,8fbf0024 | 
					
						
							|  |  |  | 348355c,8fbf0024 | 
					
						
							|  |  |  | 3483560,3e00008 | 
					
						
							|  |  |  | 3483564,27bd0028 | 
					
						
							|  |  |  | 3483568,3c0a8040 | 
					
						
							|  |  |  | 348356c,814a0cd8 | 
					
						
							|  |  |  | 3483570,11400003 | 
					
						
							|  |  |  | 3483574,8ccb0138 | 
					
						
							|  |  |  | 3483578,8d6b0010 | 
					
						
							|  |  |  | 348357c,25690adc | 
					
						
							|  |  |  | 3483580,3e00008 | 
					
						
							|  |  |  | 3483584,acc90180 | 
					
						
							|  |  |  | 3483588,27bdffe8 | 
					
						
							|  |  |  | 348358c,afbf0014 | 
					
						
							|  |  |  | 3483590,3c0a8040 | 
					
						
							|  |  |  | 3483594,814a0cd8 | 
					
						
							|  |  |  | 3483598,15400003 | 
					
						
							|  |  |  | 34835a0,c037500 | 
					
						
							|  |  |  | 34835a8,8fbf0014 | 
					
						
							|  |  |  | 34835ac,3e00008 | 
					
						
							|  |  |  | 34835b0,27bd0018 | 
					
						
							|  |  |  | 34835b4,3c010080 | 
					
						
							|  |  |  | 34835b8,3c180001 | 
					
						
							|  |  |  | 34835bc,3e00008 | 
					
						
							|  |  |  | 34835c0,8c4e0670 | 
					
						
							|  |  |  | 34835c4,3c0a8040 | 
					
						
							|  |  |  | 34835c8,814a0cd8 | 
					
						
							|  |  |  | 34835cc,11400002 | 
					
						
							|  |  |  | 34835d4,34180003 | 
					
						
							|  |  |  | 34835d8,3c078012 | 
					
						
							|  |  |  | 34835dc,24e7a5d0 | 
					
						
							|  |  |  | 34835e0,3e00008 | 
					
						
							|  |  |  | 34835e4,24010003 | 
					
						
							|  |  |  | 34835e8,3c0a8040 | 
					
						
							|  |  |  | 34835ec,814a0cd8 | 
					
						
							|  |  |  | 34835f0,11400008 | 
					
						
							|  |  |  | 34835f8,c100417 | 
					
						
							|  |  |  | 3483600,3c08801e | 
					
						
							|  |  |  | 3483604,25088966 | 
					
						
							|  |  |  | 3483608,34090004 | 
					
						
							|  |  |  | 348360c,a5090000 | 
					
						
							|  |  |  | 3483614,8fbf0014 | 
					
						
							|  |  |  | 3483618,3e00008 | 
					
						
							|  |  |  | 348361c,27bd0018 | 
					
						
							|  |  |  | 3483620,27bdffe0 | 
					
						
							|  |  |  | 3483624,afbf0014 | 
					
						
							|  |  |  | 3483628,afa10018 | 
					
						
							|  |  |  | 348362c,afa4001c | 
					
						
							|  |  |  | 3483630,3c0a8040 | 
					
						
							|  |  |  | 3483634,814a0cd8 | 
					
						
							|  |  |  | 3483638,1540000b | 
					
						
							|  |  |  | 3483640,3c04801d | 
					
						
							|  |  |  | 3483644,248484a0 | 
					
						
							|  |  |  | 3483648,3c058040 | 
					
						
							|  |  |  | 348364c,90a50cdb | 
					
						
							|  |  |  | 3483650,34060000 | 
					
						
							|  |  |  | 3483654,c037385 | 
					
						
							|  |  |  | 348365c,34044802 | 
					
						
							|  |  |  | 3483660,c0191bc | 
					
						
							|  |  |  | 3483668,8fa4001c | 
					
						
							|  |  |  | 348366c,8fa10018 | 
					
						
							|  |  |  | 3483670,8fbf0014 | 
					
						
							|  |  |  | 3483674,3e00008 | 
					
						
							|  |  |  | 3483678,27bd0020 | 
					
						
							|  |  |  | 3483680,27bdffe0 | 
					
						
							|  |  |  | 3483684,afbf0014 | 
					
						
							|  |  |  | 3483688,afa40018 | 
					
						
							|  |  |  | 348368c,3c0d8040 | 
					
						
							|  |  |  | 3483690,81ad367c | 
					
						
							|  |  |  | 3483694,15a0000c | 
					
						
							|  |  |  | 348369c,3c08801e | 
					
						
							|  |  |  | 34836a0,2508aa30 | 
					
						
							|  |  |  | 34836a4,8d090670 | 
					
						
							|  |  |  | 34836a8,340a4000 | 
					
						
							|  |  |  | 34836ac,12a5824 | 
					
						
							|  |  |  | 34836b0,1160000d | 
					
						
							|  |  |  | 34836b8,34080001 | 
					
						
							|  |  |  | 34836bc,3c018040 | 
					
						
							|  |  |  | 34836c0,a028367c | 
					
						
							|  |  |  | 34836c4,10000023 | 
					
						
							|  |  |  | 34836c8,3c08801e | 
					
						
							|  |  |  | 34836cc,2508aa30 | 
					
						
							|  |  |  | 34836d0,8d090670 | 
					
						
							|  |  |  | 34836d4,340a4000 | 
					
						
							|  |  |  | 34836d8,12a5824 | 
					
						
							|  |  |  | 34836dc,1160000c | 
					
						
							|  |  |  | 34836e4,1000001b | 
					
						
							|  |  |  | 34836e8,24a420d8 | 
					
						
							|  |  |  | 34836ec,c037519 | 
					
						
							|  |  |  | 34836f4,24010002 | 
					
						
							|  |  |  | 34836f8,14410016 | 
					
						
							|  |  |  | 3483700,3c08801e | 
					
						
							|  |  |  | 3483704,25088966 | 
					
						
							|  |  |  | 3483708,34090004 | 
					
						
							|  |  |  | 348370c,a5090000 | 
					
						
							|  |  |  | 3483710,3c0b8012 | 
					
						
							|  |  |  | 3483714,256ba5d0 | 
					
						
							|  |  |  | 3483718,816c0ede | 
					
						
							|  |  |  | 348371c,358c0001 | 
					
						
							|  |  |  | 3483720,a16c0ede | 
					
						
							|  |  |  | 3483724,3c09801e | 
					
						
							|  |  |  | 3483728,2529a2ba | 
					
						
							|  |  |  | 348372c,340802ae | 
					
						
							|  |  |  | 3483730,a5280000 | 
					
						
							|  |  |  | 3483734,3408002a | 
					
						
							|  |  |  | 3483738,3c09801e | 
					
						
							|  |  |  | 348373c,2529a2fe | 
					
						
							|  |  |  | 3483740,a1280000 | 
					
						
							|  |  |  | 3483744,34080014 | 
					
						
							|  |  |  | 3483748,3c09801e | 
					
						
							|  |  |  | 348374c,2529a2b5 | 
					
						
							|  |  |  | 3483750,a1280000 | 
					
						
							|  |  |  | 3483754,8fbf0014 | 
					
						
							|  |  |  | 3483758,3e00008 | 
					
						
							|  |  |  | 348375c,27bd0020 | 
					
						
							|  |  |  | 3483760,27bdffd0 | 
					
						
							|  |  |  | 3483764,afbf0014 | 
					
						
							|  |  |  | 3483768,afa80018 | 
					
						
							|  |  |  | 348376c,afa9001c | 
					
						
							|  |  |  | 3483770,afaa0020 | 
					
						
							|  |  |  | 3483774,afab0024 | 
					
						
							|  |  |  | 3483778,afac0028 | 
					
						
							|  |  |  | 348377c,afad002c | 
					
						
							|  |  |  | 3483780,3c088012 | 
					
						
							|  |  |  | 3483784,2508a5d0 | 
					
						
							|  |  |  | 3483788,85090f20 | 
					
						
							|  |  |  | 348378c,31290040 | 
					
						
							|  |  |  | 3483790,1120000e | 
					
						
							|  |  |  | 3483794,3c08801e | 
					
						
							|  |  |  | 3483798,2508aa30 | 
					
						
							|  |  |  | 348379c,8d09039c | 
					
						
							|  |  |  | 34837a0,1120000a | 
					
						
							|  |  |  | 34837a4,340a00a1 | 
					
						
							|  |  |  | 34837a8,852b0000 | 
					
						
							|  |  |  | 34837ac,154b0007 | 
					
						
							|  |  |  | 34837b0,240cf7ff | 
					
						
							|  |  |  | 34837b4,8d0d066c | 
					
						
							|  |  |  | 34837b8,18d6824 | 
					
						
							|  |  |  | 34837bc,ad0d066c | 
					
						
							|  |  |  | 34837c0,ad00039c | 
					
						
							|  |  |  | 34837c4,ad00011c | 
					
						
							|  |  |  | 34837c8,ad200118 | 
					
						
							|  |  |  | 34837cc,afad002c | 
					
						
							|  |  |  | 34837d0,afac0028 | 
					
						
							|  |  |  | 34837d4,afab0024 | 
					
						
							|  |  |  | 34837d8,afaa0020 | 
					
						
							|  |  |  | 34837dc,afa9001c | 
					
						
							|  |  |  | 34837e0,afa80018 | 
					
						
							|  |  |  | 34837e4,afbf0014 | 
					
						
							|  |  |  | 34837e8,860e001c | 
					
						
							|  |  |  | 34837ec,3e00008 | 
					
						
							|  |  |  | 34837f0,27bd0030 | 
					
						
							|  |  |  | 34837f4,27bdffd0 | 
					
						
							|  |  |  | 34837f8,afbf0014 | 
					
						
							|  |  |  | 34837fc,afa80018 | 
					
						
							|  |  |  | 3483800,afa9001c | 
					
						
							|  |  |  | 3483804,afaa0020 | 
					
						
							|  |  |  | 3483808,84a800a4 | 
					
						
							|  |  |  | 348380c,34090002 | 
					
						
							|  |  |  | 3483810,1509000c | 
					
						
							|  |  |  | 3483814,340a0006 | 
					
						
							|  |  |  | 3483818,80880003 | 
					
						
							|  |  |  | 348381c,150a0009 | 
					
						
							|  |  |  | 3483824,3c088012 | 
					
						
							|  |  |  | 3483828,2508a5d0 | 
					
						
							|  |  |  | 348382c,85090f20 | 
					
						
							|  |  |  | 3483830,31290040 | 
					
						
							|  |  |  | 3483834,11200003 | 
					
						
							|  |  |  | 348383c,c0083ad | 
					
						
							|  |  |  | 3483844,8faa0020 | 
					
						
							|  |  |  | 3483848,8fa9001c | 
					
						
							|  |  |  | 348384c,8fa80018 | 
					
						
							|  |  |  | 3483850,8fbf0014 | 
					
						
							|  |  |  | 3483854,8602001c | 
					
						
							|  |  |  | 3483858,3e00008 | 
					
						
							|  |  |  | 348385c,27bd0030 | 
					
						
							|  |  |  | 3483860,27bdffd0 | 
					
						
							|  |  |  | 3483864,afbf001c | 
					
						
							|  |  |  | 3483868,afa40020 | 
					
						
							|  |  |  | 348386c,afa50024 | 
					
						
							|  |  |  | 3483870,e7a00028 | 
					
						
							|  |  |  | 3483874,4602003c | 
					
						
							|  |  |  | 348387c,45010005 | 
					
						
							|  |  |  | 3483884,c100ec8 | 
					
						
							|  |  |  | 348388c,10000003 | 
					
						
							|  |  |  | 3483894,c100eca | 
					
						
							|  |  |  | 348389c,34060014 | 
					
						
							|  |  |  | 34838a0,3407000a | 
					
						
							|  |  |  | 34838a4,44801000 | 
					
						
							|  |  |  | 34838a8,c7a00028 | 
					
						
							|  |  |  | 34838ac,8fa50024 | 
					
						
							|  |  |  | 34838b0,8fa40020 | 
					
						
							|  |  |  | 34838b4,8fbf001c | 
					
						
							|  |  |  | 34838b8,4602003c | 
					
						
							|  |  |  | 34838bc,27bd0030 | 
					
						
							|  |  |  | 34838c0,3e00008 | 
					
						
							|  |  |  | 34838c8,27bdffd0 | 
					
						
							|  |  |  | 34838cc,afbf001c | 
					
						
							|  |  |  | 34838d0,afa40020 | 
					
						
							|  |  |  | 34838d4,afa50024 | 
					
						
							|  |  |  | 34838d8,e7a40028 | 
					
						
							|  |  |  | 34838dc,e7a6002c | 
					
						
							|  |  |  | 34838e0,4606203c | 
					
						
							|  |  |  | 34838e8,45000003 | 
					
						
							|  |  |  | 34838f0,c100ed5 | 
					
						
							|  |  |  | 34838f8,34060014 | 
					
						
							|  |  |  | 34838fc,3407000a | 
					
						
							|  |  |  | 3483900,44801000 | 
					
						
							|  |  |  | 3483904,c7a6002c | 
					
						
							|  |  |  | 3483908,c7a40028 | 
					
						
							|  |  |  | 348390c,8fa50024 | 
					
						
							|  |  |  | 3483910,8fa40020 | 
					
						
							|  |  |  | 3483914,8fbf001c | 
					
						
							|  |  |  | 3483918,4606203c | 
					
						
							|  |  |  | 348391c,27bd0030 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3483920,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3483928,c100f38 | 
					
						
							|  |  |  | 3483930,8fbf001c | 
					
						
							|  |  |  | 3483934,27bd0020 | 
					
						
							|  |  |  | 3483938,3e00008 | 
					
						
							|  |  |  | 3483944,27bdffe8 | 
					
						
							|  |  |  | 3483948,afbf0014 | 
					
						
							|  |  |  | 348394c,c008ab4 | 
					
						
							|  |  |  | 3483954,8fbf0014 | 
					
						
							|  |  |  | 3483958,27bd0018 | 
					
						
							|  |  |  | 348395c,8fa40018 | 
					
						
							|  |  |  | 3483960,8c8a0138 | 
					
						
							|  |  |  | 3483964,8d4a0010 | 
					
						
							|  |  |  | 3483968,25431618 | 
					
						
							|  |  |  | 348396c,3c088040 | 
					
						
							|  |  |  | 3483970,81083940 | 
					
						
							|  |  |  | 3483974,1100000a | 
					
						
							|  |  |  | 3483978,3c098012 | 
					
						
							|  |  |  | 348397c,2529a5d0 | 
					
						
							|  |  |  | 3483980,95281406 | 
					
						
							|  |  |  | 3483984,290105dc | 
					
						
							|  |  |  | 3483988,14200005 | 
					
						
							|  |  |  | 348398c,9488029c | 
					
						
							|  |  |  | 3483990,31080002 | 
					
						
							|  |  |  | 3483994,15000002 | 
					
						
							|  |  |  | 348399c,254314d0 | 
					
						
							|  |  |  | 34839a0,3e00008 | 
					
						
							|  |  |  | 34839a8,3c188012 | 
					
						
							|  |  |  | 34839ac,2718a5d0 | 
					
						
							|  |  |  | 34839b0,8f180004 | 
					
						
							|  |  |  | 34839b4,17000003 | 
					
						
							|  |  |  | 34839bc,3c0a8041 | 
					
						
							|  |  |  | 34839c0,254ab4d8 | 
					
						
							|  |  |  | 34839c4,24780008 | 
					
						
							|  |  |  | 34839c8,3e00008 | 
					
						
							|  |  |  | 34839cc,adf802c0 | 
					
						
							|  |  |  | 34839d0,3c0f8012 | 
					
						
							|  |  |  | 34839d4,25efa5d0 | 
					
						
							|  |  |  | 34839d8,8def0004 | 
					
						
							|  |  |  | 34839dc,15e00003 | 
					
						
							|  |  |  | 34839e4,3c0e8041 | 
					
						
							|  |  |  | 34839e8,25ceb4d8 | 
					
						
							|  |  |  | 34839ec,ac4e0004 | 
					
						
							|  |  |  | 34839f0,3e00008 | 
					
						
							|  |  |  | 34839f4,820f013f | 
					
						
							|  |  |  | 34839fc,3c088040 | 
					
						
							|  |  |  | 3483a00,810839f8 | 
					
						
							|  |  |  | 3483a04,11000007 | 
					
						
							|  |  |  | 3483a08,3c09801d | 
					
						
							|  |  |  | 3483a0c,252984a0 | 
					
						
							|  |  |  | 3483a10,8d281d44 | 
					
						
							|  |  |  | 3483a14,31080002 | 
					
						
							|  |  |  | 3483a18,11000002 | 
					
						
							|  |  |  | 3483a20,34069100 | 
					
						
							|  |  |  | 3483a24,3e00008 | 
					
						
							|  |  |  | 3483a28,afa60020 | 
					
						
							|  |  |  | 3483a2c,3c088040 | 
					
						
							|  |  |  | 3483a30,810839f8 | 
					
						
							|  |  |  | 3483a34,11000005 | 
					
						
							|  |  |  | 3483a38,3c09801d | 
					
						
							|  |  |  | 3483a3c,252984a0 | 
					
						
							|  |  |  | 3483a40,8d281d44 | 
					
						
							|  |  |  | 3483a44,35080002 | 
					
						
							|  |  |  | 3483a48,ad281d44 | 
					
						
							|  |  |  | 3483a4c,3e00008 | 
					
						
							|  |  |  | 3483a50,34e74000 | 
					
						
							|  |  |  | 3483a58,3c038012 | 
					
						
							|  |  |  | 3483a5c,2463a5d0 | 
					
						
							|  |  |  | 3483a60,8c6e0004 | 
					
						
							|  |  |  | 3483a64,15c0000c | 
					
						
							|  |  |  | 3483a68,24020005 | 
					
						
							|  |  |  | 3483a6c,24020011 | 
					
						
							|  |  |  | 3483a70,3c088040 | 
					
						
							|  |  |  | 3483a74,81083a54 | 
					
						
							|  |  |  | 3483a78,11000007 | 
					
						
							|  |  |  | 3483a7c,3c09801d | 
					
						
							|  |  |  | 3483a80,252984a0 | 
					
						
							|  |  |  | 3483a84,8d281d44 | 
					
						
							|  |  |  | 3483a88,31080002 | 
					
						
							|  |  |  | 3483a8c,11000002 | 
					
						
							|  |  |  | 3483a90,34020001 | 
					
						
							|  |  |  | 3483a94,34020003 | 
					
						
							|  |  |  | 3483a98,3e00008 | 
					
						
							|  |  |  | 3483a9c,3c048010 | 
					
						
							|  |  |  | 3483aa0,3c088040 | 
					
						
							|  |  |  | 3483aa4,81083a54 | 
					
						
							|  |  |  | 3483aa8,11000005 | 
					
						
							|  |  |  | 3483aac,3c09801d | 
					
						
							|  |  |  | 3483ab0,252984a0 | 
					
						
							|  |  |  | 3483ab4,8d281d44 | 
					
						
							|  |  |  | 3483ab8,35080002 | 
					
						
							|  |  |  | 3483abc,ad281d44 | 
					
						
							|  |  |  | 3483ac0,3e00008 | 
					
						
							|  |  |  | 3483ac4,34e78000 | 
					
						
							|  |  |  | 3483ac8,27bdffe8 | 
					
						
							|  |  |  | 3483acc,afa20010 | 
					
						
							|  |  |  | 3483ad0,afbf0014 | 
					
						
							|  |  |  | 3483ad4,c102166 | 
					
						
							|  |  |  | 3483ad8,46000306 | 
					
						
							|  |  |  | 3483adc,406821 | 
					
						
							|  |  |  | 3483ae0,8fa20010 | 
					
						
							|  |  |  | 3483ae4,8fbf0014 | 
					
						
							|  |  |  | 3483ae8,3e00008 | 
					
						
							|  |  |  | 3483aec,27bd0018 | 
					
						
							|  |  |  | 3483af0,ac800130 | 
					
						
							|  |  |  | 3483af4,ac800134 | 
					
						
							|  |  |  | 3483af8,3c018012 | 
					
						
							|  |  |  | 3483afc,2421a5d0 | 
					
						
							|  |  |  | 3483b00,80280edc | 
					
						
							|  |  |  | 3483b04,35080008 | 
					
						
							|  |  |  | 3483b08,a0280edc | 
					
						
							|  |  |  | 3483b0c,3c013f80 | 
					
						
							|  |  |  | 3483b10,3e00008 | 
					
						
							|  |  |  | 3483b14,44813000 | 
					
						
							|  |  |  | 3483b20,3e00008 | 
					
						
							|  |  |  | 3483b28,3c028041 | 
					
						
							|  |  |  | 3483b2c,8c43a270 | 
					
						
							|  |  |  | 3483b30,3c028041 | 
					
						
							|  |  |  | 3483b34,24429fe2 | 
					
						
							|  |  |  | 3483b38,14620004 | 
					
						
							|  |  |  | 3483b3c,3c038041 | 
					
						
							|  |  |  | 3483b40,3c028041 | 
					
						
							|  |  |  | 3483b44,24429fe4 | 
					
						
							|  |  |  | 3483b48,ac62a270 | 
					
						
							|  |  |  | 3483b4c,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3483b54,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3483b58,8c43a270 | 
					
						
							|  |  |  | 3483b5c,3c028041 | 
					
						
							|  |  |  | 3483b60,24429fc8 | 
					
						
							|  |  |  | 3483b64,10620003 | 
					
						
							|  |  |  | 3483b68,3c028041 | 
					
						
							|  |  |  | 3483b6c,10000003 | 
					
						
							|  |  |  | 3483b70,24429fe8 | 
					
						
							|  |  |  | 3483b74,3c028041 | 
					
						
							|  |  |  | 3483b78,24429fca | 
					
						
							|  |  |  | 3483b7c,3c038041 | 
					
						
							|  |  |  | 3483b80,3e00008 | 
					
						
							|  |  |  | 3483b84,ac62a270 | 
					
						
							|  |  |  | 3483b88,27bdffc8 | 
					
						
							|  |  |  | 3483b8c,afbf0034 | 
					
						
							|  |  |  | 3483b90,afb40030 | 
					
						
							|  |  |  | 3483b94,afb3002c | 
					
						
							|  |  |  | 3483b98,afb20028 | 
					
						
							|  |  |  | 3483b9c,afb10024 | 
					
						
							|  |  |  | 3483ba0,afb00020 | 
					
						
							|  |  |  | 3483ba4,809025 | 
					
						
							|  |  |  | 3483ba8,3c02801c | 
					
						
							|  |  |  | 3483bac,344284a0 | 
					
						
							|  |  |  | 3483bb0,3c030001 | 
					
						
							|  |  |  | 3483bb4,431021 | 
					
						
							|  |  |  | 3483bb8,90420745 | 
					
						
							|  |  |  | 3483bbc,240300aa | 
					
						
							|  |  |  | 3483bc0,14430002 | 
					
						
							|  |  |  | 3483bc4,a08825 | 
					
						
							|  |  |  | 3483bc8,240200ff | 
					
						
							|  |  |  | 3483bcc,3c03801c | 
					
						
							|  |  |  | 3483bd0,346384a0 | 
					
						
							|  |  |  | 3483bd4,8c700000 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3483bd8,8e0302b0 | 
					
						
							|  |  |  | 3483bdc,24640008 | 
					
						
							|  |  |  | 3483be0,ae0402b0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3483be4,3c04de00 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3483be8,ac640000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3483bec,3c048041 | 
					
						
							|  |  |  | 3483bf0,2484a488 | 
					
						
							|  |  |  | 3483bf4,ac640004 | 
					
						
							|  |  |  | 3483bf8,8e0302b0 | 
					
						
							|  |  |  | 3483bfc,24640008 | 
					
						
							|  |  |  | 3483c00,ae0402b0 | 
					
						
							|  |  |  | 3483c04,3c04e700 | 
					
						
							|  |  |  | 3483c08,ac640000 | 
					
						
							|  |  |  | 3483c0c,ac600004 | 
					
						
							|  |  |  | 3483c10,8e0302b0 | 
					
						
							|  |  |  | 3483c14,24640008 | 
					
						
							|  |  |  | 3483c18,ae0402b0 | 
					
						
							|  |  |  | 3483c1c,3c04fc11 | 
					
						
							|  |  |  | 3483c20,34849623 | 
					
						
							|  |  |  | 3483c24,ac640000 | 
					
						
							|  |  |  | 3483c28,3c04ff2f | 
					
						
							|  |  |  | 3483c2c,3484ffff | 
					
						
							|  |  |  | 3483c30,ac640004 | 
					
						
							|  |  |  | 3483c34,8e0402b0 | 
					
						
							|  |  |  | 3483c38,24830008 | 
					
						
							|  |  |  | 3483c3c,ae0302b0 | 
					
						
							|  |  |  | 3483c40,3c03fa00 | 
					
						
							|  |  |  | 3483c44,ac830000 | 
					
						
							|  |  |  | 3483c48,401825 | 
					
						
							|  |  |  | 3483c4c,c2102b | 
					
						
							|  |  |  | 3483c50,10400002 | 
					
						
							|  |  |  | 3483c54,261302a8 | 
					
						
							|  |  |  | 3483c58,c01825 | 
					
						
							|  |  |  | 3483c5c,2402ff00 | 
					
						
							|  |  |  | 3483c60,621825 | 
					
						
							|  |  |  | 3483c64,ac830004 | 
					
						
							|  |  |  | 3483c68,24070001 | 
					
						
							|  |  |  | 3483c6c,24060009 | 
					
						
							|  |  |  | 3483c70,3c148041 | 
					
						
							|  |  |  | 3483c74,2685a448 | 
					
						
							|  |  |  | 3483c78,c101bdf | 
					
						
							|  |  |  | 3483c7c,2602025 | 
					
						
							|  |  |  | 3483c80,24020010 | 
					
						
							|  |  |  | 3483c84,afa20018 | 
					
						
							|  |  |  | 3483c88,afa20014 | 
					
						
							|  |  |  | 3483c8c,263100bd | 
					
						
							|  |  |  | 3483c90,afb10010 | 
					
						
							|  |  |  | 3483c94,2647001b | 
					
						
							|  |  |  | 3483c98,3025 | 
					
						
							|  |  |  | 3483c9c,2685a448 | 
					
						
							|  |  |  | 3483ca0,c101c47 | 
					
						
							|  |  |  | 3483ca4,2602025 | 
					
						
							|  |  |  | 3483ca8,8e0202b0 | 
					
						
							|  |  |  | 3483cac,24430008 | 
					
						
							|  |  |  | 3483cb0,ae0302b0 | 
					
						
							|  |  |  | 3483cb4,3c03e700 | 
					
						
							|  |  |  | 3483cb8,ac430000 | 
					
						
							|  |  |  | 3483cbc,ac400004 | 
					
						
							|  |  |  | 3483cc0,8fbf0034 | 
					
						
							|  |  |  | 3483cc4,8fb40030 | 
					
						
							|  |  |  | 3483cc8,8fb3002c | 
					
						
							|  |  |  | 3483ccc,8fb20028 | 
					
						
							|  |  |  | 3483cd0,8fb10024 | 
					
						
							|  |  |  | 3483cd4,8fb00020 | 
					
						
							|  |  |  | 3483cd8,3e00008 | 
					
						
							|  |  |  | 3483cdc,27bd0038 | 
					
						
							|  |  |  | 3483ce0,3c028041 | 
					
						
							|  |  |  | 3483ce4,8c43a270 | 
					
						
							|  |  |  | 3483ce8,3c028041 | 
					
						
							|  |  |  | 3483cec,24429fc8 | 
					
						
							|  |  |  | 3483cf0,10620021 | 
					
						
							|  |  |  | 3483cf8,27bdffe8 | 
					
						
							|  |  |  | 3483cfc,afbf0014 | 
					
						
							|  |  |  | 3483d00,90660000 | 
					
						
							|  |  |  | 3483d04,90620001 | 
					
						
							|  |  |  | 3483d08,22600 | 
					
						
							|  |  |  | 3483d0c,42603 | 
					
						
							|  |  |  | 3483d10,42183 | 
					
						
							|  |  |  | 3483d14,3042003f | 
					
						
							|  |  |  | 3483d18,21040 | 
					
						
							|  |  |  | 3483d1c,3c038041 | 
					
						
							|  |  |  | 3483d20,24639fc8 | 
					
						
							|  |  |  | 3483d24,621021 | 
					
						
							|  |  |  | 3483d28,3c038041 | 
					
						
							|  |  |  | 3483d2c,ac62a270 | 
					
						
							|  |  |  | 3483d30,3c02801c | 
					
						
							|  |  |  | 3483d34,344284a0 | 
					
						
							|  |  |  | 3483d38,944300a4 | 
					
						
							|  |  |  | 3483d3c,28620011 | 
					
						
							|  |  |  | 3483d40,10400008 | 
					
						
							|  |  |  | 3483d44,2825 | 
					
						
							|  |  |  | 3483d48,3c028011 | 
					
						
							|  |  |  | 3483d4c,3442a5d0 | 
					
						
							|  |  |  | 3483d50,431021 | 
					
						
							|  |  |  | 3483d54,804500bc | 
					
						
							|  |  |  | 3483d58,52fc3 | 
					
						
							|  |  |  | 3483d5c,30a50011 | 
					
						
							|  |  |  | 3483d60,24a5ffef | 
					
						
							|  |  |  | 3483d64,c100ee2 | 
					
						
							|  |  |  | 3483d6c,8fbf0014 | 
					
						
							|  |  |  | 3483d70,3e00008 | 
					
						
							|  |  |  | 3483d74,27bd0018 | 
					
						
							|  |  |  | 3483d78,3e00008 | 
					
						
							|  |  |  | 3483d80,27bdffd8 | 
					
						
							|  |  |  | 3483d84,afbf0024 | 
					
						
							|  |  |  | 3483d88,afb20020 | 
					
						
							|  |  |  | 3483d8c,afb1001c | 
					
						
							|  |  |  | 3483d90,afb00018 | 
					
						
							|  |  |  | 3483d94,808025 | 
					
						
							|  |  |  | 3483d98,909101e9 | 
					
						
							|  |  |  | 3483d9c,3c028040 | 
					
						
							|  |  |  | 3483da0,8c432704 | 
					
						
							|  |  |  | 3483da4,10600018 | 
					
						
							|  |  |  | 3483da8,2201025 | 
					
						
							|  |  |  | 3483dac,9487001c | 
					
						
							|  |  |  | 3483db0,73943 | 
					
						
							|  |  |  | 3483db4,30e7007f | 
					
						
							|  |  |  | 3483db8,3c02801c | 
					
						
							|  |  |  | 3483dbc,344284a0 | 
					
						
							|  |  |  | 3483dc0,904600a5 | 
					
						
							|  |  |  | 3483dc4,802825 | 
					
						
							|  |  |  | 3483dc8,c1019e1 | 
					
						
							|  |  |  | 3483dcc,27a40010 | 
					
						
							|  |  |  | 3483dd0,97b20014 | 
					
						
							|  |  |  | 3483dd4,1240000c | 
					
						
							|  |  |  | 3483dd8,2201025 | 
					
						
							|  |  |  | 3483ddc,c101edc | 
					
						
							|  |  |  | 3483de0,93a40017 | 
					
						
							|  |  |  | 3483de4,54400004 | 
					
						
							|  |  |  | 3483de8,90420007 | 
					
						
							|  |  |  | 3483dec,c101edc | 
					
						
							|  |  |  | 3483df0,2402025 | 
					
						
							|  |  |  | 3483df4,90420007 | 
					
						
							|  |  |  | 3483df8,30510001 | 
					
						
							|  |  |  | 3483dfc,56200001 | 
					
						
							|  |  |  | 3483e00,24110005 | 
					
						
							|  |  |  | 3483e04,30420002 | 
					
						
							|  |  |  | 3483e08,a21101ec | 
					
						
							|  |  |  | 3483e0c,a20201ed | 
					
						
							|  |  |  | 3483e10,8fbf0024 | 
					
						
							|  |  |  | 3483e14,8fb20020 | 
					
						
							|  |  |  | 3483e18,8fb1001c | 
					
						
							|  |  |  | 3483e1c,8fb00018 | 
					
						
							|  |  |  | 3483e20,3e00008 | 
					
						
							|  |  |  | 3483e24,27bd0028 | 
					
						
							|  |  |  | 3483e28,27bdffd8 | 
					
						
							|  |  |  | 3483e2c,afbf0024 | 
					
						
							|  |  |  | 3483e30,afb10020 | 
					
						
							|  |  |  | 3483e34,afb0001c | 
					
						
							|  |  |  | 3483e38,3c02801c | 
					
						
							|  |  |  | 3483e3c,344284a0 | 
					
						
							|  |  |  | 3483e40,94500020 | 
					
						
							|  |  |  | 3483e44,3c02801d | 
					
						
							|  |  |  | 3483e48,3442aa30 | 
					
						
							|  |  |  | 3483e4c,8c42066c | 
					
						
							|  |  |  | 3483e50,3c033000 | 
					
						
							|  |  |  | 3483e54,24630483 | 
					
						
							|  |  |  | 3483e58,431024 | 
					
						
							|  |  |  | 3483e5c,544000ab | 
					
						
							|  |  |  | 3483e60,8fbf0024 | 
					
						
							|  |  |  | 3483e64,3c02801c | 
					
						
							|  |  |  | 3483e68,344284a0 | 
					
						
							|  |  |  | 3483e6c,8c430008 | 
					
						
							|  |  |  | 3483e70,3c02800f | 
					
						
							|  |  |  | 3483e74,8c4213ec | 
					
						
							|  |  |  | 3483e78,546200a4 | 
					
						
							|  |  |  | 3483e7c,8fbf0024 | 
					
						
							|  |  |  | 3483e80,3c028011 | 
					
						
							|  |  |  | 3483e84,3442a5d0 | 
					
						
							|  |  |  | 3483e88,8c42135c | 
					
						
							|  |  |  | 3483e8c,5440009f | 
					
						
							|  |  |  | 3483e90,8fbf0024 | 
					
						
							|  |  |  | 3483e94,3c02800e | 
					
						
							|  |  |  | 3483e98,3442f1b0 | 
					
						
							|  |  |  | 3483e9c,8c420000 | 
					
						
							|  |  |  | 3483ea0,30420020 | 
					
						
							|  |  |  | 3483ea4,54400099 | 
					
						
							|  |  |  | 3483ea8,8fbf0024 | 
					
						
							|  |  |  | 3483eac,3c028011 | 
					
						
							|  |  |  | 3483eb0,3442a5d0 | 
					
						
							|  |  |  | 3483eb4,8c42009c | 
					
						
							|  |  |  | 3483eb8,3c036000 | 
					
						
							|  |  |  | 3483ebc,431024 | 
					
						
							|  |  |  | 3483ec0,10400007 | 
					
						
							|  |  |  | 3483ec4,3c028011 | 
					
						
							|  |  |  | 3483ec8,3442a5d0 | 
					
						
							|  |  |  | 3483ecc,8c420004 | 
					
						
							|  |  |  | 3483ed0,50400010 | 
					
						
							|  |  |  | 3483ed4,32020200 | 
					
						
							|  |  |  | 3483ed8,10000085 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3483edc,3c028011 | 
					
						
							|  |  |  | 3483ee0,3442a5d0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3483ee4,8042007b | 
					
						
							|  |  |  | 3483ee8,24030007 | 
					
						
							|  |  |  | 3483eec,10430003 | 
					
						
							|  |  |  | 3483ef0,24030008 | 
					
						
							|  |  |  | 3483ef4,14430085 | 
					
						
							|  |  |  | 3483ef8,8fbf0024 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3483efc,3c028011 | 
					
						
							|  |  |  | 3483f00,3442a5d0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3483f04,8c420004 | 
					
						
							|  |  |  | 3483f08,54400053 | 
					
						
							|  |  |  | 3483f0c,32100400 | 
					
						
							|  |  |  | 3483f10,32020200 | 
					
						
							|  |  |  | 3483f14,10400026 | 
					
						
							|  |  |  | 3483f18,3211ffff | 
					
						
							|  |  |  | 3483f1c,3c028011 | 
					
						
							|  |  |  | 3483f20,3442a5d0 | 
					
						
							|  |  |  | 3483f24,9442009c | 
					
						
							|  |  |  | 3483f28,30422000 | 
					
						
							|  |  |  | 3483f2c,50400021 | 
					
						
							|  |  |  | 3483f30,32310100 | 
					
						
							|  |  |  | 3483f34,3c028011 | 
					
						
							|  |  |  | 3483f38,3442a5d0 | 
					
						
							|  |  |  | 3483f3c,94420070 | 
					
						
							|  |  |  | 3483f40,3042f000 | 
					
						
							|  |  |  | 3483f44,38422000 | 
					
						
							|  |  |  | 3483f48,2102b | 
					
						
							|  |  |  | 3483f4c,24420001 | 
					
						
							|  |  |  | 3483f50,3c048011 | 
					
						
							|  |  |  | 3483f54,3484a5d0 | 
					
						
							|  |  |  | 3483f58,21300 | 
					
						
							|  |  |  | 3483f5c,94830070 | 
					
						
							|  |  |  | 3483f60,30630fff | 
					
						
							|  |  |  | 3483f64,621025 | 
					
						
							|  |  |  | 3483f68,a4820070 | 
					
						
							|  |  |  | 3483f6c,3c04801d | 
					
						
							|  |  |  | 3483f70,3485aa30 | 
					
						
							|  |  |  | 3483f74,3c028007 | 
					
						
							|  |  |  | 3483f78,34429764 | 
					
						
							|  |  |  | 3483f7c,40f809 | 
					
						
							|  |  |  | 3483f80,248484a0 | 
					
						
							|  |  |  | 3483f84,3c058010 | 
					
						
							|  |  |  | 3483f88,24a243a8 | 
					
						
							|  |  |  | 3483f8c,afa20014 | 
					
						
							|  |  |  | 3483f90,24a743a0 | 
					
						
							|  |  |  | 3483f94,afa70010 | 
					
						
							|  |  |  | 3483f98,24060004 | 
					
						
							|  |  |  | 3483f9c,24a54394 | 
					
						
							|  |  |  | 3483fa0,3c02800c | 
					
						
							|  |  |  | 3483fa4,3442806c | 
					
						
							|  |  |  | 3483fa8,40f809 | 
					
						
							|  |  |  | 3483fac,24040835 | 
					
						
							|  |  |  | 3483fb0,32310100 | 
					
						
							|  |  |  | 3483fb4,52200028 | 
					
						
							|  |  |  | 3483fb8,32100400 | 
					
						
							|  |  |  | 3483fbc,3c028011 | 
					
						
							|  |  |  | 3483fc0,3442a5d0 | 
					
						
							|  |  |  | 3483fc4,9442009c | 
					
						
							|  |  |  | 3483fc8,30424000 | 
					
						
							|  |  |  | 3483fcc,50400022 | 
					
						
							|  |  |  | 3483fd0,32100400 | 
					
						
							|  |  |  | 3483fd4,3c028011 | 
					
						
							|  |  |  | 3483fd8,3442a5d0 | 
					
						
							|  |  |  | 3483fdc,94420070 | 
					
						
							|  |  |  | 3483fe0,3042f000 | 
					
						
							|  |  |  | 3483fe4,24033000 | 
					
						
							|  |  |  | 3483fe8,50430002 | 
					
						
							|  |  |  | 3483fec,24040001 | 
					
						
							|  |  |  | 3483ff0,24040003 | 
					
						
							|  |  |  | 3483ff4,3c038011 | 
					
						
							|  |  |  | 3483ff8,3463a5d0 | 
					
						
							|  |  |  | 3483ffc,42300 | 
					
						
							|  |  |  | 3484000,94620070 | 
					
						
							|  |  |  | 3484004,30420fff | 
					
						
							|  |  |  | 3484008,441025 | 
					
						
							|  |  |  | 348400c,a4620070 | 
					
						
							|  |  |  | 3484010,3c04801d | 
					
						
							|  |  |  | 3484014,3485aa30 | 
					
						
							|  |  |  | 3484018,3c028007 | 
					
						
							|  |  |  | 348401c,34429764 | 
					
						
							|  |  |  | 3484020,40f809 | 
					
						
							|  |  |  | 3484024,248484a0 | 
					
						
							|  |  |  | 3484028,3c058010 | 
					
						
							|  |  |  | 348402c,24a243a8 | 
					
						
							|  |  |  | 3484030,afa20014 | 
					
						
							|  |  |  | 3484034,24a743a0 | 
					
						
							|  |  |  | 3484038,afa70010 | 
					
						
							|  |  |  | 348403c,24060004 | 
					
						
							|  |  |  | 3484040,24a54394 | 
					
						
							|  |  |  | 3484044,3c02800c | 
					
						
							|  |  |  | 3484048,3442806c | 
					
						
							|  |  |  | 348404c,40f809 | 
					
						
							|  |  |  | 3484050,24040835 | 
					
						
							|  |  |  | 3484054,32100400 | 
					
						
							|  |  |  | 3484058,1200002c | 
					
						
							|  |  |  | 348405c,8fbf0024 | 
					
						
							|  |  |  | 3484060,3c02801c | 
					
						
							|  |  |  | 3484064,344284a0 | 
					
						
							|  |  |  | 3484068,3c030001 | 
					
						
							|  |  |  | 348406c,431021 | 
					
						
							|  |  |  | 3484070,94420934 | 
					
						
							|  |  |  | 3484074,14400026 | 
					
						
							|  |  |  | 3484078,8fb10020 | 
					
						
							|  |  |  | 348407c,3c028011 | 
					
						
							|  |  |  | 3484080,3442a5d0 | 
					
						
							|  |  |  | 3484084,9046007b | 
					
						
							|  |  |  | 3484088,24c2fff9 | 
					
						
							|  |  |  | 348408c,304200ff | 
					
						
							|  |  |  | 3484090,2c420002 | 
					
						
							|  |  |  | 3484094,1040001f | 
					
						
							|  |  |  | 3484098,8fb0001c | 
					
						
							|  |  |  | 348409c,3c02801c | 
					
						
							|  |  |  | 34840a0,344284a0 | 
					
						
							|  |  |  | 34840a4,431021 | 
					
						
							|  |  |  | 34840a8,90420758 | 
					
						
							|  |  |  | 34840ac,14400019 | 
					
						
							|  |  |  | 34840b0,3c02801d | 
					
						
							|  |  |  | 34840b4,3442aa30 | 
					
						
							|  |  |  | 34840b8,8c42066c | 
					
						
							|  |  |  | 34840bc,3c0308a0 | 
					
						
							|  |  |  | 34840c0,24630800 | 
					
						
							|  |  |  | 34840c4,431024 | 
					
						
							|  |  |  | 34840c8,14400012 | 
					
						
							|  |  |  | 34840cc,24070002 | 
					
						
							|  |  |  | 34840d0,3c04801d | 
					
						
							|  |  |  | 34840d4,3485aa30 | 
					
						
							|  |  |  | 34840d8,3c028038 | 
					
						
							|  |  |  | 34840dc,3442c9a0 | 
					
						
							|  |  |  | 34840e0,40f809 | 
					
						
							|  |  |  | 34840e4,248484a0 | 
					
						
							|  |  |  | 34840e8,10000008 | 
					
						
							|  |  |  | 34840ec,8fbf0024 | 
					
						
							|  |  |  | 34840f0,3442a5d0 | 
					
						
							|  |  |  | 34840f4,8042007b | 
					
						
							|  |  |  | 34840f8,24030007 | 
					
						
							|  |  |  | 34840fc,1043ffd5 | 
					
						
							|  |  |  | 3484100,24030008 | 
					
						
							|  |  |  | 3484104,1043ffd3 | 
					
						
							|  |  |  | 3484108,8fbf0024 | 
					
						
							|  |  |  | 348410c,8fb10020 | 
					
						
							|  |  |  | 3484110,8fb0001c | 
					
						
							|  |  |  | 3484114,3e00008 | 
					
						
							|  |  |  | 3484118,27bd0028 | 
					
						
							|  |  |  | 348411c,3c028011 | 
					
						
							|  |  |  | 3484120,3442a5d0 | 
					
						
							|  |  |  | 3484124,8c42009c | 
					
						
							|  |  |  | 3484128,3c036000 | 
					
						
							|  |  |  | 348412c,431024 | 
					
						
							|  |  |  | 3484130,10400006 | 
					
						
							|  |  |  | 3484134,3c028011 | 
					
						
							|  |  |  | 3484138,3442a5d0 | 
					
						
							|  |  |  | 348413c,8c420004 | 
					
						
							|  |  |  | 3484140,1040000a | 
					
						
							|  |  |  | 3484144,3c028040 | 
					
						
							|  |  |  | 3484148,3c028011 | 
					
						
							|  |  |  | 348414c,3442a5d0 | 
					
						
							|  |  |  | 3484150,9042007b | 
					
						
							|  |  |  | 3484154,2442fff9 | 
					
						
							|  |  |  | 3484158,304200ff | 
					
						
							|  |  |  | 348415c,2c420002 | 
					
						
							|  |  |  | 3484160,10400123 | 
					
						
							|  |  |  | 3484168,3c028040 | 
					
						
							|  |  |  | 348416c,9042088a | 
					
						
							|  |  |  | 3484170,1040011f | 
					
						
							|  |  |  | 3484178,27bdffc8 | 
					
						
							|  |  |  | 348417c,afbf0034 | 
					
						
							|  |  |  | 3484180,afb30030 | 
					
						
							|  |  |  | 3484184,afb2002c | 
					
						
							|  |  |  | 3484188,afb10028 | 
					
						
							|  |  |  | 348418c,afb00024 | 
					
						
							|  |  |  | 3484190,3c02801c | 
					
						
							|  |  |  | 3484194,344284a0 | 
					
						
							|  |  |  | 3484198,8c500000 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348419c,8e0302b0 | 
					
						
							|  |  |  | 34841a0,24640008 | 
					
						
							|  |  |  | 34841a4,ae0402b0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34841a8,3c04de00 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34841ac,ac640000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34841b0,3c048041 | 
					
						
							|  |  |  | 34841b4,2484a488 | 
					
						
							|  |  |  | 34841b8,ac640004 | 
					
						
							|  |  |  | 34841bc,8e0302b0 | 
					
						
							|  |  |  | 34841c0,24640008 | 
					
						
							|  |  |  | 34841c4,ae0402b0 | 
					
						
							|  |  |  | 34841c8,3c04e700 | 
					
						
							|  |  |  | 34841cc,ac640000 | 
					
						
							|  |  |  | 34841d0,ac600004 | 
					
						
							|  |  |  | 34841d4,8e0302b0 | 
					
						
							|  |  |  | 34841d8,24640008 | 
					
						
							|  |  |  | 34841dc,ae0402b0 | 
					
						
							|  |  |  | 34841e0,3c04fc11 | 
					
						
							|  |  |  | 34841e4,34849623 | 
					
						
							|  |  |  | 34841e8,ac640000 | 
					
						
							|  |  |  | 34841ec,3c04ff2f | 
					
						
							|  |  |  | 34841f0,3484ffff | 
					
						
							|  |  |  | 34841f4,ac640004 | 
					
						
							|  |  |  | 34841f8,3c030001 | 
					
						
							|  |  |  | 34841fc,431021 | 
					
						
							|  |  |  | 3484200,94520744 | 
					
						
							|  |  |  | 3484204,240200aa | 
					
						
							|  |  |  | 3484208,124200e0 | 
					
						
							|  |  |  | 348420c,24070001 | 
					
						
							|  |  |  | 3484210,261102a8 | 
					
						
							|  |  |  | 3484214,8e0202b0 | 
					
						
							|  |  |  | 3484218,24430008 | 
					
						
							|  |  |  | 348421c,ae0302b0 | 
					
						
							|  |  |  | 3484220,3c03fa00 | 
					
						
							|  |  |  | 3484224,ac430000 | 
					
						
							|  |  |  | 3484228,2403ff00 | 
					
						
							|  |  |  | 348422c,2431825 | 
					
						
							|  |  |  | 3484230,ac430004 | 
					
						
							|  |  |  | 3484234,3025 | 
					
						
							|  |  |  | 3484238,3c138041 | 
					
						
							|  |  |  | 348423c,2665a428 | 
					
						
							|  |  |  | 3484240,c101bdf | 
					
						
							|  |  |  | 3484244,2202025 | 
					
						
							|  |  |  | 3484248,24020010 | 
					
						
							|  |  |  | 348424c,afa20018 | 
					
						
							|  |  |  | 3484250,afa20014 | 
					
						
							|  |  |  | 3484254,24020040 | 
					
						
							|  |  |  | 3484258,afa20010 | 
					
						
							|  |  |  | 348425c,2407010f | 
					
						
							|  |  |  | 3484260,3025 | 
					
						
							|  |  |  | 3484264,2665a428 | 
					
						
							|  |  |  | 3484268,c101c47 | 
					
						
							|  |  |  | 348426c,2202025 | 
					
						
							|  |  |  | 3484270,240200ff | 
					
						
							|  |  |  | 3484274,16420023 | 
					
						
							|  |  |  | 3484278,3c028011 | 
					
						
							|  |  |  | 348427c,3c02801d | 
					
						
							|  |  |  | 3484280,3442aa30 | 
					
						
							|  |  |  | 3484284,8c42066c | 
					
						
							|  |  |  | 3484288,3c033000 | 
					
						
							|  |  |  | 348428c,24630483 | 
					
						
							|  |  |  | 3484290,431024 | 
					
						
							|  |  |  | 3484294,10400009 | 
					
						
							|  |  |  | 3484298,3c02801c | 
					
						
							|  |  |  | 348429c,8e0202b0 | 
					
						
							|  |  |  | 34842a0,24430008 | 
					
						
							|  |  |  | 34842a4,ae0302b0 | 
					
						
							|  |  |  | 34842a8,3c03fa00 | 
					
						
							|  |  |  | 34842ac,ac430000 | 
					
						
							|  |  |  | 34842b0,2403ff46 | 
					
						
							|  |  |  | 34842b4,10000012 | 
					
						
							|  |  |  | 34842b8,ac430004 | 
					
						
							|  |  |  | 34842bc,344284a0 | 
					
						
							|  |  |  | 34842c0,8c430008 | 
					
						
							|  |  |  | 34842c4,3c02800f | 
					
						
							|  |  |  | 34842c8,8c4213ec | 
					
						
							|  |  |  | 34842cc,5462fff4 | 
					
						
							|  |  |  | 34842d0,8e0202b0 | 
					
						
							|  |  |  | 34842d4,3c028011 | 
					
						
							|  |  |  | 34842d8,3442a5d0 | 
					
						
							|  |  |  | 34842dc,8c42135c | 
					
						
							|  |  |  | 34842e0,5440ffef | 
					
						
							|  |  |  | 34842e4,8e0202b0 | 
					
						
							|  |  |  | 34842e8,3c02800e | 
					
						
							|  |  |  | 34842ec,3442f1b0 | 
					
						
							|  |  |  | 34842f0,8c420000 | 
					
						
							|  |  |  | 34842f4,30420020 | 
					
						
							|  |  |  | 34842f8,5440ffe9 | 
					
						
							|  |  |  | 34842fc,8e0202b0 | 
					
						
							|  |  |  | 3484300,3c028011 | 
					
						
							|  |  |  | 3484304,3442a5d0 | 
					
						
							|  |  |  | 3484308,9442009c | 
					
						
							|  |  |  | 348430c,30422000 | 
					
						
							|  |  |  | 3484310,1040002a | 
					
						
							|  |  |  | 3484314,3c028011 | 
					
						
							|  |  |  | 3484318,3442a5d0 | 
					
						
							|  |  |  | 348431c,8c420004 | 
					
						
							|  |  |  | 3484320,14400054 | 
					
						
							|  |  |  | 3484324,3c028011 | 
					
						
							|  |  |  | 3484328,24070001 | 
					
						
							|  |  |  | 348432c,24060045 | 
					
						
							|  |  |  | 3484330,3c058041 | 
					
						
							|  |  |  | 3484334,24a5a458 | 
					
						
							|  |  |  | 3484338,c101bdf | 
					
						
							|  |  |  | 348433c,2202025 | 
					
						
							|  |  |  | 3484340,3c028011 | 
					
						
							|  |  |  | 3484344,3442a5d0 | 
					
						
							|  |  |  | 3484348,94420070 | 
					
						
							|  |  |  | 348434c,3042f000 | 
					
						
							|  |  |  | 3484350,24032000 | 
					
						
							|  |  |  | 3484354,5443000e | 
					
						
							|  |  |  | 3484358,2402000c | 
					
						
							|  |  |  | 348435c,24020010 | 
					
						
							|  |  |  | 3484360,afa20018 | 
					
						
							|  |  |  | 3484364,afa20014 | 
					
						
							|  |  |  | 3484368,24020040 | 
					
						
							|  |  |  | 348436c,afa20010 | 
					
						
							|  |  |  | 3484370,24070102 | 
					
						
							|  |  |  | 3484374,3025 | 
					
						
							|  |  |  | 3484378,3c058041 | 
					
						
							|  |  |  | 348437c,24a5a458 | 
					
						
							|  |  |  | 3484380,c101c47 | 
					
						
							|  |  |  | 3484384,2202025 | 
					
						
							|  |  |  | 3484388,1000000c | 
					
						
							|  |  |  | 348438c,3c028011 | 
					
						
							|  |  |  | 3484390,afa20018 | 
					
						
							|  |  |  | 3484394,afa20014 | 
					
						
							|  |  |  | 3484398,24020042 | 
					
						
							|  |  |  | 348439c,afa20010 | 
					
						
							|  |  |  | 34843a0,24070104 | 
					
						
							|  |  |  | 34843a4,3025 | 
					
						
							|  |  |  | 34843a8,3c058041 | 
					
						
							|  |  |  | 34843ac,24a5a458 | 
					
						
							|  |  |  | 34843b0,c101c47 | 
					
						
							|  |  |  | 34843b4,2202025 | 
					
						
							|  |  |  | 34843b8,3c028011 | 
					
						
							|  |  |  | 34843bc,3442a5d0 | 
					
						
							|  |  |  | 34843c0,9442009c | 
					
						
							|  |  |  | 34843c4,30424000 | 
					
						
							|  |  |  | 34843c8,1040002a | 
					
						
							|  |  |  | 34843cc,3c028011 | 
					
						
							|  |  |  | 34843d0,3442a5d0 | 
					
						
							|  |  |  | 34843d4,8c420004 | 
					
						
							|  |  |  | 34843d8,14400026 | 
					
						
							|  |  |  | 34843dc,3c028011 | 
					
						
							|  |  |  | 34843e0,24070001 | 
					
						
							|  |  |  | 34843e4,24060046 | 
					
						
							|  |  |  | 34843e8,3c058041 | 
					
						
							|  |  |  | 34843ec,24a5a458 | 
					
						
							|  |  |  | 34843f0,c101bdf | 
					
						
							|  |  |  | 34843f4,2202025 | 
					
						
							|  |  |  | 34843f8,3c028011 | 
					
						
							|  |  |  | 34843fc,3442a5d0 | 
					
						
							|  |  |  | 3484400,94420070 | 
					
						
							|  |  |  | 3484404,3042f000 | 
					
						
							|  |  |  | 3484408,24033000 | 
					
						
							|  |  |  | 348440c,5443000e | 
					
						
							|  |  |  | 3484410,2402000c | 
					
						
							|  |  |  | 3484414,24020010 | 
					
						
							|  |  |  | 3484418,afa20018 | 
					
						
							|  |  |  | 348441c,afa20014 | 
					
						
							|  |  |  | 3484420,24020040 | 
					
						
							|  |  |  | 3484424,afa20010 | 
					
						
							|  |  |  | 3484428,2407011b | 
					
						
							|  |  |  | 348442c,3025 | 
					
						
							|  |  |  | 3484430,3c058041 | 
					
						
							|  |  |  | 3484434,24a5a458 | 
					
						
							|  |  |  | 3484438,c101c47 | 
					
						
							|  |  |  | 348443c,2202025 | 
					
						
							|  |  |  | 3484440,1000000c | 
					
						
							|  |  |  | 3484444,3c028011 | 
					
						
							|  |  |  | 3484448,afa20018 | 
					
						
							|  |  |  | 348444c,afa20014 | 
					
						
							|  |  |  | 3484450,24020042 | 
					
						
							|  |  |  | 3484454,afa20010 | 
					
						
							|  |  |  | 3484458,2407011d | 
					
						
							|  |  |  | 348445c,3025 | 
					
						
							|  |  |  | 3484460,3c058041 | 
					
						
							|  |  |  | 3484464,24a5a458 | 
					
						
							|  |  |  | 3484468,c101c47 | 
					
						
							|  |  |  | 348446c,2202025 | 
					
						
							|  |  |  | 3484470,3c028011 | 
					
						
							|  |  |  | 3484474,3442a5d0 | 
					
						
							|  |  |  | 3484478,9042007b | 
					
						
							|  |  |  | 348447c,2442fff9 | 
					
						
							|  |  |  | 3484480,304200ff | 
					
						
							|  |  |  | 3484484,2c420002 | 
					
						
							|  |  |  | 3484488,50400034 | 
					
						
							|  |  |  | 348448c,8e0202b0 | 
					
						
							|  |  |  | 3484490,240200ff | 
					
						
							|  |  |  | 3484494,1642001f | 
					
						
							|  |  |  | 3484498,24070001 | 
					
						
							|  |  |  | 348449c,3c02801c | 
					
						
							|  |  |  | 34844a0,344284a0 | 
					
						
							|  |  |  | 34844a4,3c030001 | 
					
						
							|  |  |  | 34844a8,431021 | 
					
						
							|  |  |  | 34844ac,94420934 | 
					
						
							|  |  |  | 34844b0,10400009 | 
					
						
							|  |  |  | 34844b4,3c02801c | 
					
						
							|  |  |  | 34844b8,8e0202b0 | 
					
						
							|  |  |  | 34844bc,24430008 | 
					
						
							|  |  |  | 34844c0,ae0302b0 | 
					
						
							|  |  |  | 34844c4,3c03fa00 | 
					
						
							|  |  |  | 34844c8,ac430000 | 
					
						
							|  |  |  | 34844cc,2403ff46 | 
					
						
							|  |  |  | 34844d0,1000000f | 
					
						
							|  |  |  | 34844d4,ac430004 | 
					
						
							|  |  |  | 34844d8,344284a0 | 
					
						
							|  |  |  | 34844dc,3c030001 | 
					
						
							|  |  |  | 34844e0,431021 | 
					
						
							|  |  |  | 34844e4,90420758 | 
					
						
							|  |  |  | 34844e8,5440fff4 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34844ec,8e0202b0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34844f0,3c02801d | 
					
						
							|  |  |  | 34844f4,3442aa30 | 
					
						
							|  |  |  | 34844f8,8c42066c | 
					
						
							|  |  |  | 34844fc,3c0308a0 | 
					
						
							|  |  |  | 3484500,24630800 | 
					
						
							|  |  |  | 3484504,431024 | 
					
						
							|  |  |  | 3484508,5440ffec | 
					
						
							|  |  |  | 348450c,8e0202b0 | 
					
						
							|  |  |  | 3484510,24070001 | 
					
						
							|  |  |  | 3484514,3c028011 | 
					
						
							|  |  |  | 3484518,3442a5d0 | 
					
						
							|  |  |  | 348451c,8046007b | 
					
						
							|  |  |  | 3484520,3c128041 | 
					
						
							|  |  |  | 3484524,2645a458 | 
					
						
							|  |  |  | 3484528,c101bdf | 
					
						
							|  |  |  | 348452c,2202025 | 
					
						
							|  |  |  | 3484530,2402000c | 
					
						
							|  |  |  | 3484534,afa20018 | 
					
						
							|  |  |  | 3484538,afa20014 | 
					
						
							|  |  |  | 348453c,2402004d | 
					
						
							|  |  |  | 3484540,afa20010 | 
					
						
							|  |  |  | 3484544,24070111 | 
					
						
							|  |  |  | 3484548,3025 | 
					
						
							|  |  |  | 348454c,2645a458 | 
					
						
							|  |  |  | 3484550,c101c47 | 
					
						
							|  |  |  | 3484554,2202025 | 
					
						
							|  |  |  | 3484558,8e0202b0 | 
					
						
							|  |  |  | 348455c,24430008 | 
					
						
							|  |  |  | 3484560,ae0302b0 | 
					
						
							|  |  |  | 3484564,3c03e700 | 
					
						
							|  |  |  | 3484568,ac430000 | 
					
						
							|  |  |  | 348456c,ac400004 | 
					
						
							|  |  |  | 3484570,8fbf0034 | 
					
						
							|  |  |  | 3484574,8fb30030 | 
					
						
							|  |  |  | 3484578,8fb2002c | 
					
						
							|  |  |  | 348457c,8fb10028 | 
					
						
							|  |  |  | 3484580,8fb00024 | 
					
						
							|  |  |  | 3484584,3e00008 | 
					
						
							|  |  |  | 3484588,27bd0038 | 
					
						
							|  |  |  | 348458c,261102a8 | 
					
						
							|  |  |  | 3484590,8e0202b0 | 
					
						
							|  |  |  | 3484594,24430008 | 
					
						
							|  |  |  | 3484598,ae0302b0 | 
					
						
							|  |  |  | 348459c,3c03fa00 | 
					
						
							|  |  |  | 34845a0,ac430000 | 
					
						
							|  |  |  | 34845a4,2403ffff | 
					
						
							|  |  |  | 34845a8,ac430004 | 
					
						
							|  |  |  | 34845ac,3025 | 
					
						
							|  |  |  | 34845b0,3c128041 | 
					
						
							|  |  |  | 34845b4,2645a428 | 
					
						
							|  |  |  | 34845b8,c101bdf | 
					
						
							|  |  |  | 34845bc,2202025 | 
					
						
							|  |  |  | 34845c0,24020010 | 
					
						
							|  |  |  | 34845c4,afa20018 | 
					
						
							|  |  |  | 34845c8,afa20014 | 
					
						
							|  |  |  | 34845cc,24020040 | 
					
						
							|  |  |  | 34845d0,afa20010 | 
					
						
							|  |  |  | 34845d4,2407010f | 
					
						
							|  |  |  | 34845d8,3025 | 
					
						
							|  |  |  | 34845dc,2645a428 | 
					
						
							|  |  |  | 34845e0,c101c47 | 
					
						
							|  |  |  | 34845e4,2202025 | 
					
						
							|  |  |  | 34845e8,1000ff24 | 
					
						
							|  |  |  | 34845ec,241200ff | 
					
						
							|  |  |  | 34845f0,3e00008 | 
					
						
							|  |  |  | 34845f8,3c028041 | 
					
						
							|  |  |  | 34845fc,8c42b4bc | 
					
						
							|  |  |  | 3484600,10400274 | 
					
						
							|  |  |  | 3484604,3c02801c | 
					
						
							|  |  |  | 3484608,27bdff90 | 
					
						
							|  |  |  | 348460c,afbf006c | 
					
						
							|  |  |  | 3484610,afbe0068 | 
					
						
							|  |  |  | 3484614,afb70064 | 
					
						
							|  |  |  | 3484618,afb60060 | 
					
						
							|  |  |  | 348461c,afb5005c | 
					
						
							|  |  |  | 3484620,afb40058 | 
					
						
							|  |  |  | 3484624,afb30054 | 
					
						
							|  |  |  | 3484628,afb20050 | 
					
						
							|  |  |  | 348462c,afb1004c | 
					
						
							|  |  |  | 3484630,afb00048 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3484634,344284a0 | 
					
						
							|  |  |  | 3484638,3c030001 | 
					
						
							|  |  |  | 348463c,431021 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3484640,94430934 | 
					
						
							|  |  |  | 3484644,24020006 | 
					
						
							|  |  |  | 3484648,14620256 | 
					
						
							|  |  |  | 348464c,808025 | 
					
						
							|  |  |  | 3484650,3c02801c | 
					
						
							|  |  |  | 3484654,344284a0 | 
					
						
							|  |  |  | 3484658,3c030001 | 
					
						
							|  |  |  | 348465c,431021 | 
					
						
							|  |  |  | 3484660,94420948 | 
					
						
							|  |  |  | 3484664,1440024f | 
					
						
							|  |  |  | 3484668,3c02801c | 
					
						
							|  |  |  | 348466c,344284a0 | 
					
						
							|  |  |  | 3484670,431021 | 
					
						
							|  |  |  | 3484674,94420944 | 
					
						
							|  |  |  | 3484678,1440024a | 
					
						
							|  |  |  | 348467c,3c02801c | 
					
						
							|  |  |  | 3484680,344284a0 | 
					
						
							|  |  |  | 3484684,84420014 | 
					
						
							|  |  |  | 3484688,4430247 | 
					
						
							|  |  |  | 348468c,8fbf006c | 
					
						
							|  |  |  | 3484690,8c820004 | 
					
						
							|  |  |  | 3484694,24430008 | 
					
						
							|  |  |  | 3484698,ac830008 | 
					
						
							|  |  |  | 348469c,3c03de00 | 
					
						
							|  |  |  | 34846a0,ac430000 | 
					
						
							|  |  |  | 34846a4,3c038041 | 
					
						
							|  |  |  | 34846a8,2463a488 | 
					
						
							|  |  |  | 34846ac,ac430004 | 
					
						
							|  |  |  | 34846b0,3c028011 | 
					
						
							|  |  |  | 34846b4,3442a5d0 | 
					
						
							|  |  |  | 34846b8,94430f2e | 
					
						
							|  |  |  | 34846bc,3c028041 | 
					
						
							|  |  |  | 34846c0,8c42b4b8 | 
					
						
							|  |  |  | 34846c4,10400012 | 
					
						
							|  |  |  | 34846c8,3025 | 
					
						
							|  |  |  | 34846cc,3c028041 | 
					
						
							|  |  |  | 34846d0,8c42b554 | 
					
						
							|  |  |  | 34846d4,10400010 | 
					
						
							|  |  |  | 34846d8,24060001 | 
					
						
							|  |  |  | 34846dc,30620001 | 
					
						
							|  |  |  | 34846e0,54400006 | 
					
						
							|  |  |  | 34846e4,30630002 | 
					
						
							|  |  |  | 34846e8,3c028041 | 
					
						
							|  |  |  | 34846ec,8c42b554 | 
					
						
							|  |  |  | 34846f0,1040000c | 
					
						
							|  |  |  | 34846f4,3025 | 
					
						
							|  |  |  | 34846f8,30630002 | 
					
						
							|  |  |  | 34846fc,24020001 | 
					
						
							|  |  |  | 3484700,1460000a | 
					
						
							|  |  |  | 3484704,afa2003c | 
					
						
							|  |  |  | 3484708,10000008 | 
					
						
							|  |  |  | 348470c,afa0003c | 
					
						
							|  |  |  | 3484710,10000006 | 
					
						
							|  |  |  | 3484714,afa0003c | 
					
						
							|  |  |  | 3484718,24020001 | 
					
						
							|  |  |  | 348471c,10000003 | 
					
						
							|  |  |  | 3484720,afa2003c | 
					
						
							|  |  |  | 3484724,24020001 | 
					
						
							|  |  |  | 3484728,afa2003c | 
					
						
							|  |  |  | 348472c,3c028041 | 
					
						
							|  |  |  | 3484730,8c55b560 | 
					
						
							|  |  |  | 3484734,12a00007 | 
					
						
							|  |  |  | 3484738,2a01825 | 
					
						
							|  |  |  | 348473c,3c028041 | 
					
						
							|  |  |  | 3484740,9442a43c | 
					
						
							|  |  |  | 3484744,21840 | 
					
						
							|  |  |  | 3484748,621821 | 
					
						
							|  |  |  | 348474c,31840 | 
					
						
							|  |  |  | 3484750,24630001 | 
					
						
							|  |  |  | 3484754,3c028041 | 
					
						
							|  |  |  | 3484758,9442a43c | 
					
						
							|  |  |  | 348475c,210c0 | 
					
						
							|  |  |  | 3484760,24420057 | 
					
						
							|  |  |  | 3484764,431021 | 
					
						
							|  |  |  | 3484768,24030140 | 
					
						
							|  |  |  | 348476c,621823 | 
					
						
							|  |  |  | 3484770,38fc2 | 
					
						
							|  |  |  | 3484774,2238821 | 
					
						
							|  |  |  | 3484778,118843 | 
					
						
							|  |  |  | 348477c,26230001 | 
					
						
							|  |  |  | 3484780,afa30038 | 
					
						
							|  |  |  | 3484784,8e030008 | 
					
						
							|  |  |  | 3484788,24640008 | 
					
						
							|  |  |  | 348478c,ae040008 | 
					
						
							|  |  |  | 3484790,3c04fcff | 
					
						
							|  |  |  | 3484794,3484ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3484798,ac640000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348479c,3c04fffd | 
					
						
							|  |  |  | 34847a0,3484f6fb | 
					
						
							|  |  |  | 34847a4,ac640004 | 
					
						
							|  |  |  | 34847a8,8e030008 | 
					
						
							|  |  |  | 34847ac,24640008 | 
					
						
							|  |  |  | 34847b0,ae040008 | 
					
						
							|  |  |  | 34847b4,3c04fa00 | 
					
						
							|  |  |  | 34847b8,ac640000 | 
					
						
							|  |  |  | 34847bc,240400d0 | 
					
						
							|  |  |  | 34847c0,ac640004 | 
					
						
							|  |  |  | 34847c4,511021 | 
					
						
							|  |  |  | 34847c8,21380 | 
					
						
							|  |  |  | 34847cc,3c0300ff | 
					
						
							|  |  |  | 34847d0,3463f000 | 
					
						
							|  |  |  | 34847d4,431024 | 
					
						
							|  |  |  | 34847d8,3c04e400 | 
					
						
							|  |  |  | 34847dc,2484039c | 
					
						
							|  |  |  | 34847e0,441025 | 
					
						
							|  |  |  | 34847e4,afa20020 | 
					
						
							|  |  |  | 34847e8,111380 | 
					
						
							|  |  |  | 34847ec,431024 | 
					
						
							|  |  |  | 34847f0,34420024 | 
					
						
							|  |  |  | 34847f4,afa20024 | 
					
						
							|  |  |  | 34847f8,3c02e100 | 
					
						
							|  |  |  | 34847fc,afa20028 | 
					
						
							|  |  |  | 3484800,afa0002c | 
					
						
							|  |  |  | 3484804,3c02f100 | 
					
						
							|  |  |  | 3484808,afa20030 | 
					
						
							|  |  |  | 348480c,3c020400 | 
					
						
							|  |  |  | 3484810,24420400 | 
					
						
							|  |  |  | 3484814,afa20034 | 
					
						
							|  |  |  | 3484818,27a20020 | 
					
						
							|  |  |  | 348481c,27a70038 | 
					
						
							|  |  |  | 3484820,8e030008 | 
					
						
							|  |  |  | 3484824,24640008 | 
					
						
							|  |  |  | 3484828,ae040008 | 
					
						
							|  |  |  | 348482c,8c450004 | 
					
						
							|  |  |  | 3484830,8c440000 | 
					
						
							|  |  |  | 3484834,ac650004 | 
					
						
							|  |  |  | 3484838,24420008 | 
					
						
							|  |  |  | 348483c,14e2fff8 | 
					
						
							|  |  |  | 3484840,ac640000 | 
					
						
							|  |  |  | 3484844,8e020008 | 
					
						
							|  |  |  | 3484848,24430008 | 
					
						
							|  |  |  | 348484c,ae030008 | 
					
						
							|  |  |  | 3484850,3c03e700 | 
					
						
							|  |  |  | 3484854,ac430000 | 
					
						
							|  |  |  | 3484858,ac400004 | 
					
						
							|  |  |  | 348485c,8e020008 | 
					
						
							|  |  |  | 3484860,24430008 | 
					
						
							|  |  |  | 3484864,ae030008 | 
					
						
							|  |  |  | 3484868,3c03fc11 | 
					
						
							|  |  |  | 348486c,34639623 | 
					
						
							|  |  |  | 3484870,ac430000 | 
					
						
							|  |  |  | 3484874,3c03ff2f | 
					
						
							|  |  |  | 3484878,3463ffff | 
					
						
							|  |  |  | 348487c,10c0004c | 
					
						
							|  |  |  | 3484880,ac430004 | 
					
						
							|  |  |  | 3484884,3c058041 | 
					
						
							|  |  |  | 3484888,24a5a468 | 
					
						
							|  |  |  | 348488c,94a70008 | 
					
						
							|  |  |  | 3484890,3025 | 
					
						
							|  |  |  | 3484894,c101bdf | 
					
						
							|  |  |  | 3484898,2002025 | 
					
						
							|  |  |  | 348489c,3c028041 | 
					
						
							|  |  |  | 34848a0,8c42b4c0 | 
					
						
							|  |  |  | 34848a4,18400042 | 
					
						
							|  |  |  | 34848a8,3c028041 | 
					
						
							|  |  |  | 34848ac,3c128041 | 
					
						
							|  |  |  | 34848b0,2652a298 | 
					
						
							|  |  |  | 34848b4,2414000a | 
					
						
							|  |  |  | 34848b8,9825 | 
					
						
							|  |  |  | 34848bc,3c1e8041 | 
					
						
							|  |  |  | 34848c0,3c168041 | 
					
						
							|  |  |  | 34848c4,26d6a274 | 
					
						
							|  |  |  | 34848c8,2442a284 | 
					
						
							|  |  |  | 34848cc,afa20040 | 
					
						
							|  |  |  | 34848d0,3c028041 | 
					
						
							|  |  |  | 34848d4,2442a468 | 
					
						
							|  |  |  | 34848d8,afa20044 | 
					
						
							|  |  |  | 34848dc,3c178041 | 
					
						
							|  |  |  | 34848e0,8fc2b558 | 
					
						
							|  |  |  | 34848e4,5040000b | 
					
						
							|  |  |  | 34848e8,92420000 | 
					
						
							|  |  |  | 34848ec,92430000 | 
					
						
							|  |  |  | 34848f0,3c028011 | 
					
						
							|  |  |  | 34848f4,3442a5d0 | 
					
						
							|  |  |  | 34848f8,431021 | 
					
						
							|  |  |  | 34848fc,904200a8 | 
					
						
							|  |  |  | 3484900,21042 | 
					
						
							|  |  |  | 3484904,30420001 | 
					
						
							|  |  |  | 3484908,50400024 | 
					
						
							|  |  |  | 348490c,26730001 | 
					
						
							|  |  |  | 3484910,92420000 | 
					
						
							|  |  |  | 3484914,561021 | 
					
						
							|  |  |  | 3484918,80460000 | 
					
						
							|  |  |  | 348491c,28c20003 | 
					
						
							|  |  |  | 3484920,5440001e | 
					
						
							|  |  |  | 3484924,26730001 | 
					
						
							|  |  |  | 3484928,24c6fffd | 
					
						
							|  |  |  | 348492c,61840 | 
					
						
							|  |  |  | 3484930,661821 | 
					
						
							|  |  |  | 3484934,8fa20040 | 
					
						
							|  |  |  | 3484938,621821 | 
					
						
							|  |  |  | 348493c,90620000 | 
					
						
							|  |  |  | 3484940,21600 | 
					
						
							|  |  |  | 3484944,90640002 | 
					
						
							|  |  |  | 3484948,42200 | 
					
						
							|  |  |  | 348494c,441025 | 
					
						
							|  |  |  | 3484950,90630001 | 
					
						
							|  |  |  | 3484954,31c00 | 
					
						
							|  |  |  | 3484958,431025 | 
					
						
							|  |  |  | 348495c,344200ff | 
					
						
							|  |  |  | 3484960,8e030008 | 
					
						
							|  |  |  | 3484964,24640008 | 
					
						
							|  |  |  | 3484968,ae040008 | 
					
						
							|  |  |  | 348496c,3c04fa00 | 
					
						
							|  |  |  | 3484970,ac640000 | 
					
						
							|  |  |  | 3484974,ac620004 | 
					
						
							|  |  |  | 3484978,24020010 | 
					
						
							|  |  |  | 348497c,afa20018 | 
					
						
							|  |  |  | 3484980,afa20014 | 
					
						
							|  |  |  | 3484984,afb40010 | 
					
						
							|  |  |  | 3484988,8fa70038 | 
					
						
							|  |  |  | 348498c,8fa50044 | 
					
						
							|  |  |  | 3484990,c101c47 | 
					
						
							|  |  |  | 3484994,2002025 | 
					
						
							|  |  |  | 3484998,26730001 | 
					
						
							|  |  |  | 348499c,2652000c | 
					
						
							|  |  |  | 34849a0,8ee2b4c0 | 
					
						
							|  |  |  | 34849a4,262102a | 
					
						
							|  |  |  | 34849a8,1440ffcd | 
					
						
							|  |  |  | 34849ac,26940011 | 
					
						
							|  |  |  | 34849b0,8e020008 | 
					
						
							|  |  |  | 34849b4,24430008 | 
					
						
							|  |  |  | 34849b8,ae030008 | 
					
						
							|  |  |  | 34849bc,3c03fa00 | 
					
						
							|  |  |  | 34849c0,ac430000 | 
					
						
							|  |  |  | 34849c4,2403ffff | 
					
						
							|  |  |  | 34849c8,ac430004 | 
					
						
							|  |  |  | 34849cc,8fa2003c | 
					
						
							|  |  |  | 34849d0,10400037 | 
					
						
							|  |  |  | 34849d4,3c028041 | 
					
						
							|  |  |  | 34849d8,3c058041 | 
					
						
							|  |  |  | 34849dc,24a5a478 | 
					
						
							|  |  |  | 34849e0,94a70008 | 
					
						
							|  |  |  | 34849e4,3025 | 
					
						
							|  |  |  | 34849e8,c101bdf | 
					
						
							|  |  |  | 34849ec,2002025 | 
					
						
							|  |  |  | 34849f0,3c028041 | 
					
						
							|  |  |  | 34849f4,8c42b4c0 | 
					
						
							|  |  |  | 34849f8,18400168 | 
					
						
							|  |  |  | 34849fc,3c1e8041 | 
					
						
							|  |  |  | 3484a00,3c128041 | 
					
						
							|  |  |  | 3484a04,2652a298 | 
					
						
							|  |  |  | 3484a08,2414000a | 
					
						
							|  |  |  | 3484a0c,9825 | 
					
						
							|  |  |  | 3484a10,3c168041 | 
					
						
							|  |  |  | 3484a14,26d6a274 | 
					
						
							|  |  |  | 3484a18,3c028041 | 
					
						
							|  |  |  | 3484a1c,2442a478 | 
					
						
							|  |  |  | 3484a20,afa20040 | 
					
						
							|  |  |  | 3484a24,3c028011 | 
					
						
							|  |  |  | 3484a28,3442a5d0 | 
					
						
							|  |  |  | 3484a2c,afa2003c | 
					
						
							|  |  |  | 3484a30,3c178041 | 
					
						
							|  |  |  | 3484a34,8fc2b558 | 
					
						
							|  |  |  | 3484a38,10400009 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3484a3c,92420000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3484a40,8fa3003c | 
					
						
							|  |  |  | 3484a44,621021 | 
					
						
							|  |  |  | 3484a48,904200a8 | 
					
						
							|  |  |  | 3484a4c,21042 | 
					
						
							|  |  |  | 3484a50,30420001 | 
					
						
							|  |  |  | 3484a54,50400010 | 
					
						
							|  |  |  | 3484a58,26730001 | 
					
						
							|  |  |  | 3484a5c,92420000 | 
					
						
							|  |  |  | 3484a60,561021 | 
					
						
							|  |  |  | 3484a64,80460000 | 
					
						
							|  |  |  | 3484a68,2cc20003 | 
					
						
							|  |  |  | 3484a6c,5040000a | 
					
						
							|  |  |  | 3484a70,26730001 | 
					
						
							|  |  |  | 3484a74,24020010 | 
					
						
							|  |  |  | 3484a78,afa20018 | 
					
						
							|  |  |  | 3484a7c,afa20014 | 
					
						
							|  |  |  | 3484a80,afb40010 | 
					
						
							|  |  |  | 3484a84,8fa70038 | 
					
						
							|  |  |  | 3484a88,8fa50040 | 
					
						
							|  |  |  | 3484a8c,c101c47 | 
					
						
							|  |  |  | 3484a90,2002025 | 
					
						
							|  |  |  | 3484a94,26730001 | 
					
						
							|  |  |  | 3484a98,2652000c | 
					
						
							|  |  |  | 3484a9c,8ee2b4c0 | 
					
						
							|  |  |  | 3484aa0,262102a | 
					
						
							|  |  |  | 3484aa4,1440ffe3 | 
					
						
							|  |  |  | 3484aa8,26940011 | 
					
						
							|  |  |  | 3484aac,3c028041 | 
					
						
							|  |  |  | 3484ab0,8c42b4c0 | 
					
						
							|  |  |  | 3484ab4,18400010 | 
					
						
							|  |  |  | 3484ab8,26310012 | 
					
						
							|  |  |  | 3484abc,3c128041 | 
					
						
							|  |  |  | 3484ac0,2652a29a | 
					
						
							|  |  |  | 3484ac4,2414000b | 
					
						
							|  |  |  | 3484ac8,9825 | 
					
						
							|  |  |  | 3484acc,3c168041 | 
					
						
							|  |  |  | 3484ad0,2803025 | 
					
						
							|  |  |  | 3484ad4,2202825 | 
					
						
							|  |  |  | 3484ad8,c102561 | 
					
						
							|  |  |  | 3484adc,2402025 | 
					
						
							|  |  |  | 3484ae0,26730001 | 
					
						
							|  |  |  | 3484ae4,2652000c | 
					
						
							|  |  |  | 3484ae8,8ec2b4c0 | 
					
						
							|  |  |  | 3484aec,262102a | 
					
						
							|  |  |  | 3484af0,1440fff7 | 
					
						
							|  |  |  | 3484af4,26940011 | 
					
						
							|  |  |  | 3484af8,3c028041 | 
					
						
							|  |  |  | 3484afc,9456a43c | 
					
						
							|  |  |  | 3484b00,16b0c0 | 
					
						
							|  |  |  | 3484b04,26d60001 | 
					
						
							|  |  |  | 3484b08,2d1b021 | 
					
						
							|  |  |  | 3484b0c,24070001 | 
					
						
							|  |  |  | 3484b10,24060011 | 
					
						
							|  |  |  | 3484b14,3c058041 | 
					
						
							|  |  |  | 3484b18,24a5a448 | 
					
						
							|  |  |  | 3484b1c,c101bdf | 
					
						
							|  |  |  | 3484b20,2002025 | 
					
						
							|  |  |  | 3484b24,3c028041 | 
					
						
							|  |  |  | 3484b28,8c42b4c0 | 
					
						
							|  |  |  | 3484b2c,18400024 | 
					
						
							|  |  |  | 3484b30,241e3000 | 
					
						
							|  |  |  | 3484b34,3c118041 | 
					
						
							|  |  |  | 3484b38,2631a298 | 
					
						
							|  |  |  | 3484b3c,2413000b | 
					
						
							|  |  |  | 3484b40,9025 | 
					
						
							|  |  |  | 3484b44,3c178011 | 
					
						
							|  |  |  | 3484b48,36f7a5d0 | 
					
						
							|  |  |  | 3484b4c,3c148041 | 
					
						
							|  |  |  | 3484b50,82220001 | 
					
						
							|  |  |  | 3484b54,4430015 | 
					
						
							|  |  |  | 3484b58,26520001 | 
					
						
							|  |  |  | 3484b5c,92220000 | 
					
						
							|  |  |  | 3484b60,2e21021 | 
					
						
							|  |  |  | 3484b64,904200bc | 
					
						
							|  |  |  | 3484b68,21e00 | 
					
						
							|  |  |  | 3484b6c,31e03 | 
					
						
							|  |  |  | 3484b70,2863000a | 
					
						
							|  |  |  | 3484b74,50600001 | 
					
						
							|  |  |  | 3484b78,24020009 | 
					
						
							|  |  |  | 3484b7c,21e00 | 
					
						
							|  |  |  | 3484b80,31e03 | 
					
						
							|  |  |  | 3484b84,4620001 | 
					
						
							|  |  |  | 3484b88,1025 | 
					
						
							|  |  |  | 3484b8c,a7be0020 | 
					
						
							|  |  |  | 3484b90,24420030 | 
					
						
							|  |  |  | 3484b94,a3a20020 | 
					
						
							|  |  |  | 3484b98,2603025 | 
					
						
							|  |  |  | 3484b9c,2c02825 | 
					
						
							|  |  |  | 3484ba0,c102561 | 
					
						
							|  |  |  | 3484ba4,27a40020 | 
					
						
							|  |  |  | 3484ba8,26520001 | 
					
						
							|  |  |  | 3484bac,2631000c | 
					
						
							|  |  |  | 3484bb0,8e82b4c0 | 
					
						
							|  |  |  | 3484bb4,242102a | 
					
						
							|  |  |  | 3484bb8,1440ffe5 | 
					
						
							|  |  |  | 3484bbc,26730011 | 
					
						
							|  |  |  | 3484bc0,26de0011 | 
					
						
							|  |  |  | 3484bc4,24070001 | 
					
						
							|  |  |  | 3484bc8,2406000e | 
					
						
							|  |  |  | 3484bcc,3c058041 | 
					
						
							|  |  |  | 3484bd0,24a5a448 | 
					
						
							|  |  |  | 3484bd4,c101bdf | 
					
						
							|  |  |  | 3484bd8,2002025 | 
					
						
							|  |  |  | 3484bdc,3c028041 | 
					
						
							|  |  |  | 3484be0,8c42b4c0 | 
					
						
							|  |  |  | 3484be4,18400027 | 
					
						
							|  |  |  | 3484be8,3c028041 | 
					
						
							|  |  |  | 3484bec,3c118041 | 
					
						
							|  |  |  | 3484bf0,2631a298 | 
					
						
							|  |  |  | 3484bf4,2413000a | 
					
						
							|  |  |  | 3484bf8,9025 | 
					
						
							|  |  |  | 3484bfc,3c178011 | 
					
						
							|  |  |  | 3484c00,36f7a5d0 | 
					
						
							|  |  |  | 3484c04,2442a448 | 
					
						
							|  |  |  | 3484c08,afa20038 | 
					
						
							|  |  |  | 3484c0c,3c148041 | 
					
						
							|  |  |  | 3484c10,92230000 | 
					
						
							|  |  |  | 3484c14,2404000d | 
					
						
							|  |  |  | 3484c18,14640002 | 
					
						
							|  |  |  | 3484c1c,2201025 | 
					
						
							|  |  |  | 3484c20,2403000a | 
					
						
							|  |  |  | 3484c24,90420001 | 
					
						
							|  |  |  | 3484c28,30420040 | 
					
						
							|  |  |  | 3484c2c,50400010 | 
					
						
							|  |  |  | 3484c30,26520001 | 
					
						
							|  |  |  | 3484c34,2e31821 | 
					
						
							|  |  |  | 3484c38,906200a8 | 
					
						
							|  |  |  | 3484c3c,30420001 | 
					
						
							|  |  |  | 3484c40,5040000b | 
					
						
							|  |  |  | 3484c44,26520001 | 
					
						
							|  |  |  | 3484c48,24020010 | 
					
						
							|  |  |  | 3484c4c,afa20018 | 
					
						
							|  |  |  | 3484c50,afa20014 | 
					
						
							|  |  |  | 3484c54,afb30010 | 
					
						
							|  |  |  | 3484c58,3c03825 | 
					
						
							|  |  |  | 3484c5c,3025 | 
					
						
							|  |  |  | 3484c60,8fa50038 | 
					
						
							|  |  |  | 3484c64,c101c47 | 
					
						
							|  |  |  | 3484c68,2002025 | 
					
						
							|  |  |  | 3484c6c,26520001 | 
					
						
							|  |  |  | 3484c70,2631000c | 
					
						
							|  |  |  | 3484c74,8e82b4c0 | 
					
						
							|  |  |  | 3484c78,242102a | 
					
						
							|  |  |  | 3484c7c,1440ffe4 | 
					
						
							|  |  |  | 3484c80,26730011 | 
					
						
							|  |  |  | 3484c84,24070001 | 
					
						
							|  |  |  | 3484c88,2406000a | 
					
						
							|  |  |  | 3484c8c,3c058041 | 
					
						
							|  |  |  | 3484c90,24a5a448 | 
					
						
							|  |  |  | 3484c94,c101bdf | 
					
						
							|  |  |  | 3484c98,2002025 | 
					
						
							|  |  |  | 3484c9c,3c028041 | 
					
						
							|  |  |  | 3484ca0,8c42b4c0 | 
					
						
							|  |  |  | 3484ca4,18400022 | 
					
						
							|  |  |  | 3484ca8,3c028041 | 
					
						
							|  |  |  | 3484cac,3c118041 | 
					
						
							|  |  |  | 3484cb0,2631a299 | 
					
						
							|  |  |  | 3484cb4,2413000a | 
					
						
							|  |  |  | 3484cb8,9025 | 
					
						
							|  |  |  | 3484cbc,3c178011 | 
					
						
							|  |  |  | 3484cc0,36f7a5d0 | 
					
						
							|  |  |  | 3484cc4,2442a448 | 
					
						
							|  |  |  | 3484cc8,afa20038 | 
					
						
							|  |  |  | 3484ccc,3c148041 | 
					
						
							|  |  |  | 3484cd0,92220000 | 
					
						
							|  |  |  | 3484cd4,30420020 | 
					
						
							|  |  |  | 3484cd8,50400010 | 
					
						
							|  |  |  | 3484cdc,26520001 | 
					
						
							|  |  |  | 3484ce0,8ee200a4 | 
					
						
							|  |  |  | 3484ce4,3c030040 | 
					
						
							|  |  |  | 3484ce8,431024 | 
					
						
							|  |  |  | 3484cec,5040000b | 
					
						
							|  |  |  | 3484cf0,26520001 | 
					
						
							|  |  |  | 3484cf4,24020010 | 
					
						
							|  |  |  | 3484cf8,afa20018 | 
					
						
							|  |  |  | 3484cfc,afa20014 | 
					
						
							|  |  |  | 3484d00,afb30010 | 
					
						
							|  |  |  | 3484d04,3c03825 | 
					
						
							|  |  |  | 3484d08,3025 | 
					
						
							|  |  |  | 3484d0c,8fa50038 | 
					
						
							|  |  |  | 3484d10,c101c47 | 
					
						
							|  |  |  | 3484d14,2002025 | 
					
						
							|  |  |  | 3484d18,26520001 | 
					
						
							|  |  |  | 3484d1c,2631000c | 
					
						
							|  |  |  | 3484d20,8e82b4c0 | 
					
						
							|  |  |  | 3484d24,242102a | 
					
						
							|  |  |  | 3484d28,1440ffe9 | 
					
						
							|  |  |  | 3484d2c,26730011 | 
					
						
							|  |  |  | 3484d30,26de0022 | 
					
						
							|  |  |  | 3484d34,24070001 | 
					
						
							|  |  |  | 3484d38,24060010 | 
					
						
							|  |  |  | 3484d3c,3c058041 | 
					
						
							|  |  |  | 3484d40,24a5a448 | 
					
						
							|  |  |  | 3484d44,c101bdf | 
					
						
							|  |  |  | 3484d48,2002025 | 
					
						
							|  |  |  | 3484d4c,3c028041 | 
					
						
							|  |  |  | 3484d50,8c42b4c0 | 
					
						
							|  |  |  | 3484d54,18400024 | 
					
						
							|  |  |  | 3484d58,3c118041 | 
					
						
							|  |  |  | 3484d5c,2631a298 | 
					
						
							|  |  |  | 3484d60,2413000a | 
					
						
							|  |  |  | 3484d64,9025 | 
					
						
							|  |  |  | 3484d68,3c178011 | 
					
						
							|  |  |  | 3484d6c,36f7a5d0 | 
					
						
							|  |  |  | 3484d70,3c028041 | 
					
						
							|  |  |  | 3484d74,2442a448 | 
					
						
							|  |  |  | 3484d78,afa20038 | 
					
						
							|  |  |  | 3484d7c,3c148041 | 
					
						
							|  |  |  | 3484d80,92220001 | 
					
						
							|  |  |  | 3484d84,30420010 | 
					
						
							|  |  |  | 3484d88,50400012 | 
					
						
							|  |  |  | 3484d8c,26520001 | 
					
						
							|  |  |  | 3484d90,92220000 | 
					
						
							|  |  |  | 3484d94,2e21021 | 
					
						
							|  |  |  | 3484d98,904200a8 | 
					
						
							|  |  |  | 3484d9c,21082 | 
					
						
							|  |  |  | 3484da0,30420001 | 
					
						
							|  |  |  | 3484da4,5040000b | 
					
						
							|  |  |  | 3484da8,26520001 | 
					
						
							|  |  |  | 3484dac,24020010 | 
					
						
							|  |  |  | 3484db0,afa20018 | 
					
						
							|  |  |  | 3484db4,afa20014 | 
					
						
							|  |  |  | 3484db8,afb30010 | 
					
						
							|  |  |  | 3484dbc,3c03825 | 
					
						
							|  |  |  | 3484dc0,3025 | 
					
						
							|  |  |  | 3484dc4,8fa50038 | 
					
						
							|  |  |  | 3484dc8,c101c47 | 
					
						
							|  |  |  | 3484dcc,2002025 | 
					
						
							|  |  |  | 3484dd0,26520001 | 
					
						
							|  |  |  | 3484dd4,2631000c | 
					
						
							|  |  |  | 3484dd8,8e82b4c0 | 
					
						
							|  |  |  | 3484ddc,242102a | 
					
						
							|  |  |  | 3484de0,1440ffe7 | 
					
						
							|  |  |  | 3484de4,26730011 | 
					
						
							|  |  |  | 3484de8,26c20033 | 
					
						
							|  |  |  | 3484dec,afa20038 | 
					
						
							|  |  |  | 3484df0,24070001 | 
					
						
							|  |  |  | 3484df4,2406000f | 
					
						
							|  |  |  | 3484df8,3c058041 | 
					
						
							|  |  |  | 3484dfc,24a5a448 | 
					
						
							|  |  |  | 3484e00,c101bdf | 
					
						
							|  |  |  | 3484e04,2002025 | 
					
						
							|  |  |  | 3484e08,3c028041 | 
					
						
							|  |  |  | 3484e0c,8c42b4c0 | 
					
						
							|  |  |  | 3484e10,18400053 | 
					
						
							|  |  |  | 3484e14,3c148041 | 
					
						
							|  |  |  | 3484e18,2694a298 | 
					
						
							|  |  |  | 3484e1c,2808825 | 
					
						
							|  |  |  | 3484e20,2413000a | 
					
						
							|  |  |  | 3484e24,9025 | 
					
						
							|  |  |  | 3484e28,3c1e8011 | 
					
						
							|  |  |  | 3484e2c,37dea5d0 | 
					
						
							|  |  |  | 3484e30,3c028041 | 
					
						
							|  |  |  | 3484e34,2442a448 | 
					
						
							|  |  |  | 3484e38,afa2003c | 
					
						
							|  |  |  | 3484e3c,3c178041 | 
					
						
							|  |  |  | 3484e40,92220001 | 
					
						
							|  |  |  | 3484e44,30420010 | 
					
						
							|  |  |  | 3484e48,50400012 | 
					
						
							|  |  |  | 3484e4c,26520001 | 
					
						
							|  |  |  | 3484e50,92220000 | 
					
						
							|  |  |  | 3484e54,3c21021 | 
					
						
							|  |  |  | 3484e58,904200a8 | 
					
						
							|  |  |  | 3484e5c,21042 | 
					
						
							|  |  |  | 3484e60,30420001 | 
					
						
							|  |  |  | 3484e64,5040000b | 
					
						
							|  |  |  | 3484e68,26520001 | 
					
						
							|  |  |  | 3484e6c,24020010 | 
					
						
							|  |  |  | 3484e70,afa20018 | 
					
						
							|  |  |  | 3484e74,afa20014 | 
					
						
							|  |  |  | 3484e78,afb30010 | 
					
						
							|  |  |  | 3484e7c,8fa70038 | 
					
						
							|  |  |  | 3484e80,3025 | 
					
						
							|  |  |  | 3484e84,8fa5003c | 
					
						
							|  |  |  | 3484e88,c101c47 | 
					
						
							|  |  |  | 3484e8c,2002025 | 
					
						
							|  |  |  | 3484e90,26520001 | 
					
						
							|  |  |  | 3484e94,8ee2b4c0 | 
					
						
							|  |  |  | 3484e98,2631000c | 
					
						
							|  |  |  | 3484e9c,242182a | 
					
						
							|  |  |  | 3484ea0,1460ffe7 | 
					
						
							|  |  |  | 3484ea4,26730011 | 
					
						
							|  |  |  | 3484ea8,12a0002d | 
					
						
							|  |  |  | 3484eb0,1840002b | 
					
						
							|  |  |  | 3484eb4,26d60044 | 
					
						
							|  |  |  | 3484eb8,2412000b | 
					
						
							|  |  |  | 3484ebc,8825 | 
					
						
							|  |  |  | 3484ec0,3c1e8041 | 
					
						
							|  |  |  | 3484ec4,3c158041 | 
					
						
							|  |  |  | 3484ec8,26b5b5c8 | 
					
						
							|  |  |  | 3484ecc,3c138041 | 
					
						
							|  |  |  | 3484ed0,2673a1f8 | 
					
						
							|  |  |  | 3484ed4,3c028041 | 
					
						
							|  |  |  | 3484ed8,2442a1fc | 
					
						
							|  |  |  | 3484edc,afa20038 | 
					
						
							|  |  |  | 3484ee0,3c178041 | 
					
						
							|  |  |  | 3484ee4,8fc2b55c | 
					
						
							|  |  |  | 3484ee8,5040000f | 
					
						
							|  |  |  | 3484eec,92820000 | 
					
						
							|  |  |  | 3484ef0,92820001 | 
					
						
							|  |  |  | 3484ef4,30420010 | 
					
						
							|  |  |  | 3484ef8,5040000b | 
					
						
							|  |  |  | 3484efc,92820000 | 
					
						
							|  |  |  | 3484f00,92830000 | 
					
						
							|  |  |  | 3484f04,3c028011 | 
					
						
							|  |  |  | 3484f08,3442a5d0 | 
					
						
							|  |  |  | 3484f0c,431021 | 
					
						
							|  |  |  | 3484f10,904200a8 | 
					
						
							|  |  |  | 3484f14,21082 | 
					
						
							|  |  |  | 3484f18,30420001 | 
					
						
							|  |  |  | 3484f1c,5040000b | 
					
						
							|  |  |  | 3484f20,26310001 | 
					
						
							|  |  |  | 3484f24,92820000 | 
					
						
							|  |  |  | 3484f28,551021 | 
					
						
							|  |  |  | 3484f2c,90420000 | 
					
						
							|  |  |  | 3484f30,14400002 | 
					
						
							|  |  |  | 3484f34,2602025 | 
					
						
							|  |  |  | 3484f38,8fa40038 | 
					
						
							|  |  |  | 3484f3c,2403025 | 
					
						
							|  |  |  | 3484f40,c102561 | 
					
						
							|  |  |  | 3484f44,2c02825 | 
					
						
							|  |  |  | 3484f48,26310001 | 
					
						
							|  |  |  | 3484f4c,2694000c | 
					
						
							|  |  |  | 3484f50,8ee2b4c0 | 
					
						
							|  |  |  | 3484f54,222102a | 
					
						
							|  |  |  | 3484f58,1440ffe2 | 
					
						
							|  |  |  | 3484f5c,26520011 | 
					
						
							|  |  |  | 3484f60,c10258b | 
					
						
							|  |  |  | 3484f64,2002025 | 
					
						
							|  |  |  | 3484f68,8e020008 | 
					
						
							|  |  |  | 3484f6c,24430008 | 
					
						
							|  |  |  | 3484f70,ae030008 | 
					
						
							|  |  |  | 3484f74,3c03e900 | 
					
						
							|  |  |  | 3484f78,ac430000 | 
					
						
							|  |  |  | 3484f7c,ac400004 | 
					
						
							|  |  |  | 3484f80,8e020008 | 
					
						
							|  |  |  | 3484f84,24430008 | 
					
						
							|  |  |  | 3484f88,ae030008 | 
					
						
							|  |  |  | 3484f8c,3c03df00 | 
					
						
							|  |  |  | 3484f90,ac430000 | 
					
						
							|  |  |  | 3484f94,10000003 | 
					
						
							|  |  |  | 3484f98,ac400004 | 
					
						
							|  |  |  | 3484f9c,1000fed6 | 
					
						
							|  |  |  | 3484fa0,26310012 | 
					
						
							|  |  |  | 3484fa4,8fbf006c | 
					
						
							|  |  |  | 3484fa8,8fbe0068 | 
					
						
							|  |  |  | 3484fac,8fb70064 | 
					
						
							|  |  |  | 3484fb0,8fb60060 | 
					
						
							|  |  |  | 3484fb4,8fb5005c | 
					
						
							|  |  |  | 3484fb8,8fb40058 | 
					
						
							|  |  |  | 3484fbc,8fb30054 | 
					
						
							|  |  |  | 3484fc0,8fb20050 | 
					
						
							|  |  |  | 3484fc4,8fb1004c | 
					
						
							|  |  |  | 3484fc8,8fb00048 | 
					
						
							|  |  |  | 3484fcc,3e00008 | 
					
						
							|  |  |  | 3484fd0,27bd0070 | 
					
						
							|  |  |  | 3484fd4,3e00008 | 
					
						
							|  |  |  | 3484fdc,44860000 | 
					
						
							|  |  |  | 3484fe0,44801000 | 
					
						
							|  |  |  | 3484fe8,46020032 | 
					
						
							|  |  |  | 3484ff0,45030011 | 
					
						
							|  |  |  | 3484ff4,46007006 | 
					
						
							|  |  |  | 3484ff8,460e603c | 
					
						
							|  |  |  | 3485000,45000007 | 
					
						
							|  |  |  | 3485004,460c0000 | 
					
						
							|  |  |  | 3485008,4600703c | 
					
						
							|  |  |  | 3485010,45000009 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3485018,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348501c,46007006 | 
					
						
							|  |  |  | 3485020,460e003c | 
					
						
							|  |  |  | 3485028,45000003 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3485030,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3485034,46007006 | 
					
						
							|  |  |  | 3485038,3e00008 | 
					
						
							|  |  |  | 3485040,3c02801c | 
					
						
							|  |  |  | 3485044,344284a0 | 
					
						
							|  |  |  | 3485048,c44000d4 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348504c,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3485050,3e00008 | 
					
						
							|  |  |  | 3485054,e440b4c8 | 
					
						
							|  |  |  | 3485058,27bdffe8 | 
					
						
							|  |  |  | 348505c,afbf0014 | 
					
						
							|  |  |  | 3485060,3c028041 | 
					
						
							|  |  |  | 3485064,9042a340 | 
					
						
							|  |  |  | 3485068,5040001b | 
					
						
							|  |  |  | 348506c,3c028041 | 
					
						
							|  |  |  | 3485070,3c038011 | 
					
						
							|  |  |  | 3485074,3463a5d0 | 
					
						
							|  |  |  | 3485078,8c630070 | 
					
						
							|  |  |  | 348507c,31f02 | 
					
						
							|  |  |  | 3485080,1062000d | 
					
						
							|  |  |  | 3485084,21300 | 
					
						
							|  |  |  | 3485088,3c048011 | 
					
						
							|  |  |  | 348508c,3484a5d0 | 
					
						
							|  |  |  | 3485090,94830070 | 
					
						
							|  |  |  | 3485094,30630fff | 
					
						
							|  |  |  | 3485098,621025 | 
					
						
							|  |  |  | 348509c,a4820070 | 
					
						
							|  |  |  | 34850a0,3c04801d | 
					
						
							|  |  |  | 34850a4,3485aa30 | 
					
						
							|  |  |  | 34850a8,3c028007 | 
					
						
							|  |  |  | 34850ac,34429764 | 
					
						
							|  |  |  | 34850b0,40f809 | 
					
						
							|  |  |  | 34850b4,248484a0 | 
					
						
							|  |  |  | 34850b8,3c028041 | 
					
						
							|  |  |  | 34850bc,9043a340 | 
					
						
							|  |  |  | 34850c0,24020001 | 
					
						
							|  |  |  | 34850c4,14620004 | 
					
						
							|  |  |  | 34850c8,3c028041 | 
					
						
							|  |  |  | 34850cc,3c028041 | 
					
						
							|  |  |  | 34850d0,a040a340 | 
					
						
							|  |  |  | 34850d4,3c028041 | 
					
						
							|  |  |  | 34850d8,c44ea338 | 
					
						
							|  |  |  | 34850dc,44800000 | 
					
						
							|  |  |  | 34850e4,46007032 | 
					
						
							|  |  |  | 34850ec,45010010 | 
					
						
							|  |  |  | 34850f0,3c02801c | 
					
						
							|  |  |  | 34850f4,344284a0 | 
					
						
							|  |  |  | 34850f8,c44000d4 | 
					
						
							|  |  |  | 34850fc,46007032 | 
					
						
							|  |  |  | 3485104,45010019 | 
					
						
							|  |  |  | 3485108,3c02801c | 
					
						
							|  |  |  | 348510c,3c028041 | 
					
						
							|  |  |  | 3485110,8c46a204 | 
					
						
							|  |  |  | 3485114,3c028041 | 
					
						
							|  |  |  | 3485118,c1013f7 | 
					
						
							|  |  |  | 348511c,c44cb4c4 | 
					
						
							|  |  |  | 3485120,3c02801c | 
					
						
							|  |  |  | 3485124,344284a0 | 
					
						
							|  |  |  | 3485128,1000000f | 
					
						
							|  |  |  | 348512c,e44000d4 | 
					
						
							|  |  |  | 3485130,344284a0 | 
					
						
							|  |  |  | 3485134,c44c00d4 | 
					
						
							|  |  |  | 3485138,3c028041 | 
					
						
							|  |  |  | 348513c,c44eb4c8 | 
					
						
							|  |  |  | 3485140,460e6032 | 
					
						
							|  |  |  | 3485148,45010008 | 
					
						
							|  |  |  | 348514c,3c02801c | 
					
						
							|  |  |  | 3485150,3c028041 | 
					
						
							|  |  |  | 3485154,c1013f7 | 
					
						
							|  |  |  | 3485158,8c46a208 | 
					
						
							|  |  |  | 348515c,3c02801c | 
					
						
							|  |  |  | 3485160,344284a0 | 
					
						
							|  |  |  | 3485164,e44000d4 | 
					
						
							|  |  |  | 3485168,3c02801c | 
					
						
							|  |  |  | 348516c,344284a0 | 
					
						
							|  |  |  | 3485170,c44000d4 | 
					
						
							|  |  |  | 3485174,3c028041 | 
					
						
							|  |  |  | 3485178,e440b4c4 | 
					
						
							|  |  |  | 348517c,3c028041 | 
					
						
							|  |  |  | 3485180,9042a341 | 
					
						
							|  |  |  | 3485184,24030001 | 
					
						
							|  |  |  | 3485188,1443000f | 
					
						
							|  |  |  | 348518c,24030002 | 
					
						
							|  |  |  | 3485190,3c02801c | 
					
						
							|  |  |  | 3485194,344284a0 | 
					
						
							|  |  |  | 3485198,94420322 | 
					
						
							|  |  |  | 348519c,3c038041 | 
					
						
							|  |  |  | 34851a0,24639ff0 | 
					
						
							|  |  |  | 34851a4,431021 | 
					
						
							|  |  |  | 34851a8,90420000 | 
					
						
							|  |  |  | 34851ac,10400018 | 
					
						
							|  |  |  | 34851b0,3c028041 | 
					
						
							|  |  |  | 34851b4,3c02801c | 
					
						
							|  |  |  | 34851b8,344284a0 | 
					
						
							|  |  |  | 34851bc,24030035 | 
					
						
							|  |  |  | 34851c0,10000012 | 
					
						
							|  |  |  | 34851c4,a4430322 | 
					
						
							|  |  |  | 34851c8,14430011 | 
					
						
							|  |  |  | 34851cc,3c028041 | 
					
						
							|  |  |  | 34851d0,3c02801c | 
					
						
							|  |  |  | 34851d4,344284a0 | 
					
						
							|  |  |  | 34851d8,94420322 | 
					
						
							|  |  |  | 34851dc,3c038041 | 
					
						
							|  |  |  | 34851e0,24639ff0 | 
					
						
							|  |  |  | 34851e4,431021 | 
					
						
							|  |  |  | 34851e8,90420000 | 
					
						
							|  |  |  | 34851ec,10400006 | 
					
						
							|  |  |  | 34851f0,3c028041 | 
					
						
							|  |  |  | 34851f4,3c02801c | 
					
						
							|  |  |  | 34851f8,344284a0 | 
					
						
							|  |  |  | 34851fc,2403001f | 
					
						
							|  |  |  | 3485200,a4430322 | 
					
						
							|  |  |  | 3485204,3c028041 | 
					
						
							|  |  |  | 3485208,a040a341 | 
					
						
							|  |  |  | 348520c,3c028041 | 
					
						
							|  |  |  | 3485210,2442a334 | 
					
						
							|  |  |  | 3485214,c4400008 | 
					
						
							|  |  |  | 3485218,3c038040 | 
					
						
							|  |  |  | 348521c,e4602750 | 
					
						
							|  |  |  | 3485220,9044000e | 
					
						
							|  |  |  | 3485224,3c038040 | 
					
						
							|  |  |  | 3485228,a0642ca1 | 
					
						
							|  |  |  | 348522c,9042000f | 
					
						
							|  |  |  | 3485230,50400006 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3485234,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3485238,2442ffff | 
					
						
							|  |  |  | 348523c,3c038041 | 
					
						
							|  |  |  | 3485240,c101dff | 
					
						
							|  |  |  | 3485244,a062a343 | 
					
						
							|  |  |  | 3485248,3c028041 | 
					
						
							|  |  |  | 348524c,9042a344 | 
					
						
							|  |  |  | 3485250,1040000b | 
					
						
							|  |  |  | 3485254,3c028041 | 
					
						
							|  |  |  | 3485258,3c02801c | 
					
						
							|  |  |  | 348525c,344284a0 | 
					
						
							|  |  |  | 3485260,94430014 | 
					
						
							|  |  |  | 3485264,2404dfff | 
					
						
							|  |  |  | 3485268,641824 | 
					
						
							|  |  |  | 348526c,a4430014 | 
					
						
							|  |  |  | 3485270,94430020 | 
					
						
							|  |  |  | 3485274,641824 | 
					
						
							|  |  |  | 3485278,a4430020 | 
					
						
							|  |  |  | 348527c,3c028041 | 
					
						
							|  |  |  | 3485280,9042a345 | 
					
						
							|  |  |  | 3485284,10400016 | 
					
						
							|  |  |  | 3485288,8fbf0014 | 
					
						
							|  |  |  | 348528c,3c02801c | 
					
						
							|  |  |  | 3485290,344284a0 | 
					
						
							|  |  |  | 3485294,90430016 | 
					
						
							|  |  |  | 3485298,31823 | 
					
						
							|  |  |  | 348529c,a0430016 | 
					
						
							|  |  |  | 34852a0,90430017 | 
					
						
							|  |  |  | 34852a4,31823 | 
					
						
							|  |  |  | 34852a8,a0430017 | 
					
						
							|  |  |  | 34852ac,90430022 | 
					
						
							|  |  |  | 34852b0,31823 | 
					
						
							|  |  |  | 34852b4,a0430022 | 
					
						
							|  |  |  | 34852b8,90430023 | 
					
						
							|  |  |  | 34852bc,31823 | 
					
						
							|  |  |  | 34852c0,a0430023 | 
					
						
							|  |  |  | 34852c4,90430028 | 
					
						
							|  |  |  | 34852c8,31823 | 
					
						
							|  |  |  | 34852cc,a0430028 | 
					
						
							|  |  |  | 34852d0,90430029 | 
					
						
							|  |  |  | 34852d4,31823 | 
					
						
							|  |  |  | 34852d8,a0430029 | 
					
						
							|  |  |  | 34852dc,8fbf0014 | 
					
						
							|  |  |  | 34852e0,3e00008 | 
					
						
							|  |  |  | 34852e4,27bd0018 | 
					
						
							|  |  |  | 34852e8,850018 | 
					
						
							|  |  |  | 34852ec,1812 | 
					
						
							|  |  |  | 34852f0,24620001 | 
					
						
							|  |  |  | 34852f4,3042ffff | 
					
						
							|  |  |  | 34852f8,31a02 | 
					
						
							|  |  |  | 34852fc,431021 | 
					
						
							|  |  |  | 3485300,21203 | 
					
						
							|  |  |  | 3485304,3e00008 | 
					
						
							|  |  |  | 3485308,304200ff | 
					
						
							|  |  |  | 348530c,2402ffff | 
					
						
							|  |  |  | 3485310,a0820002 | 
					
						
							|  |  |  | 3485314,a0820001 | 
					
						
							|  |  |  | 3485318,4a00031 | 
					
						
							|  |  |  | 348531c,a0820000 | 
					
						
							|  |  |  | 3485320,a01825 | 
					
						
							|  |  |  | 3485324,28a503e8 | 
					
						
							|  |  |  | 3485328,50a00001 | 
					
						
							|  |  |  | 348532c,240303e7 | 
					
						
							|  |  |  | 3485330,31c00 | 
					
						
							|  |  |  | 3485334,31c03 | 
					
						
							|  |  |  | 3485338,3c026666 | 
					
						
							|  |  |  | 348533c,24426667 | 
					
						
							|  |  |  | 3485340,620018 | 
					
						
							|  |  |  | 3485344,1010 | 
					
						
							|  |  |  | 3485348,21083 | 
					
						
							|  |  |  | 348534c,32fc3 | 
					
						
							|  |  |  | 3485350,451023 | 
					
						
							|  |  |  | 3485354,22880 | 
					
						
							|  |  |  | 3485358,a22821 | 
					
						
							|  |  |  | 348535c,52840 | 
					
						
							|  |  |  | 3485360,651823 | 
					
						
							|  |  |  | 3485364,21400 | 
					
						
							|  |  |  | 3485368,21403 | 
					
						
							|  |  |  | 348536c,1040001c | 
					
						
							|  |  |  | 3485370,a0830002 | 
					
						
							|  |  |  | 3485374,3c036666 | 
					
						
							|  |  |  | 3485378,24636667 | 
					
						
							|  |  |  | 348537c,430018 | 
					
						
							|  |  |  | 3485380,1810 | 
					
						
							|  |  |  | 3485384,31883 | 
					
						
							|  |  |  | 3485388,22fc3 | 
					
						
							|  |  |  | 348538c,651823 | 
					
						
							|  |  |  | 3485390,32880 | 
					
						
							|  |  |  | 3485394,a32821 | 
					
						
							|  |  |  | 3485398,52840 | 
					
						
							|  |  |  | 348539c,451023 | 
					
						
							|  |  |  | 34853a0,a0820001 | 
					
						
							|  |  |  | 34853a4,31400 | 
					
						
							|  |  |  | 34853a8,21403 | 
					
						
							|  |  |  | 34853ac,1040000c | 
					
						
							|  |  |  | 34853b0,3c036666 | 
					
						
							|  |  |  | 34853b4,24636667 | 
					
						
							|  |  |  | 34853b8,430018 | 
					
						
							|  |  |  | 34853bc,1810 | 
					
						
							|  |  |  | 34853c0,31883 | 
					
						
							|  |  |  | 34853c4,22fc3 | 
					
						
							|  |  |  | 34853c8,651823 | 
					
						
							|  |  |  | 34853cc,32880 | 
					
						
							|  |  |  | 34853d0,a31821 | 
					
						
							|  |  |  | 34853d4,31840 | 
					
						
							|  |  |  | 34853d8,431023 | 
					
						
							|  |  |  | 34853dc,a0820000 | 
					
						
							|  |  |  | 34853e0,3e00008 | 
					
						
							|  |  |  | 34853e8,27bdffd0 | 
					
						
							|  |  |  | 34853ec,afbf002c | 
					
						
							|  |  |  | 34853f0,afb20028 | 
					
						
							|  |  |  | 34853f4,afb10024 | 
					
						
							|  |  |  | 34853f8,afb00020 | 
					
						
							|  |  |  | 34853fc,808025 | 
					
						
							|  |  |  | 3485400,a08825 | 
					
						
							|  |  |  | 3485404,afa7003c | 
					
						
							|  |  |  | 3485408,8fb20040 | 
					
						
							|  |  |  | 348540c,c101bdf | 
					
						
							|  |  |  | 3485410,24070001 | 
					
						
							|  |  |  | 3485414,93a7003c | 
					
						
							|  |  |  | 3485418,afb20018 | 
					
						
							|  |  |  | 348541c,afb20014 | 
					
						
							|  |  |  | 3485420,83a2003d | 
					
						
							|  |  |  | 3485424,2442005c | 
					
						
							|  |  |  | 3485428,afa20010 | 
					
						
							|  |  |  | 348542c,24e70037 | 
					
						
							|  |  |  | 3485430,3025 | 
					
						
							|  |  |  | 3485434,2202825 | 
					
						
							|  |  |  | 3485438,c101c47 | 
					
						
							|  |  |  | 348543c,2002025 | 
					
						
							|  |  |  | 3485440,8fbf002c | 
					
						
							|  |  |  | 3485444,8fb20028 | 
					
						
							|  |  |  | 3485448,8fb10024 | 
					
						
							|  |  |  | 348544c,8fb00020 | 
					
						
							|  |  |  | 3485450,3e00008 | 
					
						
							|  |  |  | 3485454,27bd0030 | 
					
						
							|  |  |  | 3485458,27bdffe0 | 
					
						
							|  |  |  | 348545c,afbf001c | 
					
						
							|  |  |  | 3485460,afb20018 | 
					
						
							|  |  |  | 3485464,afb10014 | 
					
						
							|  |  |  | 3485468,afb00010 | 
					
						
							|  |  |  | 348546c,808025 | 
					
						
							|  |  |  | 3485470,24850074 | 
					
						
							|  |  |  | 3485474,24070001 | 
					
						
							|  |  |  | 3485478,4825 | 
					
						
							|  |  |  | 348547c,3c028041 | 
					
						
							|  |  |  | 3485480,2442a0b4 | 
					
						
							|  |  |  | 3485484,2408ffe0 | 
					
						
							|  |  |  | 3485488,3c048041 | 
					
						
							|  |  |  | 348548c,2484a0fc | 
					
						
							|  |  |  | 3485490,90430000 | 
					
						
							|  |  |  | 3485494,1031824 | 
					
						
							|  |  |  | 3485498,14600005 | 
					
						
							|  |  |  | 348549c,80a60000 | 
					
						
							|  |  |  | 34854a0,90430001 | 
					
						
							|  |  |  | 34854a4,30c600ff | 
					
						
							|  |  |  | 34854a8,50660001 | 
					
						
							|  |  |  | 34854ac,1274825 | 
					
						
							|  |  |  | 34854b0,24420004 | 
					
						
							|  |  |  | 34854b4,73840 | 
					
						
							|  |  |  | 34854b8,1444fff5 | 
					
						
							|  |  |  | 34854bc,24a50001 | 
					
						
							|  |  |  | 34854c0,3c028041 | 
					
						
							|  |  |  | 34854c4,ac49b5d8 | 
					
						
							|  |  |  | 34854c8,8e1100a4 | 
					
						
							|  |  |  | 34854cc,2442b5d8 | 
					
						
							|  |  |  | 34854d0,3223003f | 
					
						
							|  |  |  | 34854d4,a0430004 | 
					
						
							|  |  |  | 34854d8,9602009c | 
					
						
							|  |  |  | 34854dc,8203003e | 
					
						
							|  |  |  | 34854e0,10600002 | 
					
						
							|  |  |  | 34854e4,3042fffb | 
					
						
							|  |  |  | 34854e8,34420004 | 
					
						
							|  |  |  | 34854ec,3c038041 | 
					
						
							|  |  |  | 34854f0,a462b5de | 
					
						
							|  |  |  | 34854f4,112c02 | 
					
						
							|  |  |  | 34854f8,30a5007c | 
					
						
							|  |  |  | 34854fc,26030086 | 
					
						
							|  |  |  | 3485500,2606008a | 
					
						
							|  |  |  | 3485504,2407001b | 
					
						
							|  |  |  | 3485508,90640000 | 
					
						
							|  |  |  | 348550c,2482ffec | 
					
						
							|  |  |  | 3485510,304200ff | 
					
						
							|  |  |  | 3485514,2c42000d | 
					
						
							|  |  |  | 3485518,50400004 | 
					
						
							|  |  |  | 348551c,24630001 | 
					
						
							|  |  |  | 3485520,54870001 | 
					
						
							|  |  |  | 3485524,34a50001 | 
					
						
							|  |  |  | 3485528,24630001 | 
					
						
							|  |  |  | 348552c,5466fff7 | 
					
						
							|  |  |  | 3485530,90640000 | 
					
						
							|  |  |  | 3485534,3c028041 | 
					
						
							|  |  |  | 3485538,a045b5dd | 
					
						
							|  |  |  | 348553c,9203007b | 
					
						
							|  |  |  | 3485540,2462fff9 | 
					
						
							|  |  |  | 3485544,304200ff | 
					
						
							|  |  |  | 3485548,2c420002 | 
					
						
							|  |  |  | 348554c,14400003 | 
					
						
							|  |  |  | 3485550,2025 | 
					
						
							|  |  |  | 3485554,10000002 | 
					
						
							|  |  |  | 3485558,24030007 | 
					
						
							|  |  |  | 348555c,24040001 | 
					
						
							|  |  |  | 3485560,3c028041 | 
					
						
							|  |  |  | 3485564,2442b5d8 | 
					
						
							|  |  |  | 3485568,a0440008 | 
					
						
							|  |  |  | 348556c,a0430009 | 
					
						
							|  |  |  | 3485570,9203007d | 
					
						
							|  |  |  | 3485574,2462fff6 | 
					
						
							|  |  |  | 3485578,304200ff | 
					
						
							|  |  |  | 348557c,2c420002 | 
					
						
							|  |  |  | 3485580,14400003 | 
					
						
							|  |  |  | 3485584,2025 | 
					
						
							|  |  |  | 3485588,10000002 | 
					
						
							|  |  |  | 348558c,2403000a | 
					
						
							|  |  |  | 3485590,24040001 | 
					
						
							|  |  |  | 3485594,3c028041 | 
					
						
							|  |  |  | 3485598,2442b5d8 | 
					
						
							|  |  |  | 348559c,a044000a | 
					
						
							|  |  |  | 34855a0,a043000b | 
					
						
							|  |  |  | 34855a4,86020ef6 | 
					
						
							|  |  |  | 34855a8,4400016 | 
					
						
							|  |  |  | 34855ac,2403002b | 
					
						
							|  |  |  | 34855b0,96020ef4 | 
					
						
							|  |  |  | 34855b4,210c2 | 
					
						
							|  |  |  | 34855b8,3042008f | 
					
						
							|  |  |  | 34855bc,2c430010 | 
					
						
							|  |  |  | 34855c0,10600012 | 
					
						
							|  |  |  | 34855c4,2403002b | 
					
						
							|  |  |  | 34855c8,50400007 | 
					
						
							|  |  |  | 34855cc,9203008b | 
					
						
							|  |  |  | 34855d0,3c038041 | 
					
						
							|  |  |  | 34855d4,2463a034 | 
					
						
							|  |  |  | 34855d8,431021 | 
					
						
							|  |  |  | 34855dc,90430000 | 
					
						
							|  |  |  | 34855e0,1000000d | 
					
						
							|  |  |  | 34855e4,24040001 | 
					
						
							|  |  |  | 34855e8,2462ffdf | 
					
						
							|  |  |  | 34855ec,304200ff | 
					
						
							|  |  |  | 34855f0,2c420003 | 
					
						
							|  |  |  | 34855f4,14400008 | 
					
						
							|  |  |  | 34855f8,24040001 | 
					
						
							|  |  |  | 34855fc,10000005 | 
					
						
							|  |  |  | 3485600,2403002b | 
					
						
							|  |  |  | 3485604,10000004 | 
					
						
							|  |  |  | 3485608,24040001 | 
					
						
							|  |  |  | 348560c,10000002 | 
					
						
							|  |  |  | 3485610,24040001 | 
					
						
							|  |  |  | 3485614,2025 | 
					
						
							|  |  |  | 3485618,3c028041 | 
					
						
							|  |  |  | 348561c,2442b5d8 | 
					
						
							|  |  |  | 3485620,a043000d | 
					
						
							|  |  |  | 3485624,a044000c | 
					
						
							|  |  |  | 3485628,9203008a | 
					
						
							|  |  |  | 348562c,2462ffd3 | 
					
						
							|  |  |  | 3485630,304200ff | 
					
						
							|  |  |  | 3485634,2c42000b | 
					
						
							|  |  |  | 3485638,14400003 | 
					
						
							|  |  |  | 348563c,24040001 | 
					
						
							|  |  |  | 3485640,24030037 | 
					
						
							|  |  |  | 3485644,2025 | 
					
						
							|  |  |  | 3485648,3c028041 | 
					
						
							|  |  |  | 348564c,2442b5d8 | 
					
						
							|  |  |  | 3485650,a043000f | 
					
						
							|  |  |  | 3485654,a044000e | 
					
						
							|  |  |  | 3485658,9202003c | 
					
						
							|  |  |  | 348565c,10400005 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3485660,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3485664,24030013 | 
					
						
							|  |  |  | 3485668,a043b5e9 | 
					
						
							|  |  |  | 348566c,10000004 | 
					
						
							|  |  |  | 3485670,24030001 | 
					
						
							|  |  |  | 3485674,24030012 | 
					
						
							|  |  |  | 3485678,a043b5e9 | 
					
						
							|  |  |  | 348567c,9203003a | 
					
						
							|  |  |  | 3485680,3c028041 | 
					
						
							|  |  |  | 3485684,a043b5e8 | 
					
						
							|  |  |  | 3485688,8e0200a0 | 
					
						
							|  |  |  | 348568c,21182 | 
					
						
							|  |  |  | 3485690,30420007 | 
					
						
							|  |  |  | 3485694,10400009 | 
					
						
							|  |  |  | 3485698,2025 | 
					
						
							|  |  |  | 348569c,401825 | 
					
						
							|  |  |  | 34856a0,2c420004 | 
					
						
							|  |  |  | 34856a4,50400001 | 
					
						
							|  |  |  | 34856a8,24030003 | 
					
						
							|  |  |  | 34856ac,2463004f | 
					
						
							|  |  |  | 34856b0,306300ff | 
					
						
							|  |  |  | 34856b4,10000002 | 
					
						
							|  |  |  | 34856b8,24040001 | 
					
						
							|  |  |  | 34856bc,24030050 | 
					
						
							|  |  |  | 34856c0,3c028041 | 
					
						
							|  |  |  | 34856c4,2442b5d8 | 
					
						
							|  |  |  | 34856c8,a0440012 | 
					
						
							|  |  |  | 34856cc,a0430013 | 
					
						
							|  |  |  | 34856d0,8e0200a0 | 
					
						
							|  |  |  | 34856d4,21242 | 
					
						
							|  |  |  | 34856d8,30420007 | 
					
						
							|  |  |  | 34856dc,50400009 | 
					
						
							|  |  |  | 34856e0,2025 | 
					
						
							|  |  |  | 34856e4,401825 | 
					
						
							|  |  |  | 34856e8,2c420003 | 
					
						
							|  |  |  | 34856ec,50400001 | 
					
						
							|  |  |  | 34856f0,24030002 | 
					
						
							|  |  |  | 34856f4,24630052 | 
					
						
							|  |  |  | 34856f8,306300ff | 
					
						
							|  |  |  | 34856fc,10000002 | 
					
						
							|  |  |  | 3485700,24040001 | 
					
						
							|  |  |  | 3485704,24030053 | 
					
						
							|  |  |  | 3485708,3c028041 | 
					
						
							|  |  |  | 348570c,2442b5d8 | 
					
						
							|  |  |  | 3485710,a0440014 | 
					
						
							|  |  |  | 3485714,a0430015 | 
					
						
							|  |  |  | 3485718,8e0300a0 | 
					
						
							|  |  |  | 348571c,31b02 | 
					
						
							|  |  |  | 3485720,30630003 | 
					
						
							|  |  |  | 3485724,a0430016 | 
					
						
							|  |  |  | 3485728,86050034 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348572c,3c048041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3485730,c1014c3 | 
					
						
							|  |  |  | 3485734,2484b5f3 | 
					
						
							|  |  |  | 3485738,3c020080 | 
					
						
							|  |  |  | 348573c,2221024 | 
					
						
							|  |  |  | 3485740,10400002 | 
					
						
							|  |  |  | 3485744,2825 | 
					
						
							|  |  |  | 3485748,860500d0 | 
					
						
							|  |  |  | 348574c,3c048041 | 
					
						
							|  |  |  | 3485750,c1014c3 | 
					
						
							|  |  |  | 3485754,2484b5f6 | 
					
						
							|  |  |  | 3485758,860508c6 | 
					
						
							|  |  |  | 348575c,58a00001 | 
					
						
							|  |  |  | 3485760,2405ffff | 
					
						
							|  |  |  | 3485764,3c048041 | 
					
						
							|  |  |  | 3485768,c1014c3 | 
					
						
							|  |  |  | 348576c,2484b5f9 | 
					
						
							|  |  |  | 3485770,3c128041 | 
					
						
							|  |  |  | 3485774,2652b5d8 | 
					
						
							|  |  |  | 3485778,9202003d | 
					
						
							|  |  |  | 348577c,a2420017 | 
					
						
							|  |  |  | 3485780,8602002e | 
					
						
							|  |  |  | 3485784,22fc3 | 
					
						
							|  |  |  | 3485788,30a5000f | 
					
						
							|  |  |  | 348578c,a22821 | 
					
						
							|  |  |  | 3485790,52903 | 
					
						
							|  |  |  | 3485794,3c048041 | 
					
						
							|  |  |  | 3485798,c1014c3 | 
					
						
							|  |  |  | 348579c,2484b5f0 | 
					
						
							|  |  |  | 34857a0,86050022 | 
					
						
							|  |  |  | 34857a4,3c048041 | 
					
						
							|  |  |  | 34857a8,c1014c3 | 
					
						
							|  |  |  | 34857ac,2484b5fc | 
					
						
							|  |  |  | 34857b0,118982 | 
					
						
							|  |  |  | 34857b4,32310fff | 
					
						
							|  |  |  | 34857b8,a6510028 | 
					
						
							|  |  |  | 34857bc,8fbf001c | 
					
						
							|  |  |  | 34857c0,8fb20018 | 
					
						
							|  |  |  | 34857c4,8fb10014 | 
					
						
							|  |  |  | 34857c8,8fb00010 | 
					
						
							|  |  |  | 34857cc,3e00008 | 
					
						
							|  |  |  | 34857d0,27bd0020 | 
					
						
							|  |  |  | 34857d4,27bdff88 | 
					
						
							|  |  |  | 34857d8,afbf0074 | 
					
						
							|  |  |  | 34857dc,afbe0070 | 
					
						
							|  |  |  | 34857e0,afb7006c | 
					
						
							|  |  |  | 34857e4,afb60068 | 
					
						
							|  |  |  | 34857e8,afb50064 | 
					
						
							|  |  |  | 34857ec,afb40060 | 
					
						
							|  |  |  | 34857f0,afb3005c | 
					
						
							|  |  |  | 34857f4,afb20058 | 
					
						
							|  |  |  | 34857f8,afb10054 | 
					
						
							|  |  |  | 34857fc,afb00050 | 
					
						
							|  |  |  | 3485800,3c020002 | 
					
						
							|  |  |  | 3485804,a21021 | 
					
						
							|  |  |  | 3485808,9443ca42 | 
					
						
							|  |  |  | 348580c,24020008 | 
					
						
							|  |  |  | 3485810,14620021 | 
					
						
							|  |  |  | 3485814,808825 | 
					
						
							|  |  |  | 3485818,3c020002 | 
					
						
							|  |  |  | 348581c,a21021 | 
					
						
							|  |  |  | 3485820,9442ca36 | 
					
						
							|  |  |  | 3485824,14400006 | 
					
						
							|  |  |  | 3485828,3c020002 | 
					
						
							|  |  |  | 348582c,a21021 | 
					
						
							|  |  |  | 3485830,9444ca2e | 
					
						
							|  |  |  | 3485834,24020002 | 
					
						
							|  |  |  | 3485838,10820009 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348583c,3c020002 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3485840,a21021 | 
					
						
							|  |  |  | 3485844,9442ca30 | 
					
						
							|  |  |  | 3485848,24040005 | 
					
						
							|  |  |  | 348584c,50440005 | 
					
						
							|  |  |  | 3485850,3c020002 | 
					
						
							|  |  |  | 3485854,24040016 | 
					
						
							|  |  |  | 3485858,14440010 | 
					
						
							|  |  |  | 348585c,3c020002 | 
					
						
							|  |  |  | 3485860,3c020002 | 
					
						
							|  |  |  | 3485864,a21021 | 
					
						
							|  |  |  | 3485868,9443ca38 | 
					
						
							|  |  |  | 348586c,31080 | 
					
						
							|  |  |  | 3485870,431021 | 
					
						
							|  |  |  | 3485874,21980 | 
					
						
							|  |  |  | 3485878,431021 | 
					
						
							|  |  |  | 348587c,21100 | 
					
						
							|  |  |  | 3485880,24420020 | 
					
						
							|  |  |  | 3485884,8ca401d8 | 
					
						
							|  |  |  | 3485888,c101516 | 
					
						
							|  |  |  | 348588c,822021 | 
					
						
							|  |  |  | 3485890,10000220 | 
					
						
							|  |  |  | 3485894,8fbf0074 | 
					
						
							|  |  |  | 3485898,3c020002 | 
					
						
							|  |  |  | 348589c,a21021 | 
					
						
							|  |  |  | 34858a0,9042ca37 | 
					
						
							|  |  |  | 34858a4,1440001d | 
					
						
							|  |  |  | 34858a8,2c44009a | 
					
						
							|  |  |  | 34858ac,3c020002 | 
					
						
							|  |  |  | 34858b0,a22821 | 
					
						
							|  |  |  | 34858b4,90a2ca31 | 
					
						
							|  |  |  | 34858b8,34420080 | 
					
						
							|  |  |  | 34858bc,2c44009a | 
					
						
							|  |  |  | 34858c0,10800214 | 
					
						
							|  |  |  | 34858c4,8fbf0074 | 
					
						
							|  |  |  | 34858c8,2c440086 | 
					
						
							|  |  |  | 34858cc,14800211 | 
					
						
							|  |  |  | 34858d0,2442007a | 
					
						
							|  |  |  | 34858d4,24040001 | 
					
						
							|  |  |  | 34858d8,441004 | 
					
						
							|  |  |  | 34858dc,3c040008 | 
					
						
							|  |  |  | 34858e0,24840014 | 
					
						
							|  |  |  | 34858e4,442024 | 
					
						
							|  |  |  | 34858e8,1480003b | 
					
						
							|  |  |  | 34858ec,3c040002 | 
					
						
							|  |  |  | 34858f0,24840081 | 
					
						
							|  |  |  | 34858f4,442024 | 
					
						
							|  |  |  | 34858f8,54800030 | 
					
						
							|  |  |  | 34858fc,24020008 | 
					
						
							|  |  |  | 3485900,3c030004 | 
					
						
							|  |  |  | 3485904,24630002 | 
					
						
							|  |  |  | 3485908,431024 | 
					
						
							|  |  |  | 348590c,10400202 | 
					
						
							|  |  |  | 3485910,8fbe0070 | 
					
						
							|  |  |  | 3485914,10000039 | 
					
						
							|  |  |  | 3485918,241600c8 | 
					
						
							|  |  |  | 348591c,108001fd | 
					
						
							|  |  |  | 3485920,8fbf0074 | 
					
						
							|  |  |  | 3485924,2c440086 | 
					
						
							|  |  |  | 3485928,5080000e | 
					
						
							|  |  |  | 348592c,2442007a | 
					
						
							|  |  |  | 3485930,24040004 | 
					
						
							|  |  |  | 3485934,10440028 | 
					
						
							|  |  |  | 3485938,2c440005 | 
					
						
							|  |  |  | 348593c,5080001b | 
					
						
							|  |  |  | 3485940,24030006 | 
					
						
							|  |  |  | 3485944,24040002 | 
					
						
							|  |  |  | 3485948,5044001c | 
					
						
							|  |  |  | 348594c,24020008 | 
					
						
							|  |  |  | 3485950,24030003 | 
					
						
							|  |  |  | 3485954,1043002d | 
					
						
							|  |  |  | 3485958,241600c8 | 
					
						
							|  |  |  | 348595c,100001ee | 
					
						
							|  |  |  | 3485960,8fbe0070 | 
					
						
							|  |  |  | 3485964,24040001 | 
					
						
							|  |  |  | 3485968,441004 | 
					
						
							|  |  |  | 348596c,3c040008 | 
					
						
							|  |  |  | 3485970,24840014 | 
					
						
							|  |  |  | 3485974,442024 | 
					
						
							|  |  |  | 3485978,14800017 | 
					
						
							|  |  |  | 348597c,3c040002 | 
					
						
							|  |  |  | 3485980,24840081 | 
					
						
							|  |  |  | 3485984,442024 | 
					
						
							|  |  |  | 3485988,5480000c | 
					
						
							|  |  |  | 348598c,24020008 | 
					
						
							|  |  |  | 3485990,3c030004 | 
					
						
							|  |  |  | 3485994,24630002 | 
					
						
							|  |  |  | 3485998,431024 | 
					
						
							|  |  |  | 348599c,104001dd | 
					
						
							|  |  |  | 34859a0,8fbf0074 | 
					
						
							|  |  |  | 34859a4,10000017 | 
					
						
							|  |  |  | 34859a8,241600c8 | 
					
						
							|  |  |  | 34859ac,10430017 | 
					
						
							|  |  |  | 34859b0,241600c8 | 
					
						
							|  |  |  | 34859b4,100001d7 | 
					
						
							|  |  |  | 34859b8,8fbf0074 | 
					
						
							|  |  |  | 34859bc,431023 | 
					
						
							|  |  |  | 34859c0,21840 | 
					
						
							|  |  |  | 34859c4,431821 | 
					
						
							|  |  |  | 34859c8,318c0 | 
					
						
							|  |  |  | 34859cc,431021 | 
					
						
							|  |  |  | 34859d0,10000006 | 
					
						
							|  |  |  | 34859d4,305600ff | 
					
						
							|  |  |  | 34859d8,31040 | 
					
						
							|  |  |  | 34859dc,621021 | 
					
						
							|  |  |  | 34859e0,210c0 | 
					
						
							|  |  |  | 34859e4,621821 | 
					
						
							|  |  |  | 34859e8,307600ff | 
					
						
							|  |  |  | 34859ec,12c001c9 | 
					
						
							|  |  |  | 34859f0,8fbf0074 | 
					
						
							|  |  |  | 34859f4,10000006 | 
					
						
							|  |  |  | 34859f8,8e220008 | 
					
						
							|  |  |  | 34859fc,10000004 | 
					
						
							|  |  |  | 3485a00,8e220008 | 
					
						
							|  |  |  | 3485a04,10000002 | 
					
						
							|  |  |  | 3485a08,8e220008 | 
					
						
							|  |  |  | 3485a0c,8e220008 | 
					
						
							|  |  |  | 3485a10,24430008 | 
					
						
							|  |  |  | 3485a14,ae230008 | 
					
						
							|  |  |  | 3485a18,3c03e700 | 
					
						
							|  |  |  | 3485a1c,ac430000 | 
					
						
							|  |  |  | 3485a20,ac400004 | 
					
						
							|  |  |  | 3485a24,8e220008 | 
					
						
							|  |  |  | 3485a28,24430008 | 
					
						
							|  |  |  | 3485a2c,ae230008 | 
					
						
							|  |  |  | 3485a30,3c03fc11 | 
					
						
							|  |  |  | 3485a34,34639623 | 
					
						
							|  |  |  | 3485a38,ac430000 | 
					
						
							|  |  |  | 3485a3c,3c03ff2f | 
					
						
							|  |  |  | 3485a40,3463ffff | 
					
						
							|  |  |  | 3485a44,ac430004 | 
					
						
							|  |  |  | 3485a48,2c02825 | 
					
						
							|  |  |  | 3485a4c,c1014ba | 
					
						
							|  |  |  | 3485a50,24040090 | 
					
						
							|  |  |  | 3485a54,afa20048 | 
					
						
							|  |  |  | 3485a58,afa20044 | 
					
						
							|  |  |  | 3485a5c,a025 | 
					
						
							|  |  |  | 3485a60,24030040 | 
					
						
							|  |  |  | 3485a64,3c028041 | 
					
						
							|  |  |  | 3485a68,afa20030 | 
					
						
							|  |  |  | 3485a6c,3c028041 | 
					
						
							|  |  |  | 3485a70,2442b5d8 | 
					
						
							|  |  |  | 3485a74,afa2004c | 
					
						
							|  |  |  | 3485a78,3c178041 | 
					
						
							|  |  |  | 3485a7c,26f7a234 | 
					
						
							|  |  |  | 3485a80,3c158041 | 
					
						
							|  |  |  | 3485a84,26b5a1b4 | 
					
						
							|  |  |  | 3485a88,8e240008 | 
					
						
							|  |  |  | 3485a8c,24820008 | 
					
						
							|  |  |  | 3485a90,ae220008 | 
					
						
							|  |  |  | 3485a94,3c02fa00 | 
					
						
							|  |  |  | 3485a98,ac820000 | 
					
						
							|  |  |  | 3485a9c,31600 | 
					
						
							|  |  |  | 3485aa0,32c00 | 
					
						
							|  |  |  | 3485aa4,451025 | 
					
						
							|  |  |  | 3485aa8,8fa50044 | 
					
						
							|  |  |  | 3485aac,451025 | 
					
						
							|  |  |  | 3485ab0,31a00 | 
					
						
							|  |  |  | 3485ab4,431025 | 
					
						
							|  |  |  | 3485ab8,ac820004 | 
					
						
							|  |  |  | 3485abc,8fa20030 | 
					
						
							|  |  |  | 3485ac0,2453a134 | 
					
						
							|  |  |  | 3485ac4,8fbe004c | 
					
						
							|  |  |  | 3485ac8,2670ff80 | 
					
						
							|  |  |  | 3485acc,8fd20000 | 
					
						
							|  |  |  | 3485ad0,92020000 | 
					
						
							|  |  |  | 3485ad4,3042001f | 
					
						
							|  |  |  | 3485ad8,50400012 | 
					
						
							|  |  |  | 3485adc,26100004 | 
					
						
							|  |  |  | 3485ae0,32420001 | 
					
						
							|  |  |  | 3485ae4,5682000f | 
					
						
							|  |  |  | 3485ae8,26100004 | 
					
						
							|  |  |  | 3485aec,8e020000 | 
					
						
							|  |  |  | 3485af0,21f42 | 
					
						
							|  |  |  | 3485af4,31880 | 
					
						
							|  |  |  | 3485af8,751821 | 
					
						
							|  |  |  | 3485afc,21602 | 
					
						
							|  |  |  | 3485b00,3042001f | 
					
						
							|  |  |  | 3485b04,afa20010 | 
					
						
							|  |  |  | 3485b08,96070002 | 
					
						
							|  |  |  | 3485b0c,73c00 | 
					
						
							|  |  |  | 3485b10,92060001 | 
					
						
							|  |  |  | 3485b14,8c650000 | 
					
						
							|  |  |  | 3485b18,c1014fa | 
					
						
							|  |  |  | 3485b1c,2202025 | 
					
						
							|  |  |  | 3485b20,26100004 | 
					
						
							|  |  |  | 3485b24,1613ffea | 
					
						
							|  |  |  | 3485b28,129042 | 
					
						
							|  |  |  | 3485b2c,26730080 | 
					
						
							|  |  |  | 3485b30,16f3ffe5 | 
					
						
							|  |  |  | 3485b34,27de0004 | 
					
						
							|  |  |  | 3485b38,2c02825 | 
					
						
							|  |  |  | 3485b3c,c1014ba | 
					
						
							|  |  |  | 3485b40,240400ff | 
					
						
							|  |  |  | 3485b44,afa20044 | 
					
						
							|  |  |  | 3485b48,26940001 | 
					
						
							|  |  |  | 3485b4c,24020002 | 
					
						
							|  |  |  | 3485b50,1682ffcd | 
					
						
							|  |  |  | 3485b54,240300ff | 
					
						
							|  |  |  | 3485b58,8fa50048 | 
					
						
							|  |  |  | 3485b5c,9825 | 
					
						
							|  |  |  | 3485b60,24030040 | 
					
						
							|  |  |  | 3485b64,3c178041 | 
					
						
							|  |  |  | 3485b68,3c1e8041 | 
					
						
							|  |  |  | 3485b6c,3c158041 | 
					
						
							|  |  |  | 3485b70,26b5a1b4 | 
					
						
							|  |  |  | 3485b74,2416000c | 
					
						
							|  |  |  | 3485b78,3c148041 | 
					
						
							|  |  |  | 3485b7c,10000002 | 
					
						
							|  |  |  | 3485b80,2694b5ee | 
					
						
							|  |  |  | 3485b84,8fa50044 | 
					
						
							|  |  |  | 3485b88,8e240008 | 
					
						
							|  |  |  | 3485b8c,24820008 | 
					
						
							|  |  |  | 3485b90,ae220008 | 
					
						
							|  |  |  | 3485b94,3c02fa00 | 
					
						
							|  |  |  | 3485b98,ac820000 | 
					
						
							|  |  |  | 3485b9c,31600 | 
					
						
							|  |  |  | 3485ba0,33400 | 
					
						
							|  |  |  | 3485ba4,461025 | 
					
						
							|  |  |  | 3485ba8,451025 | 
					
						
							|  |  |  | 3485bac,31a00 | 
					
						
							|  |  |  | 3485bb0,431025 | 
					
						
							|  |  |  | 3485bb4,ac820004 | 
					
						
							|  |  |  | 3485bb8,26f2a09c | 
					
						
							|  |  |  | 3485bbc,27d0b5e0 | 
					
						
							|  |  |  | 3485bc0,92020000 | 
					
						
							|  |  |  | 3485bc4,5453000f | 
					
						
							|  |  |  | 3485bc8,26100002 | 
					
						
							|  |  |  | 3485bcc,92420000 | 
					
						
							|  |  |  | 3485bd0,21080 | 
					
						
							|  |  |  | 3485bd4,551021 | 
					
						
							|  |  |  | 3485bd8,afb60010 | 
					
						
							|  |  |  | 3485bdc,92430001 | 
					
						
							|  |  |  | 3485be0,31a00 | 
					
						
							|  |  |  | 3485be4,92470002 | 
					
						
							|  |  |  | 3485be8,e33825 | 
					
						
							|  |  |  | 3485bec,73c00 | 
					
						
							|  |  |  | 3485bf0,92060001 | 
					
						
							|  |  |  | 3485bf4,8c450000 | 
					
						
							|  |  |  | 3485bf8,c1014fa | 
					
						
							|  |  |  | 3485bfc,2202025 | 
					
						
							|  |  |  | 3485c00,26100002 | 
					
						
							|  |  |  | 3485c04,1614ffee | 
					
						
							|  |  |  | 3485c08,26520003 | 
					
						
							|  |  |  | 3485c0c,26730001 | 
					
						
							|  |  |  | 3485c10,327300ff | 
					
						
							|  |  |  | 3485c14,24020002 | 
					
						
							|  |  |  | 3485c18,1662ffda | 
					
						
							|  |  |  | 3485c1c,240300ff | 
					
						
							|  |  |  | 3485c20,3c028041 | 
					
						
							|  |  |  | 3485c24,9456b600 | 
					
						
							|  |  |  | 3485c28,24070001 | 
					
						
							|  |  |  | 3485c2c,3025 | 
					
						
							|  |  |  | 3485c30,3c058041 | 
					
						
							|  |  |  | 3485c34,24a5a408 | 
					
						
							|  |  |  | 3485c38,c101bdf | 
					
						
							|  |  |  | 3485c3c,2202025 | 
					
						
							|  |  |  | 3485c40,afa00038 | 
					
						
							|  |  |  | 3485c44,afa00034 | 
					
						
							|  |  |  | 3485c48,afa00030 | 
					
						
							|  |  |  | 3485c4c,b825 | 
					
						
							|  |  |  | 3485c50,3c108041 | 
					
						
							|  |  |  | 3485c54,2610a060 | 
					
						
							|  |  |  | 3485c58,8fa20044 | 
					
						
							|  |  |  | 3485c5c,afa2003c | 
					
						
							|  |  |  | 3485c60,3c028041 | 
					
						
							|  |  |  | 3485c64,2442a408 | 
					
						
							|  |  |  | 3485c68,afa20040 | 
					
						
							|  |  |  | 3485c6c,3c1e8041 | 
					
						
							|  |  |  | 3485c70,10000005 | 
					
						
							|  |  |  | 3485c74,27dea09c | 
					
						
							|  |  |  | 3485c78,afb50038 | 
					
						
							|  |  |  | 3485c7c,afb40034 | 
					
						
							|  |  |  | 3485c80,afb30030 | 
					
						
							|  |  |  | 3485c84,240b825 | 
					
						
							|  |  |  | 3485c88,92120000 | 
					
						
							|  |  |  | 3485c8c,92130001 | 
					
						
							|  |  |  | 3485c90,92140002 | 
					
						
							|  |  |  | 3485c94,32c20001 | 
					
						
							|  |  |  | 3485c98,1440000e | 
					
						
							|  |  |  | 3485c9c,8fb5003c | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3485ca0,24050040 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3485ca4,c1014ba | 
					
						
							|  |  |  | 3485ca8,2402025 | 
					
						
							|  |  |  | 3485cac,409025 | 
					
						
							|  |  |  | 3485cb0,24050040 | 
					
						
							|  |  |  | 3485cb4,c1014ba | 
					
						
							|  |  |  | 3485cb8,2602025 | 
					
						
							|  |  |  | 3485cbc,409825 | 
					
						
							|  |  |  | 3485cc0,24050040 | 
					
						
							|  |  |  | 3485cc4,c1014ba | 
					
						
							|  |  |  | 3485cc8,2802025 | 
					
						
							|  |  |  | 3485ccc,40a025 | 
					
						
							|  |  |  | 3485cd0,8fb50048 | 
					
						
							|  |  |  | 3485cd4,16570007 | 
					
						
							|  |  |  | 3485cd8,8fa20030 | 
					
						
							|  |  |  | 3485cdc,14530005 | 
					
						
							|  |  |  | 3485ce0,8fa20034 | 
					
						
							|  |  |  | 3485ce4,16820003 | 
					
						
							|  |  |  | 3485ce8,8fa20038 | 
					
						
							|  |  |  | 3485cec,5055000e | 
					
						
							|  |  |  | 3485cf0,92070003 | 
					
						
							|  |  |  | 3485cf4,8e230008 | 
					
						
							|  |  |  | 3485cf8,24620008 | 
					
						
							|  |  |  | 3485cfc,ae220008 | 
					
						
							|  |  |  | 3485d00,3c02fa00 | 
					
						
							|  |  |  | 3485d04,ac620000 | 
					
						
							|  |  |  | 3485d08,121600 | 
					
						
							|  |  |  | 3485d0c,132400 | 
					
						
							|  |  |  | 3485d10,441025 | 
					
						
							|  |  |  | 3485d14,551025 | 
					
						
							|  |  |  | 3485d18,142200 | 
					
						
							|  |  |  | 3485d1c,441025 | 
					
						
							|  |  |  | 3485d20,ac620004 | 
					
						
							|  |  |  | 3485d24,92070003 | 
					
						
							|  |  |  | 3485d28,2402000a | 
					
						
							|  |  |  | 3485d2c,afa20018 | 
					
						
							|  |  |  | 3485d30,24020006 | 
					
						
							|  |  |  | 3485d34,afa20014 | 
					
						
							|  |  |  | 3485d38,82020004 | 
					
						
							|  |  |  | 3485d3c,2442005c | 
					
						
							|  |  |  | 3485d40,afa20010 | 
					
						
							|  |  |  | 3485d44,24e70037 | 
					
						
							|  |  |  | 3485d48,3025 | 
					
						
							|  |  |  | 3485d4c,8fa50040 | 
					
						
							|  |  |  | 3485d50,c101c47 | 
					
						
							|  |  |  | 3485d54,2202025 | 
					
						
							|  |  |  | 3485d58,26100005 | 
					
						
							|  |  |  | 3485d5c,161effc6 | 
					
						
							|  |  |  | 3485d60,16b042 | 
					
						
							|  |  |  | 3485d64,3c108041 | 
					
						
							|  |  |  | 3485d68,2610b5d8 | 
					
						
							|  |  |  | 3485d6c,92020016 | 
					
						
							|  |  |  | 3485d70,8fb50044 | 
					
						
							|  |  |  | 3485d74,2a09025 | 
					
						
							|  |  |  | 3485d78,21840 | 
					
						
							|  |  |  | 3485d7c,621821 | 
					
						
							|  |  |  | 3485d80,3c028041 | 
					
						
							|  |  |  | 3485d84,2442a1c0 | 
					
						
							|  |  |  | 3485d88,621821 | 
					
						
							|  |  |  | 3485d8c,90620000 | 
					
						
							|  |  |  | 3485d90,21600 | 
					
						
							|  |  |  | 3485d94,90640001 | 
					
						
							|  |  |  | 3485d98,42400 | 
					
						
							|  |  |  | 3485d9c,441025 | 
					
						
							|  |  |  | 3485da0,90630002 | 
					
						
							|  |  |  | 3485da4,31a00 | 
					
						
							|  |  |  | 3485da8,431025 | 
					
						
							|  |  |  | 3485dac,551025 | 
					
						
							|  |  |  | 3485db0,8e230008 | 
					
						
							|  |  |  | 3485db4,24640008 | 
					
						
							|  |  |  | 3485db8,ae240008 | 
					
						
							|  |  |  | 3485dbc,3c13fa00 | 
					
						
							|  |  |  | 3485dc0,ac730000 | 
					
						
							|  |  |  | 3485dc4,ac620004 | 
					
						
							|  |  |  | 3485dc8,3c028041 | 
					
						
							|  |  |  | 3485dcc,2442a044 | 
					
						
							|  |  |  | 3485dd0,24030010 | 
					
						
							|  |  |  | 3485dd4,afa30010 | 
					
						
							|  |  |  | 3485dd8,90430005 | 
					
						
							|  |  |  | 3485ddc,31a00 | 
					
						
							|  |  |  | 3485de0,90470006 | 
					
						
							|  |  |  | 3485de4,e33825 | 
					
						
							|  |  |  | 3485de8,73c00 | 
					
						
							|  |  |  | 3485dec,24060001 | 
					
						
							|  |  |  | 3485df0,3c058041 | 
					
						
							|  |  |  | 3485df4,24a5a3f8 | 
					
						
							|  |  |  | 3485df8,c1014fa | 
					
						
							|  |  |  | 3485dfc,2202025 | 
					
						
							|  |  |  | 3485e00,2414ff00 | 
					
						
							|  |  |  | 3485e04,2b4a025 | 
					
						
							|  |  |  | 3485e08,8e220008 | 
					
						
							|  |  |  | 3485e0c,24430008 | 
					
						
							|  |  |  | 3485e10,ae230008 | 
					
						
							|  |  |  | 3485e14,ac530000 | 
					
						
							|  |  |  | 3485e18,ac540004 | 
					
						
							|  |  |  | 3485e1c,24070001 | 
					
						
							|  |  |  | 3485e20,2406000c | 
					
						
							|  |  |  | 3485e24,3c058041 | 
					
						
							|  |  |  | 3485e28,24a5a448 | 
					
						
							|  |  |  | 3485e2c,c101bdf | 
					
						
							|  |  |  | 3485e30,2202025 | 
					
						
							|  |  |  | 3485e34,92020017 | 
					
						
							|  |  |  | 3485e38,1440000e | 
					
						
							|  |  |  | 3485e3c,24100010 | 
					
						
							|  |  |  | 3485e40,24020010 | 
					
						
							|  |  |  | 3485e44,afa20018 | 
					
						
							|  |  |  | 3485e48,afa20014 | 
					
						
							|  |  |  | 3485e4c,2402005c | 
					
						
							|  |  |  | 3485e50,afa20010 | 
					
						
							|  |  |  | 3485e54,2407003c | 
					
						
							|  |  |  | 3485e58,3025 | 
					
						
							|  |  |  | 3485e5c,3c058041 | 
					
						
							|  |  |  | 3485e60,24a5a448 | 
					
						
							|  |  |  | 3485e64,c101c47 | 
					
						
							|  |  |  | 3485e68,2202025 | 
					
						
							|  |  |  | 3485e6c,10000014 | 
					
						
							|  |  |  | 3485e70,3c028041 | 
					
						
							|  |  |  | 3485e74,afb00018 | 
					
						
							|  |  |  | 3485e78,afb00014 | 
					
						
							|  |  |  | 3485e7c,2415005c | 
					
						
							|  |  |  | 3485e80,afb50010 | 
					
						
							|  |  |  | 3485e84,2407003a | 
					
						
							|  |  |  | 3485e88,3025 | 
					
						
							|  |  |  | 3485e8c,3c138041 | 
					
						
							|  |  |  | 3485e90,2665a448 | 
					
						
							|  |  |  | 3485e94,c101c47 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 3485e98,2202025 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3485e9c,afb00018 | 
					
						
							|  |  |  | 3485ea0,afb00014 | 
					
						
							|  |  |  | 3485ea4,afb50010 | 
					
						
							|  |  |  | 3485ea8,2407003e | 
					
						
							|  |  |  | 3485eac,3025 | 
					
						
							|  |  |  | 3485eb0,2665a448 | 
					
						
							|  |  |  | 3485eb4,c101c47 | 
					
						
							|  |  |  | 3485eb8,2202025 | 
					
						
							|  |  |  | 3485ebc,3c028041 | 
					
						
							|  |  |  | 3485ec0,9042b5fe | 
					
						
							|  |  |  | 3485ec4,2c42000a | 
					
						
							|  |  |  | 3485ec8,1040000b | 
					
						
							|  |  |  | 3485ecc,24070001 | 
					
						
							|  |  |  | 3485ed0,2402000a | 
					
						
							|  |  |  | 3485ed4,afa20010 | 
					
						
							|  |  |  | 3485ed8,3c028041 | 
					
						
							|  |  |  | 3485edc,8c47a058 | 
					
						
							|  |  |  | 3485ee0,24060001 | 
					
						
							|  |  |  | 3485ee4,3c058041 | 
					
						
							|  |  |  | 3485ee8,24a5a3d8 | 
					
						
							|  |  |  | 3485eec,c1014fa | 
					
						
							|  |  |  | 3485ef0,2202025 | 
					
						
							|  |  |  | 3485ef4,24070001 | 
					
						
							|  |  |  | 3485ef8,2406000b | 
					
						
							|  |  |  | 3485efc,3c108041 | 
					
						
							|  |  |  | 3485f00,2605a448 | 
					
						
							|  |  |  | 3485f04,c101bdf | 
					
						
							|  |  |  | 3485f08,2202025 | 
					
						
							|  |  |  | 3485f0c,24020010 | 
					
						
							|  |  |  | 3485f10,afa20018 | 
					
						
							|  |  |  | 3485f14,afa20014 | 
					
						
							|  |  |  | 3485f18,24020086 | 
					
						
							|  |  |  | 3485f1c,afa20010 | 
					
						
							|  |  |  | 3485f20,2407003c | 
					
						
							|  |  |  | 3485f24,3025 | 
					
						
							|  |  |  | 3485f28,2605a448 | 
					
						
							|  |  |  | 3485f2c,c101c47 | 
					
						
							|  |  |  | 3485f30,2202025 | 
					
						
							|  |  |  | 3485f34,3c028041 | 
					
						
							|  |  |  | 3485f38,9042b5fb | 
					
						
							|  |  |  | 3485f3c,2c42000a | 
					
						
							|  |  |  | 3485f40,1040001d | 
					
						
							|  |  |  | 3485f44,8e220008 | 
					
						
							|  |  |  | 3485f48,24430008 | 
					
						
							|  |  |  | 3485f4c,ae230008 | 
					
						
							|  |  |  | 3485f50,3c03fa00 | 
					
						
							|  |  |  | 3485f54,ac430000 | 
					
						
							|  |  |  | 3485f58,3c03f4ec | 
					
						
							|  |  |  | 3485f5c,24633000 | 
					
						
							|  |  |  | 3485f60,2439025 | 
					
						
							|  |  |  | 3485f64,ac520004 | 
					
						
							|  |  |  | 3485f68,3c038041 | 
					
						
							|  |  |  | 3485f6c,9062b564 | 
					
						
							|  |  |  | 3485f70,24440001 | 
					
						
							|  |  |  | 3485f74,a064b564 | 
					
						
							|  |  |  | 3485f78,3c038041 | 
					
						
							|  |  |  | 3485f7c,2463a044 | 
					
						
							|  |  |  | 3485f80,21082 | 
					
						
							|  |  |  | 3485f84,24040010 | 
					
						
							|  |  |  | 3485f88,afa40010 | 
					
						
							|  |  |  | 3485f8c,9064000f | 
					
						
							|  |  |  | 3485f90,42200 | 
					
						
							|  |  |  | 3485f94,90670010 | 
					
						
							|  |  |  | 3485f98,e43825 | 
					
						
							|  |  |  | 3485f9c,73c00 | 
					
						
							|  |  |  | 3485fa0,3046000f | 
					
						
							|  |  |  | 3485fa4,3c058041 | 
					
						
							|  |  |  | 3485fa8,24a5a418 | 
					
						
							|  |  |  | 3485fac,c1014fa | 
					
						
							|  |  |  | 3485fb0,2202025 | 
					
						
							|  |  |  | 3485fb4,8e220008 | 
					
						
							|  |  |  | 3485fb8,24430008 | 
					
						
							|  |  |  | 3485fbc,ae230008 | 
					
						
							|  |  |  | 3485fc0,3c03fa00 | 
					
						
							|  |  |  | 3485fc4,ac430000 | 
					
						
							|  |  |  | 3485fc8,ac540004 | 
					
						
							|  |  |  | 3485fcc,2407000a | 
					
						
							|  |  |  | 3485fd0,3025 | 
					
						
							|  |  |  | 3485fd4,3c058041 | 
					
						
							|  |  |  | 3485fd8,24a5a3e8 | 
					
						
							|  |  |  | 3485fdc,c101bdf | 
					
						
							|  |  |  | 3485fe0,2202025 | 
					
						
							|  |  |  | 3485fe4,8fa2004c | 
					
						
							|  |  |  | 3485fe8,2453001b | 
					
						
							|  |  |  | 3485fec,3c168041 | 
					
						
							|  |  |  | 3485ff0,26d6b5f0 | 
					
						
							|  |  |  | 3485ff4,3c148041 | 
					
						
							|  |  |  | 3485ff8,2694a044 | 
					
						
							|  |  |  | 3485ffc,26820019 | 
					
						
							|  |  |  | 3486000,afa20034 | 
					
						
							|  |  |  | 3486004,24170001 | 
					
						
							|  |  |  | 3486008,241e0008 | 
					
						
							|  |  |  | 348600c,3c028041 | 
					
						
							|  |  |  | 3486010,2442a3e8 | 
					
						
							|  |  |  | 3486014,afa20038 | 
					
						
							|  |  |  | 3486018,afa00020 | 
					
						
							|  |  |  | 348601c,afa00024 | 
					
						
							|  |  |  | 3486020,afa00028 | 
					
						
							|  |  |  | 3486024,afa0002c | 
					
						
							|  |  |  | 3486028,27b20020 | 
					
						
							|  |  |  | 348602c,2401825 | 
					
						
							|  |  |  | 3486030,2c02025 | 
					
						
							|  |  |  | 3486034,90820000 | 
					
						
							|  |  |  | 3486038,54570006 | 
					
						
							|  |  |  | 348603c,2c42000a | 
					
						
							|  |  |  | 3486040,8c620000 | 
					
						
							|  |  |  | 3486044,2442ffff | 
					
						
							|  |  |  | 3486048,ac620000 | 
					
						
							|  |  |  | 348604c,10000003 | 
					
						
							|  |  |  | 3486050,24020005 | 
					
						
							|  |  |  | 3486054,21023 | 
					
						
							|  |  |  | 3486058,30420006 | 
					
						
							|  |  |  | 348605c,8c650000 | 
					
						
							|  |  |  | 3486060,a21021 | 
					
						
							|  |  |  | 3486064,ac620004 | 
					
						
							|  |  |  | 3486068,24840001 | 
					
						
							|  |  |  | 348606c,1493fff1 | 
					
						
							|  |  |  | 3486070,24630004 | 
					
						
							|  |  |  | 3486074,92950000 | 
					
						
							|  |  |  | 3486078,26b50037 | 
					
						
							|  |  |  | 348607c,82820002 | 
					
						
							|  |  |  | 3486080,2a2a821 | 
					
						
							|  |  |  | 3486084,92820004 | 
					
						
							|  |  |  | 3486088,10400006 | 
					
						
							|  |  |  | 348608c,2801825 | 
					
						
							|  |  |  | 3486090,8fa4002c | 
					
						
							|  |  |  | 3486094,417c2 | 
					
						
							|  |  |  | 3486098,441021 | 
					
						
							|  |  |  | 348609c,21043 | 
					
						
							|  |  |  | 34860a0,2a2a823 | 
					
						
							|  |  |  | 34860a4,80620001 | 
					
						
							|  |  |  | 34860a8,2442005c | 
					
						
							|  |  |  | 34860ac,80630003 | 
					
						
							|  |  |  | 34860b0,431021 | 
					
						
							|  |  |  | 34860b4,afa20030 | 
					
						
							|  |  |  | 34860b8,2c08025 | 
					
						
							|  |  |  | 34860bc,92060000 | 
					
						
							|  |  |  | 34860c0,2cc2000a | 
					
						
							|  |  |  | 34860c4,5040000b | 
					
						
							|  |  |  | 34860c8,26100001 | 
					
						
							|  |  |  | 34860cc,8e470000 | 
					
						
							|  |  |  | 34860d0,afbe0018 | 
					
						
							|  |  |  | 34860d4,afbe0014 | 
					
						
							|  |  |  | 34860d8,8fa20030 | 
					
						
							|  |  |  | 34860dc,afa20010 | 
					
						
							|  |  |  | 34860e0,2a73821 | 
					
						
							|  |  |  | 34860e4,8fa50038 | 
					
						
							|  |  |  | 34860e8,c101c47 | 
					
						
							|  |  |  | 34860ec,2202025 | 
					
						
							|  |  |  | 34860f0,26100001 | 
					
						
							|  |  |  | 34860f4,1613fff1 | 
					
						
							|  |  |  | 34860f8,26520004 | 
					
						
							|  |  |  | 34860fc,26730003 | 
					
						
							|  |  |  | 3486100,26940005 | 
					
						
							|  |  |  | 3486104,8fa20034 | 
					
						
							|  |  |  | 3486108,1454ffc3 | 
					
						
							|  |  |  | 348610c,26d60003 | 
					
						
							|  |  |  | 3486110,8fbf0074 | 
					
						
							|  |  |  | 3486114,8fbe0070 | 
					
						
							|  |  |  | 3486118,8fb7006c | 
					
						
							|  |  |  | 348611c,8fb60068 | 
					
						
							|  |  |  | 3486120,8fb50064 | 
					
						
							|  |  |  | 3486124,8fb40060 | 
					
						
							|  |  |  | 3486128,8fb3005c | 
					
						
							|  |  |  | 348612c,8fb20058 | 
					
						
							|  |  |  | 3486130,8fb10054 | 
					
						
							|  |  |  | 3486134,8fb00050 | 
					
						
							|  |  |  | 3486138,3e00008 | 
					
						
							|  |  |  | 348613c,27bd0078 | 
					
						
							|  |  |  | 3486140,27bdffa0 | 
					
						
							|  |  |  | 3486144,afbf005c | 
					
						
							|  |  |  | 3486148,afbe0058 | 
					
						
							|  |  |  | 348614c,afb70054 | 
					
						
							|  |  |  | 3486150,afb60050 | 
					
						
							|  |  |  | 3486154,afb5004c | 
					
						
							|  |  |  | 3486158,afb40048 | 
					
						
							|  |  |  | 348615c,afb30044 | 
					
						
							|  |  |  | 3486160,afb20040 | 
					
						
							|  |  |  | 3486164,afb1003c | 
					
						
							|  |  |  | 3486168,afb00038 | 
					
						
							|  |  |  | 348616c,afa40060 | 
					
						
							|  |  |  | 3486170,afa50064 | 
					
						
							|  |  |  | 3486174,3c02801c | 
					
						
							|  |  |  | 3486178,344284a0 | 
					
						
							|  |  |  | 348617c,8c500000 | 
					
						
							|  |  |  | 3486180,261402b8 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3486184,8e0202c0 | 
					
						
							|  |  |  | 3486188,24430008 | 
					
						
							|  |  |  | 348618c,ae0302c0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3486190,3c03de00 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3486194,ac430000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3486198,3c038041 | 
					
						
							|  |  |  | 348619c,2463a488 | 
					
						
							|  |  |  | 34861a0,ac430004 | 
					
						
							|  |  |  | 34861a4,8e0202c0 | 
					
						
							|  |  |  | 34861a8,24430008 | 
					
						
							|  |  |  | 34861ac,ae0302c0 | 
					
						
							|  |  |  | 34861b0,3c03e700 | 
					
						
							|  |  |  | 34861b4,ac430000 | 
					
						
							|  |  |  | 34861b8,ac400004 | 
					
						
							|  |  |  | 34861bc,8e0202c0 | 
					
						
							|  |  |  | 34861c0,24430008 | 
					
						
							|  |  |  | 34861c4,ae0302c0 | 
					
						
							|  |  |  | 34861c8,3c03fc11 | 
					
						
							|  |  |  | 34861cc,34639623 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34861d0,ac430000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34861d4,3c03ff2f | 
					
						
							|  |  |  | 34861d8,3463ffff | 
					
						
							|  |  |  | 34861dc,ac430004 | 
					
						
							|  |  |  | 34861e0,8e0202c0 | 
					
						
							|  |  |  | 34861e4,24430008 | 
					
						
							|  |  |  | 34861e8,ae0302c0 | 
					
						
							|  |  |  | 34861ec,3c03fa00 | 
					
						
							|  |  |  | 34861f0,ac430000 | 
					
						
							|  |  |  | 34861f4,2403ffff | 
					
						
							|  |  |  | 34861f8,ac430004 | 
					
						
							|  |  |  | 34861fc,3c028041 | 
					
						
							|  |  |  | 3486200,8c52b568 | 
					
						
							|  |  |  | 3486204,24110054 | 
					
						
							|  |  |  | 3486208,3c178041 | 
					
						
							|  |  |  | 348620c,26f7a348 | 
					
						
							|  |  |  | 3486210,3c168041 | 
					
						
							|  |  |  | 3486214,26d6b4cc | 
					
						
							|  |  |  | 3486218,24150018 | 
					
						
							|  |  |  | 348621c,241e000c | 
					
						
							|  |  |  | 3486220,3242001f | 
					
						
							|  |  |  | 3486224,21040 | 
					
						
							|  |  |  | 3486228,129143 | 
					
						
							|  |  |  | 348622c,571021 | 
					
						
							|  |  |  | 3486230,90430000 | 
					
						
							|  |  |  | 3486234,31880 | 
					
						
							|  |  |  | 3486238,761821 | 
					
						
							|  |  |  | 348623c,8c730000 | 
					
						
							|  |  |  | 3486240,24070001 | 
					
						
							|  |  |  | 3486244,90460001 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3486248,2602825 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348624c,c101bdf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3486250,2802025 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3486254,afb50018 | 
					
						
							|  |  |  | 3486258,afb50014 | 
					
						
							|  |  |  | 348625c,afbe0010 | 
					
						
							|  |  |  | 3486260,2203825 | 
					
						
							|  |  |  | 3486264,3025 | 
					
						
							|  |  |  | 3486268,2602825 | 
					
						
							|  |  |  | 348626c,c101c47 | 
					
						
							|  |  |  | 3486270,2802025 | 
					
						
							|  |  |  | 3486274,26310020 | 
					
						
							|  |  |  | 3486278,240200f4 | 
					
						
							|  |  |  | 348627c,1622ffe9 | 
					
						
							|  |  |  | 3486280,3242001f | 
					
						
							|  |  |  | 3486284,8fa50064 | 
					
						
							|  |  |  | 3486288,c1015f5 | 
					
						
							|  |  |  | 348628c,2802025 | 
					
						
							|  |  |  | 3486290,8e0202c0 | 
					
						
							|  |  |  | 3486294,24430008 | 
					
						
							|  |  |  | 3486298,ae0302c0 | 
					
						
							|  |  |  | 348629c,3c03e700 | 
					
						
							|  |  |  | 34862a0,ac430000 | 
					
						
							|  |  |  | 34862a4,ac400004 | 
					
						
							|  |  |  | 34862a8,8e0202c0 | 
					
						
							|  |  |  | 34862ac,24430008 | 
					
						
							|  |  |  | 34862b0,ae0302c0 | 
					
						
							|  |  |  | 34862b4,3c03fcff | 
					
						
							|  |  |  | 34862b8,3463ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34862bc,ac430000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34862c0,3c03fffd | 
					
						
							|  |  |  | 34862c4,3463f6fb | 
					
						
							|  |  |  | 34862c8,ac430004 | 
					
						
							|  |  |  | 34862cc,8e0202c0 | 
					
						
							|  |  |  | 34862d0,24430008 | 
					
						
							|  |  |  | 34862d4,ae0302c0 | 
					
						
							|  |  |  | 34862d8,3c03fa00 | 
					
						
							|  |  |  | 34862dc,ac430000 | 
					
						
							|  |  |  | 34862e0,93a30063 | 
					
						
							|  |  |  | 34862e4,ac430004 | 
					
						
							|  |  |  | 34862e8,3c02e450 | 
					
						
							|  |  |  | 34862ec,244203c0 | 
					
						
							|  |  |  | 34862f0,afa20020 | 
					
						
							|  |  |  | 34862f4,afa00024 | 
					
						
							|  |  |  | 34862f8,3c02e100 | 
					
						
							|  |  |  | 34862fc,afa20028 | 
					
						
							|  |  |  | 3486300,afa0002c | 
					
						
							|  |  |  | 3486304,3c02f100 | 
					
						
							|  |  |  | 3486308,afa20030 | 
					
						
							|  |  |  | 348630c,3c020400 | 
					
						
							|  |  |  | 3486310,24420400 | 
					
						
							|  |  |  | 3486314,afa20034 | 
					
						
							|  |  |  | 3486318,27a20020 | 
					
						
							|  |  |  | 348631c,27a60038 | 
					
						
							|  |  |  | 3486320,8e0302c0 | 
					
						
							|  |  |  | 3486324,24640008 | 
					
						
							|  |  |  | 3486328,ae0402c0 | 
					
						
							|  |  |  | 348632c,8c450004 | 
					
						
							|  |  |  | 3486330,8c440000 | 
					
						
							|  |  |  | 3486334,ac650004 | 
					
						
							|  |  |  | 3486338,24420008 | 
					
						
							|  |  |  | 348633c,14c2fff8 | 
					
						
							|  |  |  | 3486340,ac640000 | 
					
						
							|  |  |  | 3486344,8fbf005c | 
					
						
							|  |  |  | 3486348,8fbe0058 | 
					
						
							|  |  |  | 348634c,8fb70054 | 
					
						
							|  |  |  | 3486350,8fb60050 | 
					
						
							|  |  |  | 3486354,8fb5004c | 
					
						
							|  |  |  | 3486358,8fb40048 | 
					
						
							|  |  |  | 348635c,8fb30044 | 
					
						
							|  |  |  | 3486360,8fb20040 | 
					
						
							|  |  |  | 3486364,8fb1003c | 
					
						
							|  |  |  | 3486368,8fb00038 | 
					
						
							|  |  |  | 348636c,3e00008 | 
					
						
							|  |  |  | 3486370,27bd0060 | 
					
						
							|  |  |  | 3486374,3c028041 | 
					
						
							|  |  |  | 3486378,9042b56c | 
					
						
							|  |  |  | 348637c,1040000d | 
					
						
							|  |  |  | 3486380,3c028011 | 
					
						
							|  |  |  | 3486384,3442a5d0 | 
					
						
							|  |  |  | 3486388,8c430000 | 
					
						
							|  |  |  | 348638c,24020517 | 
					
						
							|  |  |  | 3486390,14620008 | 
					
						
							|  |  |  | 3486398,27bdffe8 | 
					
						
							|  |  |  | 348639c,afbf0014 | 
					
						
							|  |  |  | 34863a0,c10253a | 
					
						
							|  |  |  | 34863a8,8fbf0014 | 
					
						
							|  |  |  | 34863ac,3e00008 | 
					
						
							|  |  |  | 34863b0,27bd0018 | 
					
						
							|  |  |  | 34863b4,3e00008 | 
					
						
							|  |  |  | 34863bc,14800003 | 
					
						
							|  |  |  | 34863c0,3c028041 | 
					
						
							|  |  |  | 34863c4,3e00008 | 
					
						
							|  |  |  | 34863c8,8c42a388 | 
					
						
							|  |  |  | 34863cc,27bdffe8 | 
					
						
							|  |  |  | 34863d0,afbf0014 | 
					
						
							|  |  |  | 34863d4,afb00010 | 
					
						
							|  |  |  | 34863d8,808025 | 
					
						
							|  |  |  | 34863dc,c1018ef | 
					
						
							|  |  |  | 34863e0,42102 | 
					
						
							|  |  |  | 34863e4,3210000f | 
					
						
							|  |  |  | 34863e8,108080 | 
					
						
							|  |  |  | 34863ec,3c038041 | 
					
						
							|  |  |  | 34863f0,2463a388 | 
					
						
							|  |  |  | 34863f4,2038021 | 
					
						
							|  |  |  | 34863f8,8e030000 | 
					
						
							|  |  |  | 34863fc,431021 | 
					
						
							|  |  |  | 3486400,8fbf0014 | 
					
						
							|  |  |  | 3486404,8fb00010 | 
					
						
							|  |  |  | 3486408,3e00008 | 
					
						
							|  |  |  | 348640c,27bd0018 | 
					
						
							|  |  |  | 3486410,3c028011 | 
					
						
							|  |  |  | 3486414,3442a5d0 | 
					
						
							|  |  |  | 3486418,8c42135c | 
					
						
							|  |  |  | 348641c,1440004c | 
					
						
							|  |  |  | 3486420,3c028041 | 
					
						
							|  |  |  | 3486424,9042b570 | 
					
						
							|  |  |  | 3486428,10400049 | 
					
						
							|  |  |  | 348642c,3c038011 | 
					
						
							|  |  |  | 3486430,3463a5d0 | 
					
						
							|  |  |  | 3486434,906300b2 | 
					
						
							|  |  |  | 3486438,30630001 | 
					
						
							|  |  |  | 348643c,14600044 | 
					
						
							|  |  |  | 3486440,24030003 | 
					
						
							|  |  |  | 3486444,27bdffe8 | 
					
						
							|  |  |  | 3486448,10430028 | 
					
						
							|  |  |  | 348644c,afbf0014 | 
					
						
							|  |  |  | 3486450,2c430004 | 
					
						
							|  |  |  | 3486454,10600007 | 
					
						
							|  |  |  | 3486458,24030001 | 
					
						
							|  |  |  | 348645c,1043000a | 
					
						
							|  |  |  | 3486460,24030002 | 
					
						
							|  |  |  | 3486464,10430014 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3486468,3c028011 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348646c,10000036 | 
					
						
							|  |  |  | 3486470,8fbf0014 | 
					
						
							|  |  |  | 3486474,24030004 | 
					
						
							|  |  |  | 3486478,10430029 | 
					
						
							|  |  |  | 348647c,3c028011 | 
					
						
							|  |  |  | 3486480,10000031 | 
					
						
							|  |  |  | 3486484,8fbf0014 | 
					
						
							|  |  |  | 3486488,3c028011 | 
					
						
							|  |  |  | 348648c,3442a5d0 | 
					
						
							|  |  |  | 3486490,8c4400a4 | 
					
						
							|  |  |  | 3486494,c1018ef | 
					
						
							|  |  |  | 3486498,3084003f | 
					
						
							|  |  |  | 348649c,3c038041 | 
					
						
							|  |  |  | 34864a0,9463b56e | 
					
						
							|  |  |  | 34864a4,43102b | 
					
						
							|  |  |  | 34864a8,10400024 | 
					
						
							|  |  |  | 34864ac,8fbf0014 | 
					
						
							|  |  |  | 34864b0,10000025 | 
					
						
							|  |  |  | 34864b8,3442a5d0 | 
					
						
							|  |  |  | 34864bc,8c4400a4 | 
					
						
							|  |  |  | 34864c0,3c02001c | 
					
						
							|  |  |  | 34864c4,2442003f | 
					
						
							|  |  |  | 34864c8,c1018ef | 
					
						
							|  |  |  | 34864cc,822024 | 
					
						
							|  |  |  | 34864d0,3c038041 | 
					
						
							|  |  |  | 34864d4,9463b56e | 
					
						
							|  |  |  | 34864d8,43102b | 
					
						
							|  |  |  | 34864dc,10400017 | 
					
						
							|  |  |  | 34864e0,8fbf0014 | 
					
						
							|  |  |  | 34864e4,10000018 | 
					
						
							|  |  |  | 34864ec,3c028011 | 
					
						
							|  |  |  | 34864f0,3442a5d0 | 
					
						
							|  |  |  | 34864f4,8c4400a4 | 
					
						
							|  |  |  | 34864f8,3c02001c | 
					
						
							|  |  |  | 34864fc,c1018ef | 
					
						
							|  |  |  | 3486500,822024 | 
					
						
							|  |  |  | 3486504,3c038041 | 
					
						
							|  |  |  | 3486508,9463b56e | 
					
						
							|  |  |  | 348650c,43102b | 
					
						
							|  |  |  | 3486510,1040000a | 
					
						
							|  |  |  | 3486514,8fbf0014 | 
					
						
							|  |  |  | 3486518,1000000b | 
					
						
							|  |  |  | 3486520,3442a5d0 | 
					
						
							|  |  |  | 3486524,844200d0 | 
					
						
							|  |  |  | 3486528,3c038041 | 
					
						
							|  |  |  | 348652c,9463b56e | 
					
						
							|  |  |  | 3486530,43102a | 
					
						
							|  |  |  | 3486534,14400004 | 
					
						
							|  |  |  | 3486538,8fbf0014 | 
					
						
							|  |  |  | 348653c,c101a70 | 
					
						
							|  |  |  | 3486540,24040003 | 
					
						
							|  |  |  | 3486544,8fbf0014 | 
					
						
							|  |  |  | 3486548,3e00008 | 
					
						
							|  |  |  | 348654c,27bd0018 | 
					
						
							|  |  |  | 3486550,3e00008 | 
					
						
							|  |  |  | 3486558,27bdffe8 | 
					
						
							|  |  |  | 348655c,afbf0014 | 
					
						
							|  |  |  | 3486560,3c028041 | 
					
						
							|  |  |  | 3486564,8c42b5a0 | 
					
						
							|  |  |  | 3486568,218c0 | 
					
						
							|  |  |  | 348656c,3c048041 | 
					
						
							|  |  |  | 3486570,2484b61c | 
					
						
							|  |  |  | 3486574,641821 | 
					
						
							|  |  |  | 3486578,8c630000 | 
					
						
							|  |  |  | 348657c,1060000c | 
					
						
							|  |  |  | 3486580,24420001 | 
					
						
							|  |  |  | 3486584,220c0 | 
					
						
							|  |  |  | 3486588,3c038041 | 
					
						
							|  |  |  | 348658c,2463b61c | 
					
						
							|  |  |  | 3486590,641821 | 
					
						
							|  |  |  | 3486594,402825 | 
					
						
							|  |  |  | 3486598,8c640000 | 
					
						
							|  |  |  | 348659c,24420001 | 
					
						
							|  |  |  | 34865a0,1480fffc | 
					
						
							|  |  |  | 34865a4,24630008 | 
					
						
							|  |  |  | 34865a8,3c028041 | 
					
						
							|  |  |  | 34865ac,ac45b5a0 | 
					
						
							|  |  |  | 34865b0,c102742 | 
					
						
							|  |  |  | 34865b4,2404013c | 
					
						
							|  |  |  | 34865b8,3c038041 | 
					
						
							|  |  |  | 34865bc,ac62b59c | 
					
						
							|  |  |  | 34865c0,24030001 | 
					
						
							|  |  |  | 34865c4,ac430130 | 
					
						
							|  |  |  | 34865c8,8fbf0014 | 
					
						
							|  |  |  | 34865cc,3e00008 | 
					
						
							|  |  |  | 34865d0,27bd0018 | 
					
						
							|  |  |  | 34865d4,801025 | 
					
						
							|  |  |  | 34865d8,84a30000 | 
					
						
							|  |  |  | 34865dc,2404000a | 
					
						
							|  |  |  | 34865e0,14640012 | 
					
						
							|  |  |  | 34865e4,24040015 | 
					
						
							|  |  |  | 34865e8,24030010 | 
					
						
							|  |  |  | 34865ec,14c30008 | 
					
						
							|  |  |  | 34865f0,94a3001c | 
					
						
							|  |  |  | 34865f4,31942 | 
					
						
							|  |  |  | 34865f8,3063007f | 
					
						
							|  |  |  | 34865fc,24040075 | 
					
						
							|  |  |  | 3486600,54640003 | 
					
						
							|  |  |  | 3486604,94a3001c | 
					
						
							|  |  |  | 3486608,3e00008 | 
					
						
							|  |  |  | 348660c,ac400000 | 
					
						
							|  |  |  | 3486610,3063001f | 
					
						
							|  |  |  | 3486614,a0400000 | 
					
						
							|  |  |  | 3486618,a0460001 | 
					
						
							|  |  |  | 348661c,24040001 | 
					
						
							|  |  |  | 3486620,a0440002 | 
					
						
							|  |  |  | 3486624,3e00008 | 
					
						
							|  |  |  | 3486628,a0430003 | 
					
						
							|  |  |  | 348662c,14640010 | 
					
						
							|  |  |  | 3486630,2404019c | 
					
						
							|  |  |  | 3486634,90a3001d | 
					
						
							|  |  |  | 3486638,24040006 | 
					
						
							|  |  |  | 348663c,10640005 | 
					
						
							|  |  |  | 3486640,24040011 | 
					
						
							|  |  |  | 3486644,50640004 | 
					
						
							|  |  |  | 3486648,90a30141 | 
					
						
							|  |  |  | 348664c,3e00008 | 
					
						
							|  |  |  | 3486650,ac400000 | 
					
						
							|  |  |  | 3486654,90a30141 | 
					
						
							|  |  |  | 3486658,a0400000 | 
					
						
							|  |  |  | 348665c,a0460001 | 
					
						
							|  |  |  | 3486660,24040002 | 
					
						
							|  |  |  | 3486664,a0440002 | 
					
						
							|  |  |  | 3486668,3e00008 | 
					
						
							|  |  |  | 348666c,a0430003 | 
					
						
							|  |  |  | 3486670,1464000a | 
					
						
							|  |  |  | 3486674,2404003e | 
					
						
							|  |  |  | 3486678,94a4001c | 
					
						
							|  |  |  | 348667c,a0400000 | 
					
						
							|  |  |  | 3486680,41a02 | 
					
						
							|  |  |  | 3486684,3063001f | 
					
						
							|  |  |  | 3486688,a0430001 | 
					
						
							|  |  |  | 348668c,24030003 | 
					
						
							|  |  |  | 3486690,a0430002 | 
					
						
							|  |  |  | 3486694,3e00008 | 
					
						
							|  |  |  | 3486698,a0440003 | 
					
						
							|  |  |  | 348669c,54c4000d | 
					
						
							|  |  |  | 34866a0,a4400000 | 
					
						
							|  |  |  | 34866a4,2404011a | 
					
						
							|  |  |  | 34866a8,5464000a | 
					
						
							|  |  |  | 34866ac,a4400000 | 
					
						
							|  |  |  | 34866b0,3c038011 | 
					
						
							|  |  |  | 34866b4,3463a5d0 | 
					
						
							|  |  |  | 34866b8,90631397 | 
					
						
							|  |  |  | 34866bc,a0400000 | 
					
						
							|  |  |  | 34866c0,a0430001 | 
					
						
							|  |  |  | 34866c4,24030004 | 
					
						
							|  |  |  | 34866c8,a0430002 | 
					
						
							|  |  |  | 34866cc,3e00008 | 
					
						
							|  |  |  | 34866d0,a0470003 | 
					
						
							|  |  |  | 34866d4,a0400002 | 
					
						
							|  |  |  | 34866d8,a0460001 | 
					
						
							|  |  |  | 34866dc,3e00008 | 
					
						
							|  |  |  | 34866e0,a0470003 | 
					
						
							|  |  |  | 34866e4,3c038041 | 
					
						
							|  |  |  | 34866e8,8c67b5a0 | 
					
						
							|  |  |  | 34866ec,24e7ffff | 
					
						
							|  |  |  | 34866f0,4e00021 | 
					
						
							|  |  |  | 34866f4,801025 | 
					
						
							|  |  |  | 34866f8,27bdfff8 | 
					
						
							|  |  |  | 34866fc,4825 | 
					
						
							|  |  |  | 3486700,3c0a8041 | 
					
						
							|  |  |  | 3486704,254ab61c | 
					
						
							|  |  |  | 3486708,1273021 | 
					
						
							|  |  |  | 348670c,61fc2 | 
					
						
							|  |  |  | 3486710,661821 | 
					
						
							|  |  |  | 3486714,31843 | 
					
						
							|  |  |  | 3486718,330c0 | 
					
						
							|  |  |  | 348671c,ca3021 | 
					
						
							|  |  |  | 3486720,8cc80000 | 
					
						
							|  |  |  | 3486724,8cc60004 | 
					
						
							|  |  |  | 3486728,afa60004 | 
					
						
							|  |  |  | 348672c,a8302b | 
					
						
							|  |  |  | 3486730,10c00003 | 
					
						
							|  |  |  | 3486734,105302b | 
					
						
							|  |  |  | 3486738,10000008 | 
					
						
							|  |  |  | 348673c,2467ffff | 
					
						
							|  |  |  | 3486740,50c00003 | 
					
						
							|  |  |  | 3486744,ac480000 | 
					
						
							|  |  |  | 3486748,10000004 | 
					
						
							|  |  |  | 348674c,24690001 | 
					
						
							|  |  |  | 3486750,8fa30004 | 
					
						
							|  |  |  | 3486754,10000006 | 
					
						
							|  |  |  | 3486758,ac430004 | 
					
						
							|  |  |  | 348675c,e9182a | 
					
						
							|  |  |  | 3486760,1060ffea | 
					
						
							|  |  |  | 3486764,1273021 | 
					
						
							|  |  |  | 3486768,ac400000 | 
					
						
							|  |  |  | 348676c,ac400004 | 
					
						
							|  |  |  | 3486770,3e00008 | 
					
						
							|  |  |  | 3486774,27bd0008 | 
					
						
							|  |  |  | 3486778,ac800000 | 
					
						
							|  |  |  | 348677c,3e00008 | 
					
						
							|  |  |  | 3486780,ac800004 | 
					
						
							|  |  |  | 3486784,27bdffe0 | 
					
						
							|  |  |  | 3486788,afbf001c | 
					
						
							|  |  |  | 348678c,afb00018 | 
					
						
							|  |  |  | 3486790,808025 | 
					
						
							|  |  |  | 3486794,c101975 | 
					
						
							|  |  |  | 3486798,27a40010 | 
					
						
							|  |  |  | 348679c,8fa50010 | 
					
						
							|  |  |  | 34867a0,14a00004 | 
					
						
							|  |  |  | 34867a8,ae000000 | 
					
						
							|  |  |  | 34867ac,10000003 | 
					
						
							|  |  |  | 34867b0,ae000004 | 
					
						
							|  |  |  | 34867b4,c1019b9 | 
					
						
							|  |  |  | 34867b8,2002025 | 
					
						
							|  |  |  | 34867bc,2001025 | 
					
						
							|  |  |  | 34867c0,8fbf001c | 
					
						
							|  |  |  | 34867c4,8fb00018 | 
					
						
							|  |  |  | 34867c8,3e00008 | 
					
						
							|  |  |  | 34867cc,27bd0020 | 
					
						
							|  |  |  | 34867d0,27bdffe8 | 
					
						
							|  |  |  | 34867d4,afbf0014 | 
					
						
							|  |  |  | 34867d8,afb00010 | 
					
						
							|  |  |  | 34867dc,afa40018 | 
					
						
							|  |  |  | 34867e0,58202 | 
					
						
							|  |  |  | 34867e4,afa5001c | 
					
						
							|  |  |  | 34867e8,321000ff | 
					
						
							|  |  |  | 34867ec,c101eeb | 
					
						
							|  |  |  | 34867f0,52402 | 
					
						
							|  |  |  | 34867f4,c101edc | 
					
						
							|  |  |  | 34867f8,402025 | 
					
						
							|  |  |  | 34867fc,3c038041 | 
					
						
							|  |  |  | 3486800,8fa40018 | 
					
						
							|  |  |  | 3486804,ac64b594 | 
					
						
							|  |  |  | 3486808,2463b594 | 
					
						
							|  |  |  | 348680c,8fa4001c | 
					
						
							|  |  |  | 3486810,ac640004 | 
					
						
							|  |  |  | 3486814,10202b | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3486818,3c038041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348681c,ac64b590 | 
					
						
							|  |  |  | 3486820,3c038041 | 
					
						
							|  |  |  | 3486824,ac62b58c | 
					
						
							|  |  |  | 3486828,90440001 | 
					
						
							|  |  |  | 348682c,3c038041 | 
					
						
							|  |  |  | 3486830,ac64b588 | 
					
						
							|  |  |  | 3486834,94440002 | 
					
						
							|  |  |  | 3486838,3c038041 | 
					
						
							|  |  |  | 348683c,ac64b584 | 
					
						
							|  |  |  | 3486840,94440004 | 
					
						
							|  |  |  | 3486844,3c038041 | 
					
						
							|  |  |  | 3486848,ac64b580 | 
					
						
							|  |  |  | 348684c,80440006 | 
					
						
							|  |  |  | 3486850,3c038041 | 
					
						
							|  |  |  | 3486854,ac64b57c | 
					
						
							|  |  |  | 3486858,90420007 | 
					
						
							|  |  |  | 348685c,30420001 | 
					
						
							|  |  |  | 3486860,3c038041 | 
					
						
							|  |  |  | 3486864,16000003 | 
					
						
							|  |  |  | 3486868,ac62b578 | 
					
						
							|  |  |  | 348686c,3c028040 | 
					
						
							|  |  |  | 3486870,90500024 | 
					
						
							|  |  |  | 3486874,3c028040 | 
					
						
							|  |  |  | 3486878,a0500025 | 
					
						
							|  |  |  | 348687c,8fbf0014 | 
					
						
							|  |  |  | 3486880,8fb00010 | 
					
						
							|  |  |  | 3486884,3e00008 | 
					
						
							|  |  |  | 3486888,27bd0018 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348688c,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3486890,ac40b594 | 
					
						
							|  |  |  | 3486894,2442b594 | 
					
						
							|  |  |  | 3486898,ac400004 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348689c,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34868a0,ac40b590 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34868a4,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34868a8,ac40b58c | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34868ac,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34868b0,ac40b588 | 
					
						
							|  |  |  | 34868b4,3c028041 | 
					
						
							|  |  |  | 34868b8,ac40b584 | 
					
						
							|  |  |  | 34868bc,3c028041 | 
					
						
							|  |  |  | 34868c0,ac40b580 | 
					
						
							|  |  |  | 34868c4,3c028041 | 
					
						
							|  |  |  | 34868c8,ac40b57c | 
					
						
							|  |  |  | 34868cc,3c028041 | 
					
						
							|  |  |  | 34868d0,3e00008 | 
					
						
							|  |  |  | 34868d4,ac40b578 | 
					
						
							|  |  |  | 34868d8,8c830000 | 
					
						
							|  |  |  | 34868dc,3c028040 | 
					
						
							|  |  |  | 34868e0,ac43002c | 
					
						
							|  |  |  | 34868e4,94830004 | 
					
						
							|  |  |  | 34868e8,3c028040 | 
					
						
							|  |  |  | 34868ec,a4430030 | 
					
						
							|  |  |  | 34868f0,90830006 | 
					
						
							|  |  |  | 34868f4,3c028040 | 
					
						
							|  |  |  | 34868f8,3e00008 | 
					
						
							|  |  |  | 34868fc,a4430032 | 
					
						
							|  |  |  | 3486900,afa40000 | 
					
						
							|  |  |  | 3486904,afa50004 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3486908,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348690c,2442b604 | 
					
						
							|  |  |  | 3486910,1825 | 
					
						
							|  |  |  | 3486914,24060003 | 
					
						
							|  |  |  | 3486918,8c450000 | 
					
						
							|  |  |  | 348691c,14a0000a | 
					
						
							|  |  |  | 3486924,318c0 | 
					
						
							|  |  |  | 3486928,3c028041 | 
					
						
							|  |  |  | 348692c,2442b604 | 
					
						
							|  |  |  | 3486930,621821 | 
					
						
							|  |  |  | 3486934,8fa20000 | 
					
						
							|  |  |  | 3486938,ac620000 | 
					
						
							|  |  |  | 348693c,8fa20004 | 
					
						
							|  |  |  | 3486940,3e00008 | 
					
						
							|  |  |  | 3486944,ac620004 | 
					
						
							|  |  |  | 3486948,10a40003 | 
					
						
							|  |  |  | 348694c,24630001 | 
					
						
							|  |  |  | 3486950,1466fff1 | 
					
						
							|  |  |  | 3486954,24420008 | 
					
						
							|  |  |  | 3486958,3e00008 | 
					
						
							|  |  |  | 3486960,3c028040 | 
					
						
							|  |  |  | 3486964,94420028 | 
					
						
							|  |  |  | 3486968,10400013 | 
					
						
							|  |  |  | 348696c,2403ffff | 
					
						
							|  |  |  | 3486970,27bdffe0 | 
					
						
							|  |  |  | 3486974,afbf001c | 
					
						
							|  |  |  | 3486978,afa00010 | 
					
						
							|  |  |  | 348697c,afa00014 | 
					
						
							|  |  |  | 3486980,a3a30011 | 
					
						
							|  |  |  | 3486984,24040005 | 
					
						
							|  |  |  | 3486988,a3a40012 | 
					
						
							|  |  |  | 348698c,a3a30013 | 
					
						
							|  |  |  | 3486990,3c038040 | 
					
						
							|  |  |  | 3486994,94630026 | 
					
						
							|  |  |  | 3486998,a3a30016 | 
					
						
							|  |  |  | 348699c,a7a20014 | 
					
						
							|  |  |  | 34869a0,8fa40010 | 
					
						
							|  |  |  | 34869a4,c101a40 | 
					
						
							|  |  |  | 34869a8,8fa50014 | 
					
						
							|  |  |  | 34869ac,8fbf001c | 
					
						
							|  |  |  | 34869b0,3e00008 | 
					
						
							|  |  |  | 34869b4,27bd0020 | 
					
						
							|  |  |  | 34869b8,3e00008 | 
					
						
							|  |  |  | 34869c0,27bdffe0 | 
					
						
							|  |  |  | 34869c4,afbf001c | 
					
						
							|  |  |  | 34869c8,3c0200ff | 
					
						
							|  |  |  | 34869cc,34420500 | 
					
						
							|  |  |  | 34869d0,442825 | 
					
						
							|  |  |  | 34869d4,c1019b9 | 
					
						
							|  |  |  | 34869d8,27a40010 | 
					
						
							|  |  |  | 34869dc,8fa20010 | 
					
						
							|  |  |  | 34869e0,10400005 | 
					
						
							|  |  |  | 34869e4,8fbf001c | 
					
						
							|  |  |  | 34869e8,402025 | 
					
						
							|  |  |  | 34869ec,c101a40 | 
					
						
							|  |  |  | 34869f0,8fa50014 | 
					
						
							|  |  |  | 34869f4,8fbf001c | 
					
						
							|  |  |  | 34869f8,3e00008 | 
					
						
							|  |  |  | 34869fc,27bd0020 | 
					
						
							|  |  |  | 3486a00,3c038041 | 
					
						
							|  |  |  | 3486a04,2462b604 | 
					
						
							|  |  |  | 3486a08,8c450008 | 
					
						
							|  |  |  | 3486a0c,8c44000c | 
					
						
							|  |  |  | 3486a10,ac65b604 | 
					
						
							|  |  |  | 3486a14,ac440004 | 
					
						
							|  |  |  | 3486a18,8c440010 | 
					
						
							|  |  |  | 3486a1c,8c430014 | 
					
						
							|  |  |  | 3486a20,ac440008 | 
					
						
							|  |  |  | 3486a24,ac43000c | 
					
						
							|  |  |  | 3486a28,ac400010 | 
					
						
							|  |  |  | 3486a2c,3e00008 | 
					
						
							|  |  |  | 3486a30,ac400014 | 
					
						
							|  |  |  | 3486a34,801825 | 
					
						
							|  |  |  | 3486a38,3084ffff | 
					
						
							|  |  |  | 3486a3c,240205ff | 
					
						
							|  |  |  | 3486a40,1482000b | 
					
						
							|  |  |  | 3486a44,27bdfff8 | 
					
						
							|  |  |  | 3486a48,3c028011 | 
					
						
							|  |  |  | 3486a4c,3442a660 | 
					
						
							|  |  |  | 3486a50,94430000 | 
					
						
							|  |  |  | 3486a54,24630001 | 
					
						
							|  |  |  | 3486a58,a4430000 | 
					
						
							|  |  |  | 3486a5c,3c028040 | 
					
						
							|  |  |  | 3486a60,a4400028 | 
					
						
							|  |  |  | 3486a64,3c028040 | 
					
						
							|  |  |  | 3486a68,10000009 | 
					
						
							|  |  |  | 3486a6c,a4400026 | 
					
						
							|  |  |  | 3486a70,3c020057 | 
					
						
							|  |  |  | 3486a74,24420058 | 
					
						
							|  |  |  | 3486a78,14620005 | 
					
						
							|  |  |  | 3486a7c,3c02801c | 
					
						
							|  |  |  | 3486a80,344284a0 | 
					
						
							|  |  |  | 3486a84,8c431d38 | 
					
						
							|  |  |  | 3486a88,34630001 | 
					
						
							|  |  |  | 3486a8c,ac431d38 | 
					
						
							|  |  |  | 3486a90,3e00008 | 
					
						
							|  |  |  | 3486a94,27bd0008 | 
					
						
							|  |  |  | 3486a98,27bdffe0 | 
					
						
							|  |  |  | 3486a9c,afbf001c | 
					
						
							|  |  |  | 3486aa0,afb00018 | 
					
						
							|  |  |  | 3486aa4,3c028041 | 
					
						
							|  |  |  | 3486aa8,8c50b604 | 
					
						
							|  |  |  | 3486aac,2442b604 | 
					
						
							|  |  |  | 3486ab0,8c420004 | 
					
						
							|  |  |  | 3486ab4,afa20010 | 
					
						
							|  |  |  | 3486ab8,2403ff00 | 
					
						
							|  |  |  | 3486abc,431024 | 
					
						
							|  |  |  | 3486ac0,3c03007c | 
					
						
							|  |  |  | 3486ac4,14430008 | 
					
						
							|  |  |  | 3486ac8,8fbf001c | 
					
						
							|  |  |  | 3486acc,c101dff | 
					
						
							|  |  |  | 3486ad4,c101a80 | 
					
						
							|  |  |  | 3486adc,c101a8d | 
					
						
							|  |  |  | 3486ae0,2002025 | 
					
						
							|  |  |  | 3486ae4,8fbf001c | 
					
						
							|  |  |  | 3486ae8,8fb00018 | 
					
						
							|  |  |  | 3486aec,3e00008 | 
					
						
							|  |  |  | 3486af0,27bd0020 | 
					
						
							|  |  |  | 3486af4,27bdffe8 | 
					
						
							|  |  |  | 3486af8,afbf0014 | 
					
						
							|  |  |  | 3486afc,afb00010 | 
					
						
							|  |  |  | 3486b00,3c028041 | 
					
						
							|  |  |  | 3486b04,8c50b594 | 
					
						
							|  |  |  | 3486b08,1200000e | 
					
						
							|  |  |  | 3486b0c,8fbf0014 | 
					
						
							|  |  |  | 3486b10,c101a36 | 
					
						
							|  |  |  | 3486b14,2444b594 | 
					
						
							|  |  |  | 3486b18,3c028041 | 
					
						
							|  |  |  | 3486b1c,8c42b604 | 
					
						
							|  |  |  | 3486b20,14500003 | 
					
						
							|  |  |  | 3486b28,c101a80 | 
					
						
							|  |  |  | 3486b30,c101a8d | 
					
						
							|  |  |  | 3486b34,2002025 | 
					
						
							|  |  |  | 3486b38,c101a23 | 
					
						
							|  |  |  | 3486b40,8fbf0014 | 
					
						
							|  |  |  | 3486b44,8fb00010 | 
					
						
							|  |  |  | 3486b48,3e00008 | 
					
						
							|  |  |  | 3486b4c,27bd0018 | 
					
						
							|  |  |  | 3486b50,27bdffe0 | 
					
						
							|  |  |  | 3486b54,afbf001c | 
					
						
							|  |  |  | 3486b58,3c028041 | 
					
						
							|  |  |  | 3486b5c,8c43b604 | 
					
						
							|  |  |  | 3486b60,2442b604 | 
					
						
							|  |  |  | 3486b64,8c420004 | 
					
						
							|  |  |  | 3486b68,afa30010 | 
					
						
							|  |  |  | 3486b6c,1060000d | 
					
						
							|  |  |  | 3486b70,afa20014 | 
					
						
							|  |  |  | 3486b74,602025 | 
					
						
							|  |  |  | 3486b78,c1019f4 | 
					
						
							|  |  |  | 3486b7c,402825 | 
					
						
							|  |  |  | 3486b80,3c02801d | 
					
						
							|  |  |  | 3486b84,3442aa30 | 
					
						
							|  |  |  | 3486b88,3c038041 | 
					
						
							|  |  |  | 3486b8c,8c63b59c | 
					
						
							|  |  |  | 3486b90,ac430428 | 
					
						
							|  |  |  | 3486b94,3c038041 | 
					
						
							|  |  |  | 3486b98,8c63b58c | 
					
						
							|  |  |  | 3486b9c,80630000 | 
					
						
							|  |  |  | 3486ba0,a0430424 | 
					
						
							|  |  |  | 3486ba4,8fbf001c | 
					
						
							|  |  |  | 3486ba8,3e00008 | 
					
						
							|  |  |  | 3486bac,27bd0020 | 
					
						
							|  |  |  | 3486bb0,27bdffe8 | 
					
						
							|  |  |  | 3486bb4,afbf0014 | 
					
						
							|  |  |  | 3486bb8,c101a58 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3486bc0,3c02801d | 
					
						
							|  |  |  | 3486bc4,3442aa30 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3486bc8,8c42066c | 
					
						
							|  |  |  | 3486bcc,3c03fcac | 
					
						
							|  |  |  | 3486bd0,24632485 | 
					
						
							|  |  |  | 3486bd4,431024 | 
					
						
							|  |  |  | 3486bd8,14400033 | 
					
						
							|  |  |  | 3486bdc,3c028041 | 
					
						
							|  |  |  | 3486be0,3c02801d | 
					
						
							|  |  |  | 3486be4,3442aa30 | 
					
						
							|  |  |  | 3486be8,94420088 | 
					
						
							|  |  |  | 3486bec,30420001 | 
					
						
							|  |  |  | 3486bf0,1040002a | 
					
						
							|  |  |  | 3486bf4,1025 | 
					
						
							|  |  |  | 3486bf8,3c02801d | 
					
						
							|  |  |  | 3486bfc,3442aa30 | 
					
						
							|  |  |  | 3486c00,8c420670 | 
					
						
							|  |  |  | 3486c04,3c03000c | 
					
						
							|  |  |  | 3486c08,431024 | 
					
						
							|  |  |  | 3486c0c,14400023 | 
					
						
							|  |  |  | 3486c10,1025 | 
					
						
							|  |  |  | 3486c14,3c02800e | 
					
						
							|  |  |  | 3486c18,3442f1b0 | 
					
						
							|  |  |  | 3486c1c,8c420000 | 
					
						
							|  |  |  | 3486c20,30420020 | 
					
						
							|  |  |  | 3486c24,1440001d | 
					
						
							|  |  |  | 3486c28,1025 | 
					
						
							|  |  |  | 3486c2c,3c02801c | 
					
						
							|  |  |  | 3486c30,344284a0 | 
					
						
							|  |  |  | 3486c34,8c420794 | 
					
						
							|  |  |  | 3486c38,14400018 | 
					
						
							|  |  |  | 3486c3c,1025 | 
					
						
							|  |  |  | 3486c40,3c028041 | 
					
						
							|  |  |  | 3486c44,9042b574 | 
					
						
							|  |  |  | 3486c48,24420001 | 
					
						
							|  |  |  | 3486c4c,304200ff | 
					
						
							|  |  |  | 3486c50,2c430002 | 
					
						
							|  |  |  | 3486c54,14600012 | 
					
						
							|  |  |  | 3486c58,3c038041 | 
					
						
							|  |  |  | 3486c5c,3c028041 | 
					
						
							|  |  |  | 3486c60,c101aa6 | 
					
						
							|  |  |  | 3486c64,a040b574 | 
					
						
							|  |  |  | 3486c68,c101dfb | 
					
						
							|  |  |  | 3486c70,10400005 | 
					
						
							|  |  |  | 3486c78,c101e04 | 
					
						
							|  |  |  | 3486c80,1000000b | 
					
						
							|  |  |  | 3486c84,8fbf0014 | 
					
						
							|  |  |  | 3486c88,c101ad4 | 
					
						
							|  |  |  | 3486c90,10000007 | 
					
						
							|  |  |  | 3486c94,8fbf0014 | 
					
						
							|  |  |  | 3486c98,1025 | 
					
						
							|  |  |  | 3486c9c,3c038041 | 
					
						
							|  |  |  | 3486ca0,10000002 | 
					
						
							|  |  |  | 3486ca4,a062b574 | 
					
						
							|  |  |  | 3486ca8,a040b574 | 
					
						
							|  |  |  | 3486cac,8fbf0014 | 
					
						
							|  |  |  | 3486cb0,3e00008 | 
					
						
							|  |  |  | 3486cb4,27bd0018 | 
					
						
							|  |  |  | 3486cb8,27bdffd8 | 
					
						
							|  |  |  | 3486cbc,afbf0024 | 
					
						
							|  |  |  | 3486cc0,afb20020 | 
					
						
							|  |  |  | 3486cc4,afb1001c | 
					
						
							|  |  |  | 3486cc8,afb00018 | 
					
						
							|  |  |  | 3486ccc,a09025 | 
					
						
							|  |  |  | 3486cd0,10800012 | 
					
						
							|  |  |  | 3486cd4,c08825 | 
					
						
							|  |  |  | 3486cd8,10c00010 | 
					
						
							|  |  |  | 3486cdc,808025 | 
					
						
							|  |  |  | 3486ce0,4c10004 | 
					
						
							|  |  |  | 3486ce4,c03825 | 
					
						
							|  |  |  | 3486ce8,63823 | 
					
						
							|  |  |  | 3486cec,73e00 | 
					
						
							|  |  |  | 3486cf0,73e03 | 
					
						
							|  |  |  | 3486cf4,30e700ff | 
					
						
							|  |  |  | 3486cf8,3c02801c | 
					
						
							|  |  |  | 3486cfc,344284a0 | 
					
						
							|  |  |  | 3486d00,904600a5 | 
					
						
							|  |  |  | 3486d04,2002825 | 
					
						
							|  |  |  | 3486d08,c1019e1 | 
					
						
							|  |  |  | 3486d0c,27a40010 | 
					
						
							|  |  |  | 3486d10,8fa20010 | 
					
						
							|  |  |  | 3486d14,14400005 | 
					
						
							|  |  |  | 3486d18,8fa40010 | 
					
						
							|  |  |  | 3486d1c,c101a23 | 
					
						
							|  |  |  | 3486d24,10000019 | 
					
						
							|  |  |  | 3486d28,2201025 | 
					
						
							|  |  |  | 3486d2c,c1019f4 | 
					
						
							|  |  |  | 3486d30,8fa50014 | 
					
						
							|  |  |  | 3486d34,3c028041 | 
					
						
							|  |  |  | 3486d38,8c42b58c | 
					
						
							|  |  |  | 3486d3c,86040000 | 
					
						
							|  |  |  | 3486d40,2403000a | 
					
						
							|  |  |  | 3486d44,1483000c | 
					
						
							|  |  |  | 3486d48,80420000 | 
					
						
							|  |  |  | 3486d4c,8fa30014 | 
					
						
							|  |  |  | 3486d50,2404ff00 | 
					
						
							|  |  |  | 3486d54,641824 | 
					
						
							|  |  |  | 3486d58,3c04007c | 
					
						
							|  |  |  | 3486d5c,50640001 | 
					
						
							|  |  |  | 3486d60,2402007c | 
					
						
							|  |  |  | 3486d64,9603001c | 
					
						
							|  |  |  | 3486d68,3063f01f | 
					
						
							|  |  |  | 3486d6c,22140 | 
					
						
							|  |  |  | 3486d70,641825 | 
					
						
							|  |  |  | 3486d74,a603001c | 
					
						
							|  |  |  | 3486d78,6230005 | 
					
						
							|  |  |  | 3486d7c,a2420424 | 
					
						
							|  |  |  | 3486d80,21023 | 
					
						
							|  |  |  | 3486d84,21600 | 
					
						
							|  |  |  | 3486d88,21603 | 
					
						
							|  |  |  | 3486d8c,a2420424 | 
					
						
							|  |  |  | 3486d90,8fbf0024 | 
					
						
							|  |  |  | 3486d94,8fb20020 | 
					
						
							|  |  |  | 3486d98,8fb1001c | 
					
						
							|  |  |  | 3486d9c,8fb00018 | 
					
						
							|  |  |  | 3486da0,3e00008 | 
					
						
							|  |  |  | 3486da4,27bd0028 | 
					
						
							|  |  |  | 3486da8,27bdffd8 | 
					
						
							|  |  |  | 3486dac,afbf0024 | 
					
						
							|  |  |  | 3486db0,afb20020 | 
					
						
							|  |  |  | 3486db4,afb1001c | 
					
						
							|  |  |  | 3486db8,afb00018 | 
					
						
							|  |  |  | 3486dbc,808825 | 
					
						
							|  |  |  | 3486dc0,3825 | 
					
						
							|  |  |  | 3486dc4,3025 | 
					
						
							|  |  |  | 3486dc8,802825 | 
					
						
							|  |  |  | 3486dcc,c1019e1 | 
					
						
							|  |  |  | 3486dd0,27a40010 | 
					
						
							|  |  |  | 3486dd4,8fa20010 | 
					
						
							|  |  |  | 3486dd8,10400029 | 
					
						
							|  |  |  | 3486ddc,93b20016 | 
					
						
							|  |  |  | 3486de0,c101eeb | 
					
						
							|  |  |  | 3486de4,97a40014 | 
					
						
							|  |  |  | 3486de8,c101edc | 
					
						
							|  |  |  | 3486dec,402025 | 
					
						
							|  |  |  | 3486df0,408025 | 
					
						
							|  |  |  | 3486df4,ae200134 | 
					
						
							|  |  |  | 3486df8,3c028040 | 
					
						
							|  |  |  | 3486dfc,16400015 | 
					
						
							|  |  |  | 3486e00,a0520025 | 
					
						
							|  |  |  | 3486e04,3c028040 | 
					
						
							|  |  |  | 3486e08,90430024 | 
					
						
							|  |  |  | 3486e0c,3c028040 | 
					
						
							|  |  |  | 3486e10,a0430025 | 
					
						
							|  |  |  | 3486e14,3025 | 
					
						
							|  |  |  | 3486e18,96050002 | 
					
						
							|  |  |  | 3486e1c,3c11801c | 
					
						
							|  |  |  | 3486e20,3c02800d | 
					
						
							|  |  |  | 3486e24,3442ce14 | 
					
						
							|  |  |  | 3486e28,40f809 | 
					
						
							|  |  |  | 3486e2c,362484a0 | 
					
						
							|  |  |  | 3486e30,92050001 | 
					
						
							|  |  |  | 3486e34,3c028006 | 
					
						
							|  |  |  | 3486e38,3442fdcc | 
					
						
							|  |  |  | 3486e3c,40f809 | 
					
						
							|  |  |  | 3486e40,362484a0 | 
					
						
							|  |  |  | 3486e44,c101f03 | 
					
						
							|  |  |  | 3486e48,2002025 | 
					
						
							|  |  |  | 3486e4c,10000013 | 
					
						
							|  |  |  | 3486e50,8fbf0024 | 
					
						
							|  |  |  | 3486e54,3025 | 
					
						
							|  |  |  | 3486e58,96050002 | 
					
						
							|  |  |  | 3486e5c,3c04801c | 
					
						
							|  |  |  | 3486e60,3c02800d | 
					
						
							|  |  |  | 3486e64,3442ce14 | 
					
						
							|  |  |  | 3486e68,40f809 | 
					
						
							|  |  |  | 3486e6c,348484a0 | 
					
						
							|  |  |  | 3486e70,c101a36 | 
					
						
							|  |  |  | 3486e74,27a40010 | 
					
						
							|  |  |  | 3486e78,10000008 | 
					
						
							|  |  |  | 3486e7c,8fbf0024 | 
					
						
							|  |  |  | 3486e80,c101eeb | 
					
						
							|  |  |  | 3486e84,2404005b | 
					
						
							|  |  |  | 3486e88,c101edc | 
					
						
							|  |  |  | 3486e8c,402025 | 
					
						
							|  |  |  | 3486e90,408025 | 
					
						
							|  |  |  | 3486e94,1000ffdb | 
					
						
							|  |  |  | 3486e98,ae200134 | 
					
						
							|  |  |  | 3486e9c,8fb20020 | 
					
						
							|  |  |  | 3486ea0,8fb1001c | 
					
						
							|  |  |  | 3486ea4,8fb00018 | 
					
						
							|  |  |  | 3486ea8,3e00008 | 
					
						
							|  |  |  | 3486eac,27bd0028 | 
					
						
							|  |  |  | 3486eb0,27bdffe8 | 
					
						
							|  |  |  | 3486eb4,afbf0014 | 
					
						
							|  |  |  | 3486eb8,afb00010 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3486ebc,3c028011 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3486ec0,3442a5d0 | 
					
						
							|  |  |  | 3486ec4,94500eec | 
					
						
							|  |  |  | 3486ec8,32100002 | 
					
						
							|  |  |  | 3486ecc,1600000c | 
					
						
							|  |  |  | 3486ed0,3c028040 | 
					
						
							|  |  |  | 3486ed4,90420cd5 | 
					
						
							|  |  |  | 3486ed8,50400004 | 
					
						
							|  |  |  | 3486edc,3c028011 | 
					
						
							|  |  |  | 3486ee0,c101a70 | 
					
						
							|  |  |  | 3486ee4,24040002 | 
					
						
							|  |  |  | 3486ee8,3c028011 | 
					
						
							|  |  |  | 3486eec,3442a5d0 | 
					
						
							|  |  |  | 3486ef0,94430eec | 
					
						
							|  |  |  | 3486ef4,34630002 | 
					
						
							|  |  |  | 3486ef8,a4430eec | 
					
						
							|  |  |  | 3486efc,3c028040 | 
					
						
							|  |  |  | 3486f00,90430cd5 | 
					
						
							|  |  |  | 3486f04,14600002 | 
					
						
							|  |  |  | 3486f08,24020001 | 
					
						
							|  |  |  | 3486f0c,10102b | 
					
						
							|  |  |  | 3486f10,8fbf0014 | 
					
						
							|  |  |  | 3486f14,8fb00010 | 
					
						
							|  |  |  | 3486f18,3e00008 | 
					
						
							|  |  |  | 3486f1c,27bd0018 | 
					
						
							|  |  |  | 3486f20,94830004 | 
					
						
							|  |  |  | 3486f24,94820006 | 
					
						
							|  |  |  | 3486f28,620018 | 
					
						
							|  |  |  | 3486f2c,9082000c | 
					
						
							|  |  |  | 3486f30,1812 | 
					
						
							|  |  |  | 3486f3c,620018 | 
					
						
							|  |  |  | 3486f40,1012 | 
					
						
							|  |  |  | 3486f44,3e00008 | 
					
						
							|  |  |  | 3486f4c,27bdffe8 | 
					
						
							|  |  |  | 3486f50,afbf0014 | 
					
						
							|  |  |  | 3486f54,afb00010 | 
					
						
							|  |  |  | 3486f58,c101bc8 | 
					
						
							|  |  |  | 3486f5c,808025 | 
					
						
							|  |  |  | 3486f60,96030008 | 
					
						
							|  |  |  | 3486f64,620018 | 
					
						
							|  |  |  | 3486f68,1012 | 
					
						
							|  |  |  | 3486f6c,8fbf0014 | 
					
						
							|  |  |  | 3486f70,8fb00010 | 
					
						
							|  |  |  | 3486f74,3e00008 | 
					
						
							|  |  |  | 3486f78,27bd0018 | 
					
						
							|  |  |  | 3486f7c,27bdff98 | 
					
						
							|  |  |  | 3486f80,afbf0064 | 
					
						
							|  |  |  | 3486f84,afb60060 | 
					
						
							|  |  |  | 3486f88,afb5005c | 
					
						
							|  |  |  | 3486f8c,afb40058 | 
					
						
							|  |  |  | 3486f90,afb30054 | 
					
						
							|  |  |  | 3486f94,afb20050 | 
					
						
							|  |  |  | 3486f98,afb1004c | 
					
						
							|  |  |  | 3486f9c,afb00048 | 
					
						
							|  |  |  | 3486fa0,808025 | 
					
						
							|  |  |  | 3486fa4,a0a025 | 
					
						
							|  |  |  | 3486fa8,c0a825 | 
					
						
							|  |  |  | 3486fac,94b10004 | 
					
						
							|  |  |  | 3486fb0,94a20006 | 
					
						
							|  |  |  | 3486fb4,470018 | 
					
						
							|  |  |  | 3486fb8,9012 | 
					
						
							|  |  |  | 3486fbc,90b6000b | 
					
						
							|  |  |  | 3486fc0,90b3000a | 
					
						
							|  |  |  | 3486fc4,139d40 | 
					
						
							|  |  |  | 3486fc8,3c0200e0 | 
					
						
							|  |  |  | 3486fcc,2629824 | 
					
						
							|  |  |  | 3486fd0,1614c0 | 
					
						
							|  |  |  | 3486fd4,3c030018 | 
					
						
							|  |  |  | 3486fd8,431024 | 
					
						
							|  |  |  | 3486fdc,2629825 | 
					
						
							|  |  |  | 3486fe0,2622ffff | 
					
						
							|  |  |  | 3486fe4,30420fff | 
					
						
							|  |  |  | 3486fe8,531025 | 
					
						
							|  |  |  | 3486fec,3c03fd00 | 
					
						
							|  |  |  | 3486ff0,431025 | 
					
						
							|  |  |  | 3486ff4,afa20010 | 
					
						
							|  |  |  | 3486ff8,c101bc8 | 
					
						
							|  |  |  | 3486ffc,a02025 | 
					
						
							|  |  |  | 3487000,550018 | 
					
						
							|  |  |  | 3487004,8e820000 | 
					
						
							|  |  |  | 3487008,1812 | 
					
						
							|  |  |  | 348700c,431021 | 
					
						
							|  |  |  | 3487010,afa20014 | 
					
						
							|  |  |  | 3487014,2ec30002 | 
					
						
							|  |  |  | 3487018,10600003 | 
					
						
							|  |  |  | 348701c,24020010 | 
					
						
							|  |  |  | 3487020,24020004 | 
					
						
							|  |  |  | 3487024,2c21004 | 
					
						
							|  |  |  | 3487028,510018 | 
					
						
							|  |  |  | 348702c,1812 | 
					
						
							|  |  |  | 3487030,2463003f | 
					
						
							|  |  |  | 3487034,317c3 | 
					
						
							|  |  |  | 3487038,3042003f | 
					
						
							|  |  |  | 348703c,431021 | 
					
						
							|  |  |  | 3487040,210c0 | 
					
						
							|  |  |  | 3487044,3c030003 | 
					
						
							|  |  |  | 3487048,3463fe00 | 
					
						
							|  |  |  | 348704c,431024 | 
					
						
							|  |  |  | 3487050,531025 | 
					
						
							|  |  |  | 3487054,3c03f500 | 
					
						
							|  |  |  | 3487058,431025 | 
					
						
							|  |  |  | 348705c,afa20018 | 
					
						
							|  |  |  | 3487060,3c040700 | 
					
						
							|  |  |  | 3487064,afa4001c | 
					
						
							|  |  |  | 3487068,3c03e600 | 
					
						
							|  |  |  | 348706c,afa30020 | 
					
						
							|  |  |  | 3487070,afa00024 | 
					
						
							|  |  |  | 3487074,3c03f400 | 
					
						
							|  |  |  | 3487078,afa30028 | 
					
						
							|  |  |  | 348707c,2623ffff | 
					
						
							|  |  |  | 3487080,31b80 | 
					
						
							|  |  |  | 3487084,3c0500ff | 
					
						
							|  |  |  | 3487088,34a5f000 | 
					
						
							|  |  |  | 348708c,651824 | 
					
						
							|  |  |  | 3487090,2652ffff | 
					
						
							|  |  |  | 3487094,129080 | 
					
						
							|  |  |  | 3487098,32520ffc | 
					
						
							|  |  |  | 348709c,721825 | 
					
						
							|  |  |  | 34870a0,642025 | 
					
						
							|  |  |  | 34870a4,afa4002c | 
					
						
							|  |  |  | 34870a8,3c04e700 | 
					
						
							|  |  |  | 34870ac,afa40030 | 
					
						
							|  |  |  | 34870b0,afa00034 | 
					
						
							|  |  |  | 34870b4,afa20038 | 
					
						
							|  |  |  | 34870b8,afa0003c | 
					
						
							|  |  |  | 34870bc,3c02f200 | 
					
						
							|  |  |  | 34870c0,afa20040 | 
					
						
							|  |  |  | 34870c4,afa30044 | 
					
						
							|  |  |  | 34870c8,27a20010 | 
					
						
							|  |  |  | 34870cc,27a60048 | 
					
						
							|  |  |  | 34870d0,8e030008 | 
					
						
							|  |  |  | 34870d4,24640008 | 
					
						
							|  |  |  | 34870d8,ae040008 | 
					
						
							|  |  |  | 34870dc,8c450004 | 
					
						
							|  |  |  | 34870e0,8c440000 | 
					
						
							|  |  |  | 34870e4,ac650004 | 
					
						
							|  |  |  | 34870e8,24420008 | 
					
						
							|  |  |  | 34870ec,1446fff8 | 
					
						
							|  |  |  | 34870f0,ac640000 | 
					
						
							|  |  |  | 34870f4,8fbf0064 | 
					
						
							|  |  |  | 34870f8,8fb60060 | 
					
						
							|  |  |  | 34870fc,8fb5005c | 
					
						
							|  |  |  | 3487100,8fb40058 | 
					
						
							|  |  |  | 3487104,8fb30054 | 
					
						
							|  |  |  | 3487108,8fb20050 | 
					
						
							|  |  |  | 348710c,8fb1004c | 
					
						
							|  |  |  | 3487110,8fb00048 | 
					
						
							|  |  |  | 3487114,3e00008 | 
					
						
							|  |  |  | 3487118,27bd0068 | 
					
						
							|  |  |  | 348711c,27bdffe0 | 
					
						
							|  |  |  | 3487120,8fa80030 | 
					
						
							|  |  |  | 3487124,8fa20034 | 
					
						
							|  |  |  | 3487128,8faa0038 | 
					
						
							|  |  |  | 348712c,94a30004 | 
					
						
							|  |  |  | 3487130,31a80 | 
					
						
							|  |  |  | 3487134,14400002 | 
					
						
							|  |  |  | 3487138,62001a | 
					
						
							|  |  |  | 348713c,7000d | 
					
						
							|  |  |  | 3487140,4812 | 
					
						
							|  |  |  | 3487144,94a30006 | 
					
						
							|  |  |  | 3487148,471021 | 
					
						
							|  |  |  | 348714c,21380 | 
					
						
							|  |  |  | 3487150,3c0b00ff | 
					
						
							|  |  |  | 3487154,356bf000 | 
					
						
							|  |  |  | 3487158,4b1024 | 
					
						
							|  |  |  | 348715c,1482821 | 
					
						
							|  |  |  | 3487160,52880 | 
					
						
							|  |  |  | 3487164,30a50fff | 
					
						
							|  |  |  | 3487168,451025 | 
					
						
							|  |  |  | 348716c,3c05e400 | 
					
						
							|  |  |  | 3487170,451025 | 
					
						
							|  |  |  | 3487174,afa20000 | 
					
						
							|  |  |  | 3487178,73b80 | 
					
						
							|  |  |  | 348717c,eb3824 | 
					
						
							|  |  |  | 3487180,84080 | 
					
						
							|  |  |  | 3487184,31080fff | 
					
						
							|  |  |  | 3487188,e83825 | 
					
						
							|  |  |  | 348718c,afa70004 | 
					
						
							|  |  |  | 3487190,3c02e100 | 
					
						
							|  |  |  | 3487194,afa20008 | 
					
						
							|  |  |  | 3487198,660018 | 
					
						
							|  |  |  | 348719c,1012 | 
					
						
							|  |  |  | 34871a0,21140 | 
					
						
							|  |  |  | 34871a4,3042ffff | 
					
						
							|  |  |  | 34871a8,afa2000c | 
					
						
							|  |  |  | 34871ac,3c02f100 | 
					
						
							|  |  |  | 34871b0,afa20010 | 
					
						
							|  |  |  | 34871b4,31a80 | 
					
						
							|  |  |  | 34871b8,15400002 | 
					
						
							|  |  |  | 34871bc,6a001a | 
					
						
							|  |  |  | 34871c0,7000d | 
					
						
							|  |  |  | 34871c4,1012 | 
					
						
							|  |  |  | 34871c8,3042ffff | 
					
						
							|  |  |  | 34871cc,94c00 | 
					
						
							|  |  |  | 34871d0,491025 | 
					
						
							|  |  |  | 34871d4,afa20014 | 
					
						
							|  |  |  | 34871d8,afbd0018 | 
					
						
							|  |  |  | 34871dc,27a50018 | 
					
						
							|  |  |  | 34871e0,8c820008 | 
					
						
							|  |  |  | 34871e4,24430008 | 
					
						
							|  |  |  | 34871e8,ac830008 | 
					
						
							|  |  |  | 34871ec,8fa30018 | 
					
						
							|  |  |  | 34871f0,8c670004 | 
					
						
							|  |  |  | 34871f4,8c660000 | 
					
						
							|  |  |  | 34871f8,ac470004 | 
					
						
							|  |  |  | 34871fc,ac460000 | 
					
						
							|  |  |  | 3487200,24620008 | 
					
						
							|  |  |  | 3487204,1445fff6 | 
					
						
							|  |  |  | 3487208,afa20018 | 
					
						
							|  |  |  | 348720c,3e00008 | 
					
						
							|  |  |  | 3487210,27bd0020 | 
					
						
							|  |  |  | 3487214,27bdffa0 | 
					
						
							|  |  |  | 3487218,afbf005c | 
					
						
							|  |  |  | 348721c,afb10058 | 
					
						
							|  |  |  | 3487220,afb00054 | 
					
						
							|  |  |  | 3487224,afa00010 | 
					
						
							|  |  |  | 3487228,3c0201a0 | 
					
						
							|  |  |  | 348722c,24422000 | 
					
						
							|  |  |  | 3487230,afa20014 | 
					
						
							|  |  |  | 3487234,3c110003 | 
					
						
							|  |  |  | 3487238,362295c0 | 
					
						
							|  |  |  | 348723c,afa20018 | 
					
						
							|  |  |  | 3487240,c102751 | 
					
						
							|  |  |  | 3487244,27a40010 | 
					
						
							|  |  |  | 3487248,afa0001c | 
					
						
							|  |  |  | 348724c,3c020084 | 
					
						
							|  |  |  | 3487250,24426000 | 
					
						
							|  |  |  | 3487254,afa20020 | 
					
						
							|  |  |  | 3487258,3402b400 | 
					
						
							|  |  |  | 348725c,afa20024 | 
					
						
							|  |  |  | 3487260,c102751 | 
					
						
							|  |  |  | 3487264,27a4001c | 
					
						
							|  |  |  | 3487268,afa00028 | 
					
						
							|  |  |  | 348726c,3c02007b | 
					
						
							|  |  |  | 3487270,3442d000 | 
					
						
							|  |  |  | 3487274,afa2002c | 
					
						
							|  |  |  | 3487278,3c100008 | 
					
						
							|  |  |  | 348727c,361088a0 | 
					
						
							|  |  |  | 3487280,afb00030 | 
					
						
							|  |  |  | 3487284,c102751 | 
					
						
							|  |  |  | 3487288,27a40028 | 
					
						
							|  |  |  | 348728c,afa00034 | 
					
						
							|  |  |  | 3487290,3c0201a3 | 
					
						
							|  |  |  | 3487294,3442c000 | 
					
						
							|  |  |  | 3487298,afa20038 | 
					
						
							|  |  |  | 348729c,24023b00 | 
					
						
							|  |  |  | 34872a0,afa2003c | 
					
						
							|  |  |  | 34872a4,c102751 | 
					
						
							|  |  |  | 34872a8,27a40034 | 
					
						
							|  |  |  | 34872ac,afa00040 | 
					
						
							|  |  |  | 34872b0,3c020085 | 
					
						
							|  |  |  | 34872b4,3442e000 | 
					
						
							|  |  |  | 34872b8,afa20044 | 
					
						
							|  |  |  | 34872bc,24021d80 | 
					
						
							|  |  |  | 34872c0,afa20048 | 
					
						
							|  |  |  | 34872c4,c102751 | 
					
						
							|  |  |  | 34872c8,27a40040 | 
					
						
							|  |  |  | 34872cc,8fa20010 | 
					
						
							|  |  |  | 34872d0,2631a300 | 
					
						
							|  |  |  | 34872d4,518821 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34872d8,3c038041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34872dc,ac71a478 | 
					
						
							|  |  |  | 34872e0,24422980 | 
					
						
							|  |  |  | 34872e4,3c038041 | 
					
						
							|  |  |  | 34872e8,ac62a468 | 
					
						
							|  |  |  | 34872ec,8fa20028 | 
					
						
							|  |  |  | 34872f0,3c038041 | 
					
						
							|  |  |  | 34872f4,ac62a458 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34872f8,3c038041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34872fc,8fa4001c | 
					
						
							|  |  |  | 3487300,ac64a448 | 
					
						
							|  |  |  | 3487304,3c048041 | 
					
						
							|  |  |  | 3487308,3c038041 | 
					
						
							|  |  |  | 348730c,2463db28 | 
					
						
							|  |  |  | 3487310,ac83a428 | 
					
						
							|  |  |  | 3487314,3c048041 | 
					
						
							|  |  |  | 3487318,3c038041 | 
					
						
							|  |  |  | 348731c,2463e328 | 
					
						
							|  |  |  | 3487320,ac83a418 | 
					
						
							|  |  |  | 3487324,2610f7a0 | 
					
						
							|  |  |  | 3487328,501021 | 
					
						
							|  |  |  | 348732c,3c038041 | 
					
						
							|  |  |  | 3487330,ac62a408 | 
					
						
							|  |  |  | 3487334,8fa20034 | 
					
						
							|  |  |  | 3487338,24441e00 | 
					
						
							|  |  |  | 348733c,3c038041 | 
					
						
							|  |  |  | 3487340,ac64a3f8 | 
					
						
							|  |  |  | 3487344,244435c0 | 
					
						
							|  |  |  | 3487348,3c038041 | 
					
						
							|  |  |  | 348734c,ac64a3e8 | 
					
						
							|  |  |  | 3487350,8fa30040 | 
					
						
							|  |  |  | 3487354,24631980 | 
					
						
							|  |  |  | 3487358,3c048041 | 
					
						
							|  |  |  | 348735c,ac83a3d8 | 
					
						
							|  |  |  | 3487360,3c038041 | 
					
						
							|  |  |  | 3487364,ac62a3c8 | 
					
						
							|  |  |  | 3487368,3c118041 | 
					
						
							|  |  |  | 348736c,c101bd3 | 
					
						
							|  |  |  | 3487370,2624a438 | 
					
						
							|  |  |  | 3487374,408025 | 
					
						
							|  |  |  | 3487378,c102742 | 
					
						
							|  |  |  | 348737c,402025 | 
					
						
							|  |  |  | 3487380,104fc2 | 
					
						
							|  |  |  | 3487384,1304821 | 
					
						
							|  |  |  | 3487388,2a100002 | 
					
						
							|  |  |  | 348738c,16000018 | 
					
						
							|  |  |  | 3487390,ae22a438 | 
					
						
							|  |  |  | 3487394,94843 | 
					
						
							|  |  |  | 3487398,3c038041 | 
					
						
							|  |  |  | 348739c,2463c660 | 
					
						
							|  |  |  | 34873a0,2025 | 
					
						
							|  |  |  | 34873a4,3025 | 
					
						
							|  |  |  | 34873a8,2204025 | 
					
						
							|  |  |  | 34873ac,2407fff0 | 
					
						
							|  |  |  | 34873b0,8d05a438 | 
					
						
							|  |  |  | 34873b4,a42821 | 
					
						
							|  |  |  | 34873b8,90620000 | 
					
						
							|  |  |  | 34873bc,21102 | 
					
						
							|  |  |  | 34873c0,471025 | 
					
						
							|  |  |  | 34873c4,a0a20000 | 
					
						
							|  |  |  | 34873c8,8d02a438 | 
					
						
							|  |  |  | 34873cc,441021 | 
					
						
							|  |  |  | 34873d0,90650000 | 
					
						
							|  |  |  | 34873d4,a72825 | 
					
						
							|  |  |  | 34873d8,a0450001 | 
					
						
							|  |  |  | 34873dc,24c60001 | 
					
						
							|  |  |  | 34873e0,24630001 | 
					
						
							|  |  |  | 34873e4,c9102a | 
					
						
							|  |  |  | 34873e8,1440fff1 | 
					
						
							|  |  |  | 34873ec,24840002 | 
					
						
							|  |  |  | 34873f0,8fbf005c | 
					
						
							|  |  |  | 34873f4,8fb10058 | 
					
						
							|  |  |  | 34873f8,8fb00054 | 
					
						
							|  |  |  | 34873fc,3e00008 | 
					
						
							|  |  |  | 3487400,27bd0060 | 
					
						
							|  |  |  | 3487404,3c038040 | 
					
						
							|  |  |  | 3487408,9462084e | 
					
						
							|  |  |  | 348740c,2463084e | 
					
						
							|  |  |  | 3487410,94640002 | 
					
						
							|  |  |  | 3487414,94630004 | 
					
						
							|  |  |  | 3487418,3c058041 | 
					
						
							|  |  |  | 348741c,8ca5b540 | 
					
						
							|  |  |  | 3487420,a4a20000 | 
					
						
							|  |  |  | 3487424,a4a40002 | 
					
						
							|  |  |  | 3487428,a4a30004 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348742c,3c058041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487430,8ca6b53c | 
					
						
							|  |  |  | 3487434,a4c20000 | 
					
						
							|  |  |  | 3487438,8ca5b53c | 
					
						
							|  |  |  | 348743c,a4a40004 | 
					
						
							|  |  |  | 3487440,a4a30008 | 
					
						
							|  |  |  | 3487444,240500ff | 
					
						
							|  |  |  | 3487448,1445000a | 
					
						
							|  |  |  | 348744c,3c058041 | 
					
						
							|  |  |  | 3487450,24050046 | 
					
						
							|  |  |  | 3487454,14850007 | 
					
						
							|  |  |  | 3487458,3c058041 | 
					
						
							|  |  |  | 348745c,24050032 | 
					
						
							|  |  |  | 3487460,14650004 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3487464,3c058041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487468,1825 | 
					
						
							|  |  |  | 348746c,2025 | 
					
						
							|  |  |  | 3487470,240200c8 | 
					
						
							|  |  |  | 3487474,8ca5b538 | 
					
						
							|  |  |  | 3487478,a4a20000 | 
					
						
							|  |  |  | 348747c,a4a40002 | 
					
						
							|  |  |  | 3487480,a4a30004 | 
					
						
							|  |  |  | 3487484,3c058041 | 
					
						
							|  |  |  | 3487488,8ca5b534 | 
					
						
							|  |  |  | 348748c,a4a20000 | 
					
						
							|  |  |  | 3487490,a4a40002 | 
					
						
							|  |  |  | 3487494,a4a30004 | 
					
						
							|  |  |  | 3487498,3c028041 | 
					
						
							|  |  |  | 348749c,8c43b530 | 
					
						
							|  |  |  | 34874a0,3c028040 | 
					
						
							|  |  |  | 34874a4,94450854 | 
					
						
							|  |  |  | 34874a8,24420854 | 
					
						
							|  |  |  | 34874ac,94440002 | 
					
						
							|  |  |  | 34874b0,94420004 | 
					
						
							|  |  |  | 34874b4,a4650000 | 
					
						
							|  |  |  | 34874b8,a4640002 | 
					
						
							|  |  |  | 34874bc,a4620004 | 
					
						
							|  |  |  | 34874c0,3c028041 | 
					
						
							|  |  |  | 34874c4,8c43b52c | 
					
						
							|  |  |  | 34874c8,3c028040 | 
					
						
							|  |  |  | 34874cc,9445085a | 
					
						
							|  |  |  | 34874d0,2442085a | 
					
						
							|  |  |  | 34874d4,94440002 | 
					
						
							|  |  |  | 34874d8,94420004 | 
					
						
							|  |  |  | 34874dc,a4650000 | 
					
						
							|  |  |  | 34874e0,a4640002 | 
					
						
							|  |  |  | 34874e4,a4620004 | 
					
						
							|  |  |  | 34874e8,3c028041 | 
					
						
							|  |  |  | 34874ec,8c43b528 | 
					
						
							|  |  |  | 34874f0,3c028040 | 
					
						
							|  |  |  | 34874f4,94450860 | 
					
						
							|  |  |  | 34874f8,24420860 | 
					
						
							|  |  |  | 34874fc,94440002 | 
					
						
							|  |  |  | 3487500,94420004 | 
					
						
							|  |  |  | 3487504,a4650000 | 
					
						
							|  |  |  | 3487508,a4640002 | 
					
						
							|  |  |  | 348750c,a4620004 | 
					
						
							|  |  |  | 3487510,3c028041 | 
					
						
							|  |  |  | 3487514,8c42b524 | 
					
						
							|  |  |  | 3487518,3c068040 | 
					
						
							|  |  |  | 348751c,94c30872 | 
					
						
							|  |  |  | 3487520,a4430000 | 
					
						
							|  |  |  | 3487524,3c028041 | 
					
						
							|  |  |  | 3487528,8c43b520 | 
					
						
							|  |  |  | 348752c,24c20872 | 
					
						
							|  |  |  | 3487530,94440002 | 
					
						
							|  |  |  | 3487534,a4640000 | 
					
						
							|  |  |  | 3487538,3c038041 | 
					
						
							|  |  |  | 348753c,8c63b51c | 
					
						
							|  |  |  | 3487540,94440004 | 
					
						
							|  |  |  | 3487544,a4640000 | 
					
						
							|  |  |  | 3487548,3c038041 | 
					
						
							|  |  |  | 348754c,8c63b518 | 
					
						
							|  |  |  | 3487550,3c058040 | 
					
						
							|  |  |  | 3487554,94a40878 | 
					
						
							|  |  |  | 3487558,a4640000 | 
					
						
							|  |  |  | 348755c,3c038041 | 
					
						
							|  |  |  | 3487560,8c64b514 | 
					
						
							|  |  |  | 3487564,24a30878 | 
					
						
							|  |  |  | 3487568,94670002 | 
					
						
							|  |  |  | 348756c,a4870000 | 
					
						
							|  |  |  | 3487570,3c048041 | 
					
						
							|  |  |  | 3487574,8c84b510 | 
					
						
							|  |  |  | 3487578,94670004 | 
					
						
							|  |  |  | 348757c,a4870000 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3487580,3c048041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487584,8c84b50c | 
					
						
							|  |  |  | 3487588,94c80872 | 
					
						
							|  |  |  | 348758c,94470002 | 
					
						
							|  |  |  | 3487590,94460004 | 
					
						
							|  |  |  | 3487594,a4880000 | 
					
						
							|  |  |  | 3487598,a4870002 | 
					
						
							|  |  |  | 348759c,a4860004 | 
					
						
							|  |  |  | 34875a0,3c048041 | 
					
						
							|  |  |  | 34875a4,8c84b4fc | 
					
						
							|  |  |  | 34875a8,94a60878 | 
					
						
							|  |  |  | 34875ac,94650002 | 
					
						
							|  |  |  | 34875b0,94630004 | 
					
						
							|  |  |  | 34875b4,a4860000 | 
					
						
							|  |  |  | 34875b8,a4850002 | 
					
						
							|  |  |  | 34875bc,a4830004 | 
					
						
							|  |  |  | 34875c0,94420002 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34875c4,3043ffff | 
					
						
							|  |  |  | 34875c8,2c6300ce | 
					
						
							|  |  |  | 34875cc,50600001 | 
					
						
							|  |  |  | 34875d0,240200cd | 
					
						
							|  |  |  | 34875d4,24420032 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34875d8,3047ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34875dc,3c028040 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34875e0,94420876 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34875e4,3043ffff | 
					
						
							|  |  |  | 34875e8,2c6300ce | 
					
						
							|  |  |  | 34875ec,50600001 | 
					
						
							|  |  |  | 34875f0,240200cd | 
					
						
							|  |  |  | 34875f4,24420032 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34875f8,3046ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34875fc,3c028040 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487600,94420878 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3487604,3043ffff | 
					
						
							|  |  |  | 3487608,2c6300ce | 
					
						
							|  |  |  | 348760c,50600001 | 
					
						
							|  |  |  | 3487610,240200cd | 
					
						
							|  |  |  | 3487614,24420032 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487618,3044ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348761c,3c028040 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487620,9442087a | 
					
						
							|  |  |  | 3487624,3043ffff | 
					
						
							|  |  |  | 3487628,2c6300ce | 
					
						
							|  |  |  | 348762c,50600001 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3487630,240200cd | 
					
						
							|  |  |  | 3487634,24420032 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487638,3043ffff | 
					
						
							|  |  |  | 348763c,3c028040 | 
					
						
							|  |  |  | 3487640,9442087c | 
					
						
							|  |  |  | 3487644,3045ffff | 
					
						
							|  |  |  | 3487648,2ca500ce | 
					
						
							|  |  |  | 348764c,50a00001 | 
					
						
							|  |  |  | 3487650,240200cd | 
					
						
							|  |  |  | 3487654,24420032 | 
					
						
							|  |  |  | 3487658,3c058041 | 
					
						
							|  |  |  | 348765c,8ca8b508 | 
					
						
							|  |  |  | 3487660,3c058040 | 
					
						
							|  |  |  | 3487664,94a50872 | 
					
						
							|  |  |  | 3487668,30a9ffff | 
					
						
							|  |  |  | 348766c,2d2900ce | 
					
						
							|  |  |  | 3487670,15200002 | 
					
						
							|  |  |  | 3487674,3042ffff | 
					
						
							|  |  |  | 3487678,240500cd | 
					
						
							|  |  |  | 348767c,24a50032 | 
					
						
							|  |  |  | 3487680,a5050000 | 
					
						
							|  |  |  | 3487684,a5070002 | 
					
						
							|  |  |  | 3487688,a5060004 | 
					
						
							|  |  |  | 348768c,3c058041 | 
					
						
							|  |  |  | 3487690,8ca5b4f8 | 
					
						
							|  |  |  | 3487694,a4a40000 | 
					
						
							|  |  |  | 3487698,a4a30002 | 
					
						
							|  |  |  | 348769c,a4a20004 | 
					
						
							|  |  |  | 34876a0,3c028041 | 
					
						
							|  |  |  | 34876a4,8c43b500 | 
					
						
							|  |  |  | 34876a8,3c028040 | 
					
						
							|  |  |  | 34876ac,94450872 | 
					
						
							|  |  |  | 34876b0,24420872 | 
					
						
							|  |  |  | 34876b4,94440002 | 
					
						
							|  |  |  | 34876b8,94420004 | 
					
						
							|  |  |  | 34876bc,a4650000 | 
					
						
							|  |  |  | 34876c0,a4640002 | 
					
						
							|  |  |  | 34876c4,a4620004 | 
					
						
							|  |  |  | 34876c8,3c028041 | 
					
						
							|  |  |  | 34876cc,8c43b4f0 | 
					
						
							|  |  |  | 34876d0,3c028040 | 
					
						
							|  |  |  | 34876d4,94450878 | 
					
						
							|  |  |  | 34876d8,24420878 | 
					
						
							|  |  |  | 34876dc,94440002 | 
					
						
							|  |  |  | 34876e0,94420004 | 
					
						
							|  |  |  | 34876e4,a4650000 | 
					
						
							|  |  |  | 34876e8,a4640002 | 
					
						
							|  |  |  | 34876ec,a4620004 | 
					
						
							|  |  |  | 34876f0,3c028041 | 
					
						
							|  |  |  | 34876f4,8c43b4ec | 
					
						
							|  |  |  | 34876f8,3c028040 | 
					
						
							|  |  |  | 34876fc,94460866 | 
					
						
							|  |  |  | 3487700,24440866 | 
					
						
							|  |  |  | 3487704,94850002 | 
					
						
							|  |  |  | 3487708,94840004 | 
					
						
							|  |  |  | 348770c,a4660000 | 
					
						
							|  |  |  | 3487710,a4650002 | 
					
						
							|  |  |  | 3487714,a4640004 | 
					
						
							|  |  |  | 3487718,94420866 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348771c,3043ffff | 
					
						
							|  |  |  | 3487720,2c6300ce | 
					
						
							|  |  |  | 3487724,50600001 | 
					
						
							|  |  |  | 3487728,240200cd | 
					
						
							|  |  |  | 348772c,24420032 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487730,3044ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3487734,3c028040 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487738,94420868 | 
					
						
							|  |  |  | 348773c,3043ffff | 
					
						
							|  |  |  | 3487740,2c6300ce | 
					
						
							|  |  |  | 3487744,50600001 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3487748,240200cd | 
					
						
							|  |  |  | 348774c,24420032 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487750,3043ffff | 
					
						
							|  |  |  | 3487754,3c028040 | 
					
						
							|  |  |  | 3487758,9442086a | 
					
						
							|  |  |  | 348775c,3045ffff | 
					
						
							|  |  |  | 3487760,2ca500ce | 
					
						
							|  |  |  | 3487764,50a00001 | 
					
						
							|  |  |  | 3487768,240200cd | 
					
						
							|  |  |  | 348776c,24420032 | 
					
						
							|  |  |  | 3487770,3042ffff | 
					
						
							|  |  |  | 3487774,3c058041 | 
					
						
							|  |  |  | 3487778,8ca5b4e8 | 
					
						
							|  |  |  | 348777c,a4a40000 | 
					
						
							|  |  |  | 3487780,a4a30002 | 
					
						
							|  |  |  | 3487784,a4a20004 | 
					
						
							|  |  |  | 3487788,3c058041 | 
					
						
							|  |  |  | 348778c,8ca5b4e0 | 
					
						
							|  |  |  | 3487790,a4a40000 | 
					
						
							|  |  |  | 3487794,a4a30002 | 
					
						
							|  |  |  | 3487798,3e00008 | 
					
						
							|  |  |  | 348779c,a4a20004 | 
					
						
							|  |  |  | 34877a0,3c028011 | 
					
						
							|  |  |  | 34877a4,3442a5d0 | 
					
						
							|  |  |  | 34877a8,8c4200a0 | 
					
						
							|  |  |  | 34877ac,21302 | 
					
						
							|  |  |  | 34877b0,30420003 | 
					
						
							|  |  |  | 34877b4,21840 | 
					
						
							|  |  |  | 34877b8,621821 | 
					
						
							|  |  |  | 34877bc,3c028041 | 
					
						
							|  |  |  | 34877c0,2442a1c0 | 
					
						
							|  |  |  | 34877c4,621821 | 
					
						
							|  |  |  | 34877c8,90640000 | 
					
						
							|  |  |  | 34877cc,42600 | 
					
						
							|  |  |  | 34877d0,90620001 | 
					
						
							|  |  |  | 34877d4,21400 | 
					
						
							|  |  |  | 34877d8,822021 | 
					
						
							|  |  |  | 34877dc,90620002 | 
					
						
							|  |  |  | 34877e0,21200 | 
					
						
							|  |  |  | 34877e4,3e00008 | 
					
						
							|  |  |  | 34877e8,821021 | 
					
						
							|  |  |  | 34877ec,3c028041 | 
					
						
							|  |  |  | 34877f0,9042b5a4 | 
					
						
							|  |  |  | 34877f4,3e00008 | 
					
						
							|  |  |  | 34877f8,2102b | 
					
						
							|  |  |  | 34877fc,3c038041 | 
					
						
							|  |  |  | 3487800,9062b5a4 | 
					
						
							|  |  |  | 3487804,24420001 | 
					
						
							|  |  |  | 3487808,3e00008 | 
					
						
							|  |  |  | 348780c,a062b5a4 | 
					
						
							|  |  |  | 3487810,3c028041 | 
					
						
							|  |  |  | 3487814,9042b5a4 | 
					
						
							|  |  |  | 3487818,1040001b | 
					
						
							|  |  |  | 348781c,2442ffff | 
					
						
							|  |  |  | 3487820,27bdffd8 | 
					
						
							|  |  |  | 3487824,afbf0024 | 
					
						
							|  |  |  | 3487828,afb10020 | 
					
						
							|  |  |  | 348782c,afb0001c | 
					
						
							|  |  |  | 3487830,3c038041 | 
					
						
							|  |  |  | 3487834,a062b5a4 | 
					
						
							|  |  |  | 3487838,3c108038 | 
					
						
							|  |  |  | 348783c,3610e578 | 
					
						
							|  |  |  | 3487840,24050014 | 
					
						
							|  |  |  | 3487844,3c11801d | 
					
						
							|  |  |  | 3487848,200f809 | 
					
						
							|  |  |  | 348784c,3624aa30 | 
					
						
							|  |  |  | 3487850,24020014 | 
					
						
							|  |  |  | 3487854,afa20014 | 
					
						
							|  |  |  | 3487858,afa00010 | 
					
						
							|  |  |  | 348785c,26100130 | 
					
						
							|  |  |  | 3487860,3825 | 
					
						
							|  |  |  | 3487864,24060003 | 
					
						
							|  |  |  | 3487868,3625aa30 | 
					
						
							|  |  |  | 348786c,200f809 | 
					
						
							|  |  |  | 3487870,262484a0 | 
					
						
							|  |  |  | 3487874,8fbf0024 | 
					
						
							|  |  |  | 3487878,8fb10020 | 
					
						
							|  |  |  | 348787c,8fb0001c | 
					
						
							|  |  |  | 3487880,3e00008 | 
					
						
							|  |  |  | 3487884,27bd0028 | 
					
						
							|  |  |  | 3487888,3e00008 | 
					
						
							|  |  |  | 3487890,3e00008 | 
					
						
							|  |  |  | 3487898,24020140 | 
					
						
							|  |  |  | 348789c,3e00008 | 
					
						
							|  |  |  | 34878a0,a4821424 | 
					
						
							|  |  |  | 34878a4,27bdffe0 | 
					
						
							|  |  |  | 34878a8,afbf001c | 
					
						
							|  |  |  | 34878ac,afb10018 | 
					
						
							|  |  |  | 34878b0,afb00014 | 
					
						
							|  |  |  | 34878b4,808025 | 
					
						
							|  |  |  | 34878b8,8c8208c4 | 
					
						
							|  |  |  | 34878bc,24420001 | 
					
						
							|  |  |  | 34878c0,c1025e0 | 
					
						
							|  |  |  | 34878c4,ac8208c4 | 
					
						
							|  |  |  | 34878c8,3c028041 | 
					
						
							|  |  |  | 34878cc,9442b552 | 
					
						
							|  |  |  | 34878d0,8e0308c4 | 
					
						
							|  |  |  | 34878d4,1462001e | 
					
						
							|  |  |  | 34878d8,8fbf001c | 
					
						
							|  |  |  | 34878dc,920200b2 | 
					
						
							|  |  |  | 34878e0,34420001 | 
					
						
							|  |  |  | 34878e4,a20200b2 | 
					
						
							|  |  |  | 34878e8,3c04801c | 
					
						
							|  |  |  | 34878ec,348484a0 | 
					
						
							|  |  |  | 34878f0,3c110001 | 
					
						
							|  |  |  | 34878f4,918821 | 
					
						
							|  |  |  | 34878f8,86221e1a | 
					
						
							|  |  |  | 34878fc,ae020000 | 
					
						
							|  |  |  | 3487900,948200a4 | 
					
						
							|  |  |  | 3487904,a6020066 | 
					
						
							|  |  |  | 3487908,3c108009 | 
					
						
							|  |  |  | 348790c,3602d894 | 
					
						
							|  |  |  | 3487910,40f809 | 
					
						
							|  |  |  | 3487914,261005d4 | 
					
						
							|  |  |  | 3487918,3c04a34b | 
					
						
							|  |  |  | 348791c,200f809 | 
					
						
							|  |  |  | 3487920,3484e820 | 
					
						
							|  |  |  | 3487924,3c028011 | 
					
						
							|  |  |  | 3487928,3442a5d0 | 
					
						
							|  |  |  | 348792c,2403fff8 | 
					
						
							|  |  |  | 3487930,a4431412 | 
					
						
							|  |  |  | 3487934,240200a0 | 
					
						
							|  |  |  | 3487938,a6221e1a | 
					
						
							|  |  |  | 348793c,24020014 | 
					
						
							|  |  |  | 3487940,a2221e15 | 
					
						
							|  |  |  | 3487944,24020001 | 
					
						
							|  |  |  | 3487948,a2221e5e | 
					
						
							|  |  |  | 348794c,8fbf001c | 
					
						
							|  |  |  | 3487950,8fb10018 | 
					
						
							|  |  |  | 3487954,8fb00014 | 
					
						
							|  |  |  | 3487958,3e00008 | 
					
						
							|  |  |  | 348795c,27bd0020 | 
					
						
							|  |  |  | 3487960,8c8200a0 | 
					
						
							|  |  |  | 3487964,34423000 | 
					
						
							|  |  |  | 3487968,ac8200a0 | 
					
						
							|  |  |  | 348796c,3c028041 | 
					
						
							|  |  |  | 3487970,9042b5a7 | 
					
						
							|  |  |  | 3487974,304200ff | 
					
						
							|  |  |  | 3487978,10400005 | 
					
						
							|  |  |  | 348797c,52840 | 
					
						
							|  |  |  | 3487980,3c028010 | 
					
						
							|  |  |  | 3487984,451021 | 
					
						
							|  |  |  | 3487988,94428cec | 
					
						
							|  |  |  | 348798c,a4820034 | 
					
						
							|  |  |  | 3487990,3e00008 | 
					
						
							|  |  |  | 3487998,24020001 | 
					
						
							|  |  |  | 348799c,3e00008 | 
					
						
							|  |  |  | 34879a0,a082003e | 
					
						
							|  |  |  | 34879a4,24020012 | 
					
						
							|  |  |  | 34879a8,2406ffff | 
					
						
							|  |  |  | 34879ac,24070016 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34879b0,821821 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34879b4,80630074 | 
					
						
							|  |  |  | 34879b8,54660004 | 
					
						
							|  |  |  | 34879bc,24420001 | 
					
						
							|  |  |  | 34879c0,822021 | 
					
						
							|  |  |  | 34879c4,3e00008 | 
					
						
							|  |  |  | 34879c8,a0850074 | 
					
						
							|  |  |  | 34879cc,1447fff9 | 
					
						
							|  |  |  | 34879d0,821821 | 
					
						
							|  |  |  | 34879d4,3e00008 | 
					
						
							|  |  |  | 34879dc,862021 | 
					
						
							|  |  |  | 34879e0,908200a8 | 
					
						
							|  |  |  | 34879e4,a22825 | 
					
						
							|  |  |  | 34879e8,3e00008 | 
					
						
							|  |  |  | 34879ec,a08500a8 | 
					
						
							|  |  |  | 34879f0,852021 | 
					
						
							|  |  |  | 34879f4,908200bc | 
					
						
							|  |  |  | 34879f8,21e00 | 
					
						
							|  |  |  | 34879fc,31e03 | 
					
						
							|  |  |  | 3487a00,4620001 | 
					
						
							|  |  |  | 3487a04,1025 | 
					
						
							|  |  |  | 3487a08,24420001 | 
					
						
							|  |  |  | 3487a0c,3e00008 | 
					
						
							|  |  |  | 3487a10,a08200bc | 
					
						
							|  |  |  | 3487a14,24020001 | 
					
						
							|  |  |  | 3487a18,a082003d | 
					
						
							|  |  |  | 3487a1c,24020014 | 
					
						
							|  |  |  | 3487a20,a08200cf | 
					
						
							|  |  |  | 3487a24,24020140 | 
					
						
							|  |  |  | 3487a28,3e00008 | 
					
						
							|  |  |  | 3487a2c,a4821424 | 
					
						
							|  |  |  | 3487a30,24020001 | 
					
						
							|  |  |  | 3487a34,a0820032 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3487a38,a082003a | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487a3c,24020030 | 
					
						
							|  |  |  | 3487a40,a48213f4 | 
					
						
							|  |  |  | 3487a44,3e00008 | 
					
						
							|  |  |  | 3487a48,a0820033 | 
					
						
							|  |  |  | 3487a4c,24020002 | 
					
						
							|  |  |  | 3487a50,a0820032 | 
					
						
							|  |  |  | 3487a54,24020001 | 
					
						
							|  |  |  | 3487a58,a082003a | 
					
						
							|  |  |  | 3487a5c,a082003c | 
					
						
							|  |  |  | 3487a60,24020060 | 
					
						
							|  |  |  | 3487a64,a48213f4 | 
					
						
							|  |  |  | 3487a68,3e00008 | 
					
						
							|  |  |  | 3487a6c,a0820033 | 
					
						
							|  |  |  | 3487a70,24020007 | 
					
						
							|  |  |  | 3487a74,3e00008 | 
					
						
							|  |  |  | 3487a78,a082007b | 
					
						
							|  |  |  | 3487a7c,24020001 | 
					
						
							|  |  |  | 3487a80,a21004 | 
					
						
							|  |  |  | 3487a84,8c8500a4 | 
					
						
							|  |  |  | 3487a88,a22825 | 
					
						
							|  |  |  | 3487a8c,3e00008 | 
					
						
							|  |  |  | 3487a90,ac8500a4 | 
					
						
							|  |  |  | 3487a94,27bdffe8 | 
					
						
							|  |  |  | 3487a98,afbf0014 | 
					
						
							|  |  |  | 3487a9c,c101dff | 
					
						
							|  |  |  | 3487aa4,8fbf0014 | 
					
						
							|  |  |  | 3487aa8,3e00008 | 
					
						
							|  |  |  | 3487aac,27bd0018 | 
					
						
							|  |  |  | 3487ab0,24020010 | 
					
						
							|  |  |  | 3487ab4,a0820082 | 
					
						
							|  |  |  | 3487ab8,9082009a | 
					
						
							|  |  |  | 3487abc,2442000a | 
					
						
							|  |  |  | 3487ac0,3e00008 | 
					
						
							|  |  |  | 3487ac4,a082009a | 
					
						
							|  |  |  | 3487ac8,3c028041 | 
					
						
							|  |  |  | 3487acc,9042b5a7 | 
					
						
							|  |  |  | 3487ad0,304200ff | 
					
						
							|  |  |  | 3487ad4,10400005 | 
					
						
							|  |  |  | 3487ad8,52840 | 
					
						
							|  |  |  | 3487adc,3c028010 | 
					
						
							|  |  |  | 3487ae0,451021 | 
					
						
							|  |  |  | 3487ae4,94428cec | 
					
						
							|  |  |  | 3487ae8,a4820034 | 
					
						
							|  |  |  | 3487aec,3e00008 | 
					
						
							|  |  |  | 3487af4,3c028041 | 
					
						
							|  |  |  | 3487af8,9042b5a6 | 
					
						
							|  |  |  | 3487afc,1040000c | 
					
						
							|  |  |  | 3487b00,3c028041 | 
					
						
							|  |  |  | 3487b04,94820f06 | 
					
						
							|  |  |  | 3487b08,34420040 | 
					
						
							|  |  |  | 3487b0c,a4820f06 | 
					
						
							|  |  |  | 3487b10,3c028041 | 
					
						
							|  |  |  | 3487b14,9042b5a5 | 
					
						
							|  |  |  | 3487b18,54400009 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3487b1c,94820f06 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487b20,94820ef4 | 
					
						
							|  |  |  | 3487b24,3042fb87 | 
					
						
							|  |  |  | 3487b28,3e00008 | 
					
						
							|  |  |  | 3487b2c,a4820ef4 | 
					
						
							|  |  |  | 3487b30,9042b5a5 | 
					
						
							|  |  |  | 3487b34,1040000c | 
					
						
							|  |  |  | 3487b3c,94820f06 | 
					
						
							|  |  |  | 3487b40,34420080 | 
					
						
							|  |  |  | 3487b44,a4820f06 | 
					
						
							|  |  |  | 3487b48,94820ef6 | 
					
						
							|  |  |  | 3487b4c,24038f00 | 
					
						
							|  |  |  | 3487b50,431025 | 
					
						
							|  |  |  | 3487b54,a4820ef6 | 
					
						
							|  |  |  | 3487b58,94820ee4 | 
					
						
							|  |  |  | 3487b5c,2403f000 | 
					
						
							|  |  |  | 3487b60,431025 | 
					
						
							|  |  |  | 3487b64,a4820ee4 | 
					
						
							|  |  |  | 3487b68,3e00008 | 
					
						
							|  |  |  | 3487b70,2c8200cd | 
					
						
							|  |  |  | 3487b74,1040000b | 
					
						
							|  |  |  | 3487b78,41880 | 
					
						
							|  |  |  | 3487b7c,641021 | 
					
						
							|  |  |  | 3487b80,21080 | 
					
						
							|  |  |  | 3487b84,3c058041 | 
					
						
							|  |  |  | 3487b88,24a5a4b0 | 
					
						
							|  |  |  | 3487b8c,a21021 | 
					
						
							|  |  |  | 3487b90,80430000 | 
					
						
							|  |  |  | 3487b94,3182b | 
					
						
							|  |  |  | 3487b98,31823 | 
					
						
							|  |  |  | 3487b9c,3e00008 | 
					
						
							|  |  |  | 3487ba0,431024 | 
					
						
							|  |  |  | 3487ba4,3e00008 | 
					
						
							|  |  |  | 3487ba8,1025 | 
					
						
							|  |  |  | 3487bac,27bdffe0 | 
					
						
							|  |  |  | 3487bb0,afbf001c | 
					
						
							|  |  |  | 3487bb4,afb20018 | 
					
						
							|  |  |  | 3487bb8,afb10014 | 
					
						
							|  |  |  | 3487bbc,afb00010 | 
					
						
							|  |  |  | 3487bc0,808025 | 
					
						
							|  |  |  | 3487bc4,3c128011 | 
					
						
							|  |  |  | 3487bc8,3652a5d0 | 
					
						
							|  |  |  | 3487bcc,c101edc | 
					
						
							|  |  |  | 3487bd0,2002025 | 
					
						
							|  |  |  | 3487bd4,2008825 | 
					
						
							|  |  |  | 3487bd8,8c420008 | 
					
						
							|  |  |  | 3487bdc,2002825 | 
					
						
							|  |  |  | 3487be0,40f809 | 
					
						
							|  |  |  | 3487be4,2402025 | 
					
						
							|  |  |  | 3487be8,1622fff8 | 
					
						
							|  |  |  | 3487bec,408025 | 
					
						
							|  |  |  | 3487bf0,2201025 | 
					
						
							|  |  |  | 3487bf4,8fbf001c | 
					
						
							|  |  |  | 3487bf8,8fb20018 | 
					
						
							|  |  |  | 3487bfc,8fb10014 | 
					
						
							|  |  |  | 3487c00,8fb00010 | 
					
						
							|  |  |  | 3487c04,3e00008 | 
					
						
							|  |  |  | 3487c08,27bd0020 | 
					
						
							|  |  |  | 3487c0c,27bdffe8 | 
					
						
							|  |  |  | 3487c10,afbf0014 | 
					
						
							|  |  |  | 3487c14,8c82000c | 
					
						
							|  |  |  | 3487c18,84860012 | 
					
						
							|  |  |  | 3487c1c,84850010 | 
					
						
							|  |  |  | 3487c20,3c048011 | 
					
						
							|  |  |  | 3487c24,40f809 | 
					
						
							|  |  |  | 3487c28,3484a5d0 | 
					
						
							|  |  |  | 3487c2c,8fbf0014 | 
					
						
							|  |  |  | 3487c30,3e00008 | 
					
						
							|  |  |  | 3487c34,27bd0018 | 
					
						
							|  |  |  | 3487c38,3e00008 | 
					
						
							|  |  |  | 3487c3c,a01025 | 
					
						
							|  |  |  | 3487c40,8082007d | 
					
						
							|  |  |  | 3487c44,21027 | 
					
						
							|  |  |  | 3487c48,2102b | 
					
						
							|  |  |  | 3487c4c,3e00008 | 
					
						
							|  |  |  | 3487c50,24420008 | 
					
						
							|  |  |  | 3487c54,8c8200a0 | 
					
						
							|  |  |  | 3487c58,21182 | 
					
						
							|  |  |  | 3487c5c,30420007 | 
					
						
							|  |  |  | 3487c60,10400005 | 
					
						
							|  |  |  | 3487c68,38420001 | 
					
						
							|  |  |  | 3487c6c,2102b | 
					
						
							|  |  |  | 3487c70,3e00008 | 
					
						
							|  |  |  | 3487c74,24420035 | 
					
						
							|  |  |  | 3487c78,3e00008 | 
					
						
							|  |  |  | 3487c7c,24020054 | 
					
						
							|  |  |  | 3487c80,8c8200a0 | 
					
						
							|  |  |  | 3487c84,210c2 | 
					
						
							|  |  |  | 3487c88,30420007 | 
					
						
							|  |  |  | 3487c8c,10400005 | 
					
						
							|  |  |  | 3487c94,38420001 | 
					
						
							|  |  |  | 3487c98,2102b | 
					
						
							|  |  |  | 3487c9c,3e00008 | 
					
						
							|  |  |  | 3487ca0,24420033 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3487ca4,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487ca8,24020032 | 
					
						
							|  |  |  | 3487cac,8c8200a0 | 
					
						
							|  |  |  | 3487cb0,30420007 | 
					
						
							|  |  |  | 3487cb4,10400005 | 
					
						
							|  |  |  | 3487cbc,38420001 | 
					
						
							|  |  |  | 3487cc0,2102b | 
					
						
							|  |  |  | 3487cc4,3e00008 | 
					
						
							|  |  |  | 3487cc8,24420030 | 
					
						
							|  |  |  | 3487ccc,3e00008 | 
					
						
							|  |  |  | 3487cd0,24020004 | 
					
						
							|  |  |  | 3487cd4,8c8300a0 | 
					
						
							|  |  |  | 3487cd8,31b82 | 
					
						
							|  |  |  | 3487cdc,30630007 | 
					
						
							|  |  |  | 3487ce0,10600005 | 
					
						
							|  |  |  | 3487ce4,24040001 | 
					
						
							|  |  |  | 3487ce8,14640004 | 
					
						
							|  |  |  | 3487cec,2402007b | 
					
						
							|  |  |  | 3487cf0,3e00008 | 
					
						
							|  |  |  | 3487cf4,24020060 | 
					
						
							|  |  |  | 3487cf8,24020005 | 
					
						
							|  |  |  | 3487cfc,3e00008 | 
					
						
							|  |  |  | 3487d04,8c8300a0 | 
					
						
							|  |  |  | 3487d08,31b02 | 
					
						
							|  |  |  | 3487d0c,30630003 | 
					
						
							|  |  |  | 3487d10,10600005 | 
					
						
							|  |  |  | 3487d14,24040001 | 
					
						
							|  |  |  | 3487d18,14640004 | 
					
						
							|  |  |  | 3487d1c,240200c7 | 
					
						
							|  |  |  | 3487d20,3e00008 | 
					
						
							|  |  |  | 3487d24,24020046 | 
					
						
							|  |  |  | 3487d28,24020045 | 
					
						
							|  |  |  | 3487d2c,3e00008 | 
					
						
							|  |  |  | 3487d34,8c8200a0 | 
					
						
							|  |  |  | 3487d38,21242 | 
					
						
							|  |  |  | 3487d3c,30420007 | 
					
						
							|  |  |  | 3487d40,2102b | 
					
						
							|  |  |  | 3487d44,3e00008 | 
					
						
							|  |  |  | 3487d48,24420037 | 
					
						
							|  |  |  | 3487d4c,8c8200a0 | 
					
						
							|  |  |  | 3487d50,21502 | 
					
						
							|  |  |  | 3487d54,30420007 | 
					
						
							|  |  |  | 3487d58,2c420002 | 
					
						
							|  |  |  | 3487d5c,2c420001 | 
					
						
							|  |  |  | 3487d60,3e00008 | 
					
						
							|  |  |  | 3487d64,24420079 | 
					
						
							|  |  |  | 3487d68,8c8200a0 | 
					
						
							|  |  |  | 3487d6c,21442 | 
					
						
							|  |  |  | 3487d70,30420007 | 
					
						
							|  |  |  | 3487d74,2c420002 | 
					
						
							|  |  |  | 3487d78,2c420001 | 
					
						
							|  |  |  | 3487d7c,3e00008 | 
					
						
							|  |  |  | 3487d80,24420077 | 
					
						
							|  |  |  | 3487d84,9082003a | 
					
						
							|  |  |  | 3487d88,2102b | 
					
						
							|  |  |  | 3487d8c,3e00008 | 
					
						
							|  |  |  | 3487d90,244200b9 | 
					
						
							|  |  |  | 3487d94,8083007c | 
					
						
							|  |  |  | 3487d98,2402ffff | 
					
						
							|  |  |  | 3487d9c,50620007 | 
					
						
							|  |  |  | 3487da0,2402006b | 
					
						
							|  |  |  | 3487da4,80830094 | 
					
						
							|  |  |  | 3487da8,28630006 | 
					
						
							|  |  |  | 3487dac,10600003 | 
					
						
							|  |  |  | 3487db0,2402006a | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3487db4,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487db8,24020003 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3487dbc,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3487dc4,8083007b | 
					
						
							|  |  |  | 3487dc8,2402ffff | 
					
						
							|  |  |  | 3487dcc,10620003 | 
					
						
							|  |  |  | 3487dd4,3e00008 | 
					
						
							|  |  |  | 3487dd8,2402000c | 
					
						
							|  |  |  | 3487ddc,3e00008 | 
					
						
							|  |  |  | 3487de0,2402003b | 
					
						
							|  |  |  | 3487de4,8c8300a0 | 
					
						
							|  |  |  | 3487de8,30630007 | 
					
						
							|  |  |  | 3487dec,14600002 | 
					
						
							|  |  |  | 3487df0,a01025 | 
					
						
							|  |  |  | 3487df4,2402004d | 
					
						
							|  |  |  | 3487df8,3e00008 | 
					
						
							|  |  |  | 3487e00,8c8300a0 | 
					
						
							|  |  |  | 3487e04,30630038 | 
					
						
							|  |  |  | 3487e08,14600002 | 
					
						
							|  |  |  | 3487e0c,a01025 | 
					
						
							|  |  |  | 3487e10,2402004d | 
					
						
							|  |  |  | 3487e14,3e00008 | 
					
						
							|  |  |  | 3487e1c,8c8300a0 | 
					
						
							|  |  |  | 3487e20,3c040001 | 
					
						
							|  |  |  | 3487e24,3484c000 | 
					
						
							|  |  |  | 3487e28,641824 | 
					
						
							|  |  |  | 3487e2c,14600002 | 
					
						
							|  |  |  | 3487e30,a01025 | 
					
						
							|  |  |  | 3487e34,2402004d | 
					
						
							|  |  |  | 3487e38,3e00008 | 
					
						
							|  |  |  | 3487e40,94820eda | 
					
						
							|  |  |  | 3487e44,30420008 | 
					
						
							|  |  |  | 3487e48,14400010 | 
					
						
							|  |  |  | 3487e50,80830086 | 
					
						
							|  |  |  | 3487e54,2402001b | 
					
						
							|  |  |  | 3487e58,1062000e | 
					
						
							|  |  |  | 3487e60,80830087 | 
					
						
							|  |  |  | 3487e64,1062000d | 
					
						
							|  |  |  | 3487e6c,80830088 | 
					
						
							|  |  |  | 3487e70,1062000c | 
					
						
							|  |  |  | 3487e74,2403001b | 
					
						
							|  |  |  | 3487e78,80840089 | 
					
						
							|  |  |  | 3487e7c,1483000a | 
					
						
							|  |  |  | 3487e80,a01025 | 
					
						
							|  |  |  | 3487e84,3e00008 | 
					
						
							|  |  |  | 3487e88,240200c8 | 
					
						
							|  |  |  | 3487e8c,3e00008 | 
					
						
							|  |  |  | 3487e90,240200c8 | 
					
						
							|  |  |  | 3487e94,3e00008 | 
					
						
							|  |  |  | 3487e98,240200c8 | 
					
						
							|  |  |  | 3487e9c,3e00008 | 
					
						
							|  |  |  | 3487ea0,240200c8 | 
					
						
							|  |  |  | 3487ea4,240200c8 | 
					
						
							|  |  |  | 3487ea8,3e00008 | 
					
						
							|  |  |  | 3487eb0,27bdffe8 | 
					
						
							|  |  |  | 3487eb4,afbf0014 | 
					
						
							|  |  |  | 3487eb8,c10273d | 
					
						
							|  |  |  | 3487ec0,c101c85 | 
					
						
							|  |  |  | 3487ec8,c102556 | 
					
						
							|  |  |  | 3487ed0,c101956 | 
					
						
							|  |  |  | 3487ed8,c102369 | 
					
						
							|  |  |  | 3487ee0,8fbf0014 | 
					
						
							|  |  |  | 3487ee4,3e00008 | 
					
						
							|  |  |  | 3487ee8,27bd0018 | 
					
						
							|  |  |  | 3487eec,27bdffe8 | 
					
						
							|  |  |  | 3487ef0,afbf0014 | 
					
						
							|  |  |  | 3487ef4,c101aec | 
					
						
							|  |  |  | 3487efc,c100f8a | 
					
						
							|  |  |  | 3487f04,c10228c | 
					
						
							|  |  |  | 3487f0c,c101d01 | 
					
						
							|  |  |  | 3487f14,c101416 | 
					
						
							|  |  |  | 3487f1c,8fbf0014 | 
					
						
							|  |  |  | 3487f20,3e00008 | 
					
						
							|  |  |  | 3487f24,27bd0018 | 
					
						
							|  |  |  | 3487f28,27bdffe8 | 
					
						
							|  |  |  | 3487f2c,afbf0014 | 
					
						
							|  |  |  | 3487f30,afb00010 | 
					
						
							|  |  |  | 3487f34,3c10801c | 
					
						
							|  |  |  | 3487f38,361084a0 | 
					
						
							|  |  |  | 3487f3c,8e040000 | 
					
						
							|  |  |  | 3487f40,c10117e | 
					
						
							|  |  |  | 3487f44,248402a8 | 
					
						
							|  |  |  | 3487f48,8e040000 | 
					
						
							|  |  |  | 3487f4c,c1025ea | 
					
						
							|  |  |  | 3487f50,248402a8 | 
					
						
							|  |  |  | 3487f54,c101904 | 
					
						
							|  |  |  | 3487f5c,8fbf0014 | 
					
						
							|  |  |  | 3487f60,8fb00010 | 
					
						
							|  |  |  | 3487f64,3e00008 | 
					
						
							|  |  |  | 3487f68,27bd0018 | 
					
						
							|  |  |  | 3487f6c,27bdffe0 | 
					
						
							|  |  |  | 3487f70,afbf001c | 
					
						
							|  |  |  | 3487f74,afb10018 | 
					
						
							|  |  |  | 3487f78,afb00014 | 
					
						
							|  |  |  | 3487f7c,808025 | 
					
						
							|  |  |  | 3487f80,c102762 | 
					
						
							|  |  |  | 3487f84,a08825 | 
					
						
							|  |  |  | 3487f88,2202825 | 
					
						
							|  |  |  | 3487f8c,c027368 | 
					
						
							|  |  |  | 3487f90,2002025 | 
					
						
							|  |  |  | 3487f94,8fbf001c | 
					
						
							|  |  |  | 3487f98,8fb10018 | 
					
						
							|  |  |  | 3487f9c,8fb00014 | 
					
						
							|  |  |  | 3487fa0,3e00008 | 
					
						
							|  |  |  | 3487fa4,27bd0020 | 
					
						
							|  |  |  | 3487fa8,27bdffe8 | 
					
						
							|  |  |  | 3487fac,afbf0014 | 
					
						
							|  |  |  | 3487fb0,c1018dd | 
					
						
							|  |  |  | 3487fb8,c102738 | 
					
						
							|  |  |  | 3487fc0,c10237c | 
					
						
							|  |  |  | 3487fc8,c101410 | 
					
						
							|  |  |  | 3487fd0,8fbf0014 | 
					
						
							|  |  |  | 3487fd4,3e00008 | 
					
						
							|  |  |  | 3487fd8,27bd0018 | 
					
						
							|  |  |  | 3487fdc,3c02801c | 
					
						
							|  |  |  | 3487fe0,344284a0 | 
					
						
							|  |  |  | 3487fe4,3c030001 | 
					
						
							|  |  |  | 3487fe8,431021 | 
					
						
							|  |  |  | 3487fec,84430988 | 
					
						
							|  |  |  | 3487ff0,14600022 | 
					
						
							|  |  |  | 3487ff4,3c02801c | 
					
						
							|  |  |  | 3487ff8,344284a0 | 
					
						
							|  |  |  | 3487ffc,3c030001 | 
					
						
							|  |  |  | 3488000,431021 | 
					
						
							|  |  |  | 3488004,84420992 | 
					
						
							|  |  |  | 3488008,14400014 | 
					
						
							|  |  |  | 348800c,21840 | 
					
						
							|  |  |  | 3488010,3c028011 | 
					
						
							|  |  |  | 3488014,3442a5d0 | 
					
						
							|  |  |  | 3488018,8c420004 | 
					
						
							|  |  |  | 348801c,14400009 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3488020,3c028011 | 
					
						
							|  |  |  | 3488024,3442a5d0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3488028,8c4300a0 | 
					
						
							|  |  |  | 348802c,3c020001 | 
					
						
							|  |  |  | 3488030,3442c007 | 
					
						
							|  |  |  | 3488034,621824 | 
					
						
							|  |  |  | 3488038,14600026 | 
					
						
							|  |  |  | 348803c,24020001 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3488040,3c028011 | 
					
						
							|  |  |  | 3488044,3442a5d0 | 
					
						
							|  |  |  | 3488048,8c4200a0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348804c,21382 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3488050,30420007 | 
					
						
							|  |  |  | 3488054,3e00008 | 
					
						
							|  |  |  | 3488058,2102b | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348805c,621821 | 
					
						
							|  |  |  | 3488060,3c028011 | 
					
						
							|  |  |  | 3488064,3442a5d0 | 
					
						
							|  |  |  | 3488068,8c4200a0 | 
					
						
							|  |  |  | 348806c,621006 | 
					
						
							|  |  |  | 3488070,30420007 | 
					
						
							|  |  |  | 3488074,3e00008 | 
					
						
							|  |  |  | 3488078,2102b | 
					
						
							|  |  |  | 348807c,344284a0 | 
					
						
							|  |  |  | 3488080,3c040001 | 
					
						
							|  |  |  | 3488084,441021 | 
					
						
							|  |  |  | 3488088,84440992 | 
					
						
							|  |  |  | 348808c,1480000a | 
					
						
							|  |  |  | 3488090,3c028011 | 
					
						
							|  |  |  | 3488094,24020003 | 
					
						
							|  |  |  | 3488098,14620007 | 
					
						
							|  |  |  | 348809c,3c028011 | 
					
						
							|  |  |  | 34880a0,3442a5d0 | 
					
						
							|  |  |  | 34880a4,8c42009c | 
					
						
							|  |  |  | 34880a8,3c03000c | 
					
						
							|  |  |  | 34880ac,431024 | 
					
						
							|  |  |  | 34880b0,3e00008 | 
					
						
							|  |  |  | 34880b4,2102b | 
					
						
							|  |  |  | 34880b8,3442a5d0 | 
					
						
							|  |  |  | 34880bc,9442009c | 
					
						
							|  |  |  | 34880c0,42080 | 
					
						
							|  |  |  | 34880c4,2463ffff | 
					
						
							|  |  |  | 34880c8,832021 | 
					
						
							|  |  |  | 34880cc,821007 | 
					
						
							|  |  |  | 34880d0,30420001 | 
					
						
							|  |  |  | 34880d4,3e00008 | 
					
						
							|  |  |  | 34880dc,27bdffe0 | 
					
						
							|  |  |  | 34880e0,afbf001c | 
					
						
							|  |  |  | 34880e4,3c028040 | 
					
						
							|  |  |  | 34880e8,9042088b | 
					
						
							|  |  |  | 34880ec,10400010 | 
					
						
							|  |  |  | 34880f0,3c028040 | 
					
						
							|  |  |  | 34880f4,2406000c | 
					
						
							|  |  |  | 34880f8,3c028041 | 
					
						
							|  |  |  | 34880fc,8c45b5a8 | 
					
						
							|  |  |  | 3488100,c1024af | 
					
						
							|  |  |  | 3488104,27a40010 | 
					
						
							|  |  |  | 3488108,3c028011 | 
					
						
							|  |  |  | 348810c,97a30010 | 
					
						
							|  |  |  | 3488110,a4435dd2 | 
					
						
							|  |  |  | 3488114,93a30012 | 
					
						
							|  |  |  | 3488118,a0435dd4 | 
					
						
							|  |  |  | 348811c,97a30010 | 
					
						
							|  |  |  | 3488120,a4435dda | 
					
						
							|  |  |  | 3488124,93a30012 | 
					
						
							|  |  |  | 3488128,a0435ddc | 
					
						
							|  |  |  | 348812c,3c028040 | 
					
						
							|  |  |  | 3488130,9042088c | 
					
						
							|  |  |  | 3488134,10400010 | 
					
						
							|  |  |  | 3488138,8fbf001c | 
					
						
							|  |  |  | 348813c,2406000a | 
					
						
							|  |  |  | 3488140,3c028041 | 
					
						
							|  |  |  | 3488144,8c45b5a8 | 
					
						
							|  |  |  | 3488148,c1024af | 
					
						
							|  |  |  | 348814c,27a40010 | 
					
						
							|  |  |  | 3488150,3c028011 | 
					
						
							|  |  |  | 3488154,97a30010 | 
					
						
							|  |  |  | 3488158,a4435dce | 
					
						
							|  |  |  | 348815c,93a30012 | 
					
						
							|  |  |  | 3488160,a0435dd0 | 
					
						
							|  |  |  | 3488164,97a30010 | 
					
						
							|  |  |  | 3488168,a4435dd6 | 
					
						
							|  |  |  | 348816c,93a30012 | 
					
						
							|  |  |  | 3488170,a0435dd8 | 
					
						
							|  |  |  | 3488174,8fbf001c | 
					
						
							|  |  |  | 3488178,3e00008 | 
					
						
							|  |  |  | 348817c,27bd0020 | 
					
						
							|  |  |  | 3488180,3c02801d | 
					
						
							|  |  |  | 3488184,3442aa30 | 
					
						
							|  |  |  | 3488188,8c420678 | 
					
						
							|  |  |  | 348818c,10400063 | 
					
						
							|  |  |  | 3488194,8c430130 | 
					
						
							|  |  |  | 3488198,10600060 | 
					
						
							|  |  |  | 34881a0,8c4201c8 | 
					
						
							|  |  |  | 34881a4,2c43001f | 
					
						
							|  |  |  | 34881a8,1060005c | 
					
						
							|  |  |  | 34881b0,27bdffd8 | 
					
						
							|  |  |  | 34881b4,afbf0024 | 
					
						
							|  |  |  | 34881b8,afb10020 | 
					
						
							|  |  |  | 34881bc,afb0001c | 
					
						
							|  |  |  | 34881c0,280c0 | 
					
						
							|  |  |  | 34881c4,2028023 | 
					
						
							|  |  |  | 34881c8,108080 | 
					
						
							|  |  |  | 34881cc,2028023 | 
					
						
							|  |  |  | 34881d0,108100 | 
					
						
							|  |  |  | 34881d4,3c028011 | 
					
						
							|  |  |  | 34881d8,2028021 | 
					
						
							|  |  |  | 34881dc,3c028040 | 
					
						
							|  |  |  | 34881e0,9042088d | 
					
						
							|  |  |  | 34881e4,10400018 | 
					
						
							|  |  |  | 34881e8,2610572c | 
					
						
							|  |  |  | 34881ec,3c118041 | 
					
						
							|  |  |  | 34881f0,24060006 | 
					
						
							|  |  |  | 34881f4,8e25b5a8 | 
					
						
							|  |  |  | 34881f8,c1024af | 
					
						
							|  |  |  | 34881fc,27a40010 | 
					
						
							|  |  |  | 3488200,93a20010 | 
					
						
							|  |  |  | 3488204,a2020192 | 
					
						
							|  |  |  | 3488208,93a20011 | 
					
						
							|  |  |  | 348820c,a2020193 | 
					
						
							|  |  |  | 3488210,93a20012 | 
					
						
							|  |  |  | 3488214,a2020194 | 
					
						
							|  |  |  | 3488218,8e25b5a8 | 
					
						
							|  |  |  | 348821c,24060006 | 
					
						
							|  |  |  | 3488220,24a5000c | 
					
						
							|  |  |  | 3488224,c1024af | 
					
						
							|  |  |  | 3488228,27a40010 | 
					
						
							|  |  |  | 348822c,93a20010 | 
					
						
							|  |  |  | 3488230,a202019a | 
					
						
							|  |  |  | 3488234,93a20011 | 
					
						
							|  |  |  | 3488238,a202019b | 
					
						
							|  |  |  | 348823c,93a20012 | 
					
						
							|  |  |  | 3488240,1000000c | 
					
						
							|  |  |  | 3488244,a202019c | 
					
						
							|  |  |  | 3488248,3c028040 | 
					
						
							|  |  |  | 348824c,9044087e | 
					
						
							|  |  |  | 3488250,a2040192 | 
					
						
							|  |  |  | 3488254,2442087e | 
					
						
							|  |  |  | 3488258,90430001 | 
					
						
							|  |  |  | 348825c,a2030193 | 
					
						
							|  |  |  | 3488260,90420002 | 
					
						
							|  |  |  | 3488264,a2020194 | 
					
						
							|  |  |  | 3488268,a204019a | 
					
						
							|  |  |  | 348826c,a203019b | 
					
						
							|  |  |  | 3488270,a202019c | 
					
						
							|  |  |  | 3488274,3c028040 | 
					
						
							|  |  |  | 3488278,9042088e | 
					
						
							|  |  |  | 348827c,10400018 | 
					
						
							|  |  |  | 3488280,3c028040 | 
					
						
							|  |  |  | 3488284,3c118041 | 
					
						
							|  |  |  | 3488288,24060005 | 
					
						
							|  |  |  | 348828c,8e25b5a8 | 
					
						
							|  |  |  | 3488290,c1024af | 
					
						
							|  |  |  | 3488294,27a40010 | 
					
						
							|  |  |  | 3488298,93a20010 | 
					
						
							|  |  |  | 348829c,a2020196 | 
					
						
							|  |  |  | 34882a0,93a20011 | 
					
						
							|  |  |  | 34882a4,a2020197 | 
					
						
							|  |  |  | 34882a8,93a20012 | 
					
						
							|  |  |  | 34882ac,a2020198 | 
					
						
							|  |  |  | 34882b0,8e25b5a8 | 
					
						
							|  |  |  | 34882b4,24060005 | 
					
						
							|  |  |  | 34882b8,24a5000a | 
					
						
							|  |  |  | 34882bc,c1024af | 
					
						
							|  |  |  | 34882c0,27a40010 | 
					
						
							|  |  |  | 34882c4,93a20010 | 
					
						
							|  |  |  | 34882c8,a202019e | 
					
						
							|  |  |  | 34882cc,93a20011 | 
					
						
							|  |  |  | 34882d0,a202019f | 
					
						
							|  |  |  | 34882d4,93a20012 | 
					
						
							|  |  |  | 34882d8,1000000b | 
					
						
							|  |  |  | 34882dc,a20201a0 | 
					
						
							|  |  |  | 34882e0,90440881 | 
					
						
							|  |  |  | 34882e4,a2040196 | 
					
						
							|  |  |  | 34882e8,24420881 | 
					
						
							|  |  |  | 34882ec,90430001 | 
					
						
							|  |  |  | 34882f0,a2030197 | 
					
						
							|  |  |  | 34882f4,90420002 | 
					
						
							|  |  |  | 34882f8,a2020198 | 
					
						
							|  |  |  | 34882fc,a204019e | 
					
						
							|  |  |  | 3488300,a203019f | 
					
						
							|  |  |  | 3488304,a20201a0 | 
					
						
							|  |  |  | 3488308,8fbf0024 | 
					
						
							|  |  |  | 348830c,8fb10020 | 
					
						
							|  |  |  | 3488310,8fb0001c | 
					
						
							|  |  |  | 3488314,3e00008 | 
					
						
							|  |  |  | 3488318,27bd0028 | 
					
						
							|  |  |  | 348831c,3e00008 | 
					
						
							|  |  |  | 3488324,27bdffd0 | 
					
						
							|  |  |  | 3488328,afbf002c | 
					
						
							|  |  |  | 348832c,afb20028 | 
					
						
							|  |  |  | 3488330,afb10024 | 
					
						
							|  |  |  | 3488334,afb00020 | 
					
						
							|  |  |  | 3488338,3c028040 | 
					
						
							|  |  |  | 348833c,90430884 | 
					
						
							|  |  |  | 3488340,240200fa | 
					
						
							|  |  |  | 3488344,14620008 | 
					
						
							|  |  |  | 3488348,24100001 | 
					
						
							|  |  |  | 348834c,3c028040 | 
					
						
							|  |  |  | 3488350,24420884 | 
					
						
							|  |  |  | 3488354,90500001 | 
					
						
							|  |  |  | 3488358,90420002 | 
					
						
							|  |  |  | 348835c,2028025 | 
					
						
							|  |  |  | 3488360,321000ff | 
					
						
							|  |  |  | 3488364,10802b | 
					
						
							|  |  |  | 3488368,3c028040 | 
					
						
							|  |  |  | 348836c,90430887 | 
					
						
							|  |  |  | 3488370,240200fa | 
					
						
							|  |  |  | 3488374,14620008 | 
					
						
							|  |  |  | 3488378,24110001 | 
					
						
							|  |  |  | 348837c,3c028040 | 
					
						
							|  |  |  | 3488380,24420887 | 
					
						
							|  |  |  | 3488384,90510001 | 
					
						
							|  |  |  | 3488388,90420002 | 
					
						
							|  |  |  | 348838c,2228825 | 
					
						
							|  |  |  | 3488390,323100ff | 
					
						
							|  |  |  | 3488394,11882b | 
					
						
							|  |  |  | 3488398,3c128041 | 
					
						
							|  |  |  | 348839c,24060009 | 
					
						
							|  |  |  | 34883a0,8e45b5a8 | 
					
						
							|  |  |  | 34883a4,c1024af | 
					
						
							|  |  |  | 34883a8,27a40010 | 
					
						
							|  |  |  | 34883ac,8e45b5a8 | 
					
						
							|  |  |  | 34883b0,24060009 | 
					
						
							|  |  |  | 34883b4,24a50012 | 
					
						
							|  |  |  | 34883b8,c1024af | 
					
						
							|  |  |  | 34883bc,27a40014 | 
					
						
							|  |  |  | 34883c0,24060007 | 
					
						
							|  |  |  | 34883c4,8e45b5a8 | 
					
						
							|  |  |  | 34883c8,c1024af | 
					
						
							|  |  |  | 34883cc,27a40018 | 
					
						
							|  |  |  | 34883d0,8e45b5a8 | 
					
						
							|  |  |  | 34883d4,24060007 | 
					
						
							|  |  |  | 34883d8,24a5000e | 
					
						
							|  |  |  | 34883dc,c1024af | 
					
						
							|  |  |  | 34883e0,27a4001c | 
					
						
							|  |  |  | 34883e4,3c02801c | 
					
						
							|  |  |  | 34883e8,344284a0 | 
					
						
							|  |  |  | 34883ec,8c421c4c | 
					
						
							|  |  |  | 34883f0,10400064 | 
					
						
							|  |  |  | 34883f4,8fbf002c | 
					
						
							|  |  |  | 34883f8,240500da | 
					
						
							|  |  |  | 34883fc,3c068011 | 
					
						
							|  |  |  | 3488400,24c65c3c | 
					
						
							|  |  |  | 3488404,3c088040 | 
					
						
							|  |  |  | 3488408,3c078040 | 
					
						
							|  |  |  | 348840c,3c0a8040 | 
					
						
							|  |  |  | 3488410,254c0887 | 
					
						
							|  |  |  | 3488414,3c098040 | 
					
						
							|  |  |  | 3488418,252b0884 | 
					
						
							|  |  |  | 348841c,8c430130 | 
					
						
							|  |  |  | 3488420,50600055 | 
					
						
							|  |  |  | 3488424,8c420124 | 
					
						
							|  |  |  | 3488428,84430000 | 
					
						
							|  |  |  | 348842c,54650052 | 
					
						
							|  |  |  | 3488430,8c420124 | 
					
						
							|  |  |  | 3488434,8c43016c | 
					
						
							|  |  |  | 3488438,320c0 | 
					
						
							|  |  |  | 348843c,832023 | 
					
						
							|  |  |  | 3488440,42080 | 
					
						
							|  |  |  | 3488444,832023 | 
					
						
							|  |  |  | 3488448,42100 | 
					
						
							|  |  |  | 348844c,2484faf0 | 
					
						
							|  |  |  | 3488450,862021 | 
					
						
							|  |  |  | 3488454,8c4d0170 | 
					
						
							|  |  |  | 3488458,d18c0 | 
					
						
							|  |  |  | 348845c,6d1823 | 
					
						
							|  |  |  | 3488460,31880 | 
					
						
							|  |  |  | 3488464,6d1823 | 
					
						
							|  |  |  | 3488468,31900 | 
					
						
							|  |  |  | 348846c,2463faf0 | 
					
						
							|  |  |  | 3488470,910d088f | 
					
						
							|  |  |  | 3488474,11a0000e | 
					
						
							|  |  |  | 3488478,661821 | 
					
						
							|  |  |  | 348847c,97ae0010 | 
					
						
							|  |  |  | 3488480,a48e0192 | 
					
						
							|  |  |  | 3488484,93ad0012 | 
					
						
							|  |  |  | 3488488,a08d0194 | 
					
						
							|  |  |  | 348848c,a46e0192 | 
					
						
							|  |  |  | 3488490,a06d0194 | 
					
						
							|  |  |  | 3488494,97ae0014 | 
					
						
							|  |  |  | 3488498,a48e019a | 
					
						
							|  |  |  | 348849c,93ad0016 | 
					
						
							|  |  |  | 34884a0,a08d019c | 
					
						
							|  |  |  | 34884a4,a46e019a | 
					
						
							|  |  |  | 34884a8,10000012 | 
					
						
							|  |  |  | 34884ac,a06d019c | 
					
						
							|  |  |  | 34884b0,12000011 | 
					
						
							|  |  |  | 34884b4,90ed0890 | 
					
						
							|  |  |  | 34884b8,912f0884 | 
					
						
							|  |  |  | 34884bc,a08f0192 | 
					
						
							|  |  |  | 34884c0,916e0001 | 
					
						
							|  |  |  | 34884c4,a08e0193 | 
					
						
							|  |  |  | 34884c8,916d0002 | 
					
						
							|  |  |  | 34884cc,a08d0194 | 
					
						
							|  |  |  | 34884d0,a06f0192 | 
					
						
							|  |  |  | 34884d4,a06e0193 | 
					
						
							|  |  |  | 34884d8,a06d0194 | 
					
						
							|  |  |  | 34884dc,a08f019a | 
					
						
							|  |  |  | 34884e0,a08e019b | 
					
						
							|  |  |  | 34884e4,a08d019c | 
					
						
							|  |  |  | 34884e8,a06f019a | 
					
						
							|  |  |  | 34884ec,a06e019b | 
					
						
							|  |  |  | 34884f0,a06d019c | 
					
						
							|  |  |  | 34884f4,90ed0890 | 
					
						
							|  |  |  | 34884f8,11a0000d | 
					
						
							|  |  |  | 34884fc,97ae0018 | 
					
						
							|  |  |  | 3488500,a48e0196 | 
					
						
							|  |  |  | 3488504,93ad001a | 
					
						
							|  |  |  | 3488508,a08d0198 | 
					
						
							|  |  |  | 348850c,a46e0196 | 
					
						
							|  |  |  | 3488510,a06d0198 | 
					
						
							|  |  |  | 3488514,97ae001c | 
					
						
							|  |  |  | 3488518,a48e019e | 
					
						
							|  |  |  | 348851c,93ad001e | 
					
						
							|  |  |  | 3488520,a08d01a0 | 
					
						
							|  |  |  | 3488524,a46e019e | 
					
						
							|  |  |  | 3488528,10000012 | 
					
						
							|  |  |  | 348852c,a06d01a0 | 
					
						
							|  |  |  | 3488530,52200011 | 
					
						
							|  |  |  | 3488534,8c420124 | 
					
						
							|  |  |  | 3488538,914f0887 | 
					
						
							|  |  |  | 348853c,a08f0196 | 
					
						
							|  |  |  | 3488540,918e0001 | 
					
						
							|  |  |  | 3488544,a08e0197 | 
					
						
							|  |  |  | 3488548,918d0002 | 
					
						
							|  |  |  | 348854c,a08d0198 | 
					
						
							|  |  |  | 3488550,a06f0196 | 
					
						
							|  |  |  | 3488554,a06e0197 | 
					
						
							|  |  |  | 3488558,a06d0198 | 
					
						
							|  |  |  | 348855c,a08f019e | 
					
						
							|  |  |  | 3488560,a08e019f | 
					
						
							|  |  |  | 3488564,a08d01a0 | 
					
						
							|  |  |  | 3488568,a06f019e | 
					
						
							|  |  |  | 348856c,a06e019f | 
					
						
							|  |  |  | 3488570,a06d01a0 | 
					
						
							|  |  |  | 3488574,8c420124 | 
					
						
							|  |  |  | 3488578,5440ffa9 | 
					
						
							|  |  |  | 348857c,8c430130 | 
					
						
							|  |  |  | 3488580,8fbf002c | 
					
						
							|  |  |  | 3488584,8fb20028 | 
					
						
							|  |  |  | 3488588,8fb10024 | 
					
						
							|  |  |  | 348858c,8fb00020 | 
					
						
							|  |  |  | 3488590,3e00008 | 
					
						
							|  |  |  | 3488594,27bd0030 | 
					
						
							|  |  |  | 3488598,27bdffd8 | 
					
						
							|  |  |  | 348859c,afbf001c | 
					
						
							|  |  |  | 34885a0,f7b40020 | 
					
						
							|  |  |  | 34885a4,3c028040 | 
					
						
							|  |  |  | 34885a8,9042088f | 
					
						
							|  |  |  | 34885ac,1040000a | 
					
						
							|  |  |  | 34885b0,46006506 | 
					
						
							|  |  |  | 34885b4,24060009 | 
					
						
							|  |  |  | 34885b8,3c028041 | 
					
						
							|  |  |  | 34885bc,8c45b5a8 | 
					
						
							|  |  |  | 34885c0,c1024af | 
					
						
							|  |  |  | 34885c4,27a40010 | 
					
						
							|  |  |  | 34885c8,93a20010 | 
					
						
							|  |  |  | 34885cc,93a30011 | 
					
						
							|  |  |  | 34885d0,10000006 | 
					
						
							|  |  |  | 34885d4,93a40012 | 
					
						
							|  |  |  | 34885d8,3c048040 | 
					
						
							|  |  |  | 34885dc,90820884 | 
					
						
							|  |  |  | 34885e0,24840884 | 
					
						
							|  |  |  | 34885e4,90830001 | 
					
						
							|  |  |  | 34885e8,90840002 | 
					
						
							|  |  |  | 34885ec,240500fa | 
					
						
							|  |  |  | 34885f0,14450043 | 
					
						
							|  |  |  | 34885f4,642825 | 
					
						
							|  |  |  | 34885f8,14a00041 | 
					
						
							|  |  |  | 3488600,3c028041 | 
					
						
							|  |  |  | 3488604,c440a20c | 
					
						
							|  |  |  | 3488608,4600a002 | 
					
						
							|  |  |  | 348860c,3c028041 | 
					
						
							|  |  |  | 3488610,c442a210 | 
					
						
							|  |  |  | 3488614,46020000 | 
					
						
							|  |  |  | 3488618,3c028041 | 
					
						
							|  |  |  | 348861c,c442a214 | 
					
						
							|  |  |  | 3488620,4600103e | 
					
						
							|  |  |  | 3488628,45030005 | 
					
						
							|  |  |  | 348862c,46020001 | 
					
						
							|  |  |  | 3488630,4600000d | 
					
						
							|  |  |  | 3488634,44020000 | 
					
						
							|  |  |  | 3488638,10000006 | 
					
						
							|  |  |  | 348863c,304200ff | 
					
						
							|  |  |  | 3488640,4600000d | 
					
						
							|  |  |  | 3488644,44020000 | 
					
						
							|  |  |  | 3488648,3c038000 | 
					
						
							|  |  |  | 348864c,431025 | 
					
						
							|  |  |  | 3488650,304200ff | 
					
						
							|  |  |  | 3488654,3c038041 | 
					
						
							|  |  |  | 3488658,c460a218 | 
					
						
							|  |  |  | 348865c,4600a002 | 
					
						
							|  |  |  | 3488660,3c038041 | 
					
						
							|  |  |  | 3488664,c462a210 | 
					
						
							|  |  |  | 3488668,46020000 | 
					
						
							|  |  |  | 348866c,3c038041 | 
					
						
							|  |  |  | 3488670,c462a214 | 
					
						
							|  |  |  | 3488674,4600103e | 
					
						
							|  |  |  | 348867c,45030005 | 
					
						
							|  |  |  | 3488680,46020001 | 
					
						
							|  |  |  | 3488684,4600000d | 
					
						
							|  |  |  | 3488688,44030000 | 
					
						
							|  |  |  | 348868c,10000006 | 
					
						
							|  |  |  | 3488690,306300ff | 
					
						
							|  |  |  | 3488694,4600000d | 
					
						
							|  |  |  | 3488698,44030000 | 
					
						
							|  |  |  | 348869c,3c048000 | 
					
						
							|  |  |  | 34886a0,641825 | 
					
						
							|  |  |  | 34886a4,306300ff | 
					
						
							|  |  |  | 34886a8,3c048041 | 
					
						
							|  |  |  | 34886ac,c480a21c | 
					
						
							|  |  |  | 34886b0,4600a002 | 
					
						
							|  |  |  | 34886b4,3c048041 | 
					
						
							|  |  |  | 34886b8,c482a220 | 
					
						
							|  |  |  | 34886bc,46020000 | 
					
						
							|  |  |  | 34886c0,3c048041 | 
					
						
							|  |  |  | 34886c4,c482a214 | 
					
						
							|  |  |  | 34886c8,4600103e | 
					
						
							|  |  |  | 34886d0,45030005 | 
					
						
							|  |  |  | 34886d4,46020001 | 
					
						
							|  |  |  | 34886d8,4600000d | 
					
						
							|  |  |  | 34886dc,44040000 | 
					
						
							|  |  |  | 34886e0,10000040 | 
					
						
							|  |  |  | 34886e4,308400ff | 
					
						
							|  |  |  | 34886e8,4600000d | 
					
						
							|  |  |  | 34886ec,44040000 | 
					
						
							|  |  |  | 34886f0,3c058000 | 
					
						
							|  |  |  | 34886f4,852025 | 
					
						
							|  |  |  | 34886f8,1000003a | 
					
						
							|  |  |  | 34886fc,308400ff | 
					
						
							|  |  |  | 3488700,44820000 | 
					
						
							|  |  |  | 3488708,46800020 | 
					
						
							|  |  |  | 348870c,46140002 | 
					
						
							|  |  |  | 3488710,3c028041 | 
					
						
							|  |  |  | 3488714,c442a214 | 
					
						
							|  |  |  | 3488718,4600103e | 
					
						
							|  |  |  | 3488720,45030005 | 
					
						
							|  |  |  | 3488724,46020001 | 
					
						
							|  |  |  | 3488728,4600000d | 
					
						
							|  |  |  | 348872c,44020000 | 
					
						
							|  |  |  | 3488730,10000006 | 
					
						
							|  |  |  | 3488734,304200ff | 
					
						
							|  |  |  | 3488738,4600000d | 
					
						
							|  |  |  | 348873c,44020000 | 
					
						
							|  |  |  | 3488740,3c058000 | 
					
						
							|  |  |  | 3488744,451025 | 
					
						
							|  |  |  | 3488748,304200ff | 
					
						
							|  |  |  | 348874c,44830000 | 
					
						
							|  |  |  | 3488754,46800020 | 
					
						
							|  |  |  | 3488758,46140002 | 
					
						
							|  |  |  | 348875c,3c038041 | 
					
						
							|  |  |  | 3488760,c462a214 | 
					
						
							|  |  |  | 3488764,4600103e | 
					
						
							|  |  |  | 348876c,45030005 | 
					
						
							|  |  |  | 3488770,46020001 | 
					
						
							|  |  |  | 3488774,4600000d | 
					
						
							|  |  |  | 3488778,44030000 | 
					
						
							|  |  |  | 348877c,10000006 | 
					
						
							|  |  |  | 3488780,306300ff | 
					
						
							|  |  |  | 3488784,4600000d | 
					
						
							|  |  |  | 3488788,44030000 | 
					
						
							|  |  |  | 348878c,3c058000 | 
					
						
							|  |  |  | 3488790,651825 | 
					
						
							|  |  |  | 3488794,306300ff | 
					
						
							|  |  |  | 3488798,44840000 | 
					
						
							|  |  |  | 34887a0,46800020 | 
					
						
							|  |  |  | 34887a4,46140002 | 
					
						
							|  |  |  | 34887a8,3c048041 | 
					
						
							|  |  |  | 34887ac,c482a214 | 
					
						
							|  |  |  | 34887b0,4600103e | 
					
						
							|  |  |  | 34887b8,45030005 | 
					
						
							|  |  |  | 34887bc,46020001 | 
					
						
							|  |  |  | 34887c0,4600000d | 
					
						
							|  |  |  | 34887c4,44040000 | 
					
						
							|  |  |  | 34887c8,10000006 | 
					
						
							|  |  |  | 34887cc,308400ff | 
					
						
							|  |  |  | 34887d0,4600000d | 
					
						
							|  |  |  | 34887d4,44040000 | 
					
						
							|  |  |  | 34887d8,3c058000 | 
					
						
							|  |  |  | 34887dc,852025 | 
					
						
							|  |  |  | 34887e0,308400ff | 
					
						
							|  |  |  | 34887e4,21600 | 
					
						
							|  |  |  | 34887e8,42200 | 
					
						
							|  |  |  | 34887ec,441025 | 
					
						
							|  |  |  | 34887f0,31c00 | 
					
						
							|  |  |  | 34887f4,431025 | 
					
						
							|  |  |  | 34887f8,344200ff | 
					
						
							|  |  |  | 34887fc,8fbf001c | 
					
						
							|  |  |  | 3488800,d7b40020 | 
					
						
							|  |  |  | 3488804,3e00008 | 
					
						
							|  |  |  | 3488808,27bd0028 | 
					
						
							|  |  |  | 348880c,27bdffd8 | 
					
						
							|  |  |  | 3488810,afbf0024 | 
					
						
							|  |  |  | 3488814,afb20020 | 
					
						
							|  |  |  | 3488818,afb1001c | 
					
						
							|  |  |  | 348881c,afb00018 | 
					
						
							|  |  |  | 3488820,3c02801c | 
					
						
							|  |  |  | 3488824,344284a0 | 
					
						
							|  |  |  | 3488828,90421cda | 
					
						
							|  |  |  | 348882c,24030004 | 
					
						
							|  |  |  | 3488830,10430015 | 
					
						
							|  |  |  | 3488834,2c430005 | 
					
						
							|  |  |  | 3488838,50600006 | 
					
						
							|  |  |  | 348883c,2442fffb | 
					
						
							|  |  |  | 3488840,24030002 | 
					
						
							|  |  |  | 3488844,50430008 | 
					
						
							|  |  |  | 3488848,3c028040 | 
					
						
							|  |  |  | 348884c,10000013 | 
					
						
							|  |  |  | 3488850,3c028040 | 
					
						
							|  |  |  | 3488854,304200fb | 
					
						
							|  |  |  | 3488858,54400010 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348885c,3c028040 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3488860,10000005 | 
					
						
							|  |  |  | 3488864,3c028040 | 
					
						
							|  |  |  | 3488868,90500891 | 
					
						
							|  |  |  | 348886c,3c028040 | 
					
						
							|  |  |  | 3488870,1000000d | 
					
						
							|  |  |  | 3488874,90510892 | 
					
						
							|  |  |  | 3488878,90500893 | 
					
						
							|  |  |  | 348887c,3c028040 | 
					
						
							|  |  |  | 3488880,10000009 | 
					
						
							|  |  |  | 3488884,90510894 | 
					
						
							|  |  |  | 3488888,3c028040 | 
					
						
							|  |  |  | 348888c,90500895 | 
					
						
							|  |  |  | 3488890,3c028040 | 
					
						
							|  |  |  | 3488894,10000004 | 
					
						
							|  |  |  | 3488898,90510896 | 
					
						
							|  |  |  | 348889c,90500897 | 
					
						
							|  |  |  | 34888a0,3c028040 | 
					
						
							|  |  |  | 34888a4,90510898 | 
					
						
							|  |  |  | 34888a8,2111025 | 
					
						
							|  |  |  | 34888ac,1040005b | 
					
						
							|  |  |  | 34888b0,8fbf0024 | 
					
						
							|  |  |  | 34888b4,3c128041 | 
					
						
							|  |  |  | 34888b8,2406000e | 
					
						
							|  |  |  | 34888bc,8e45b5a8 | 
					
						
							|  |  |  | 34888c0,c1024af | 
					
						
							|  |  |  | 34888c4,27a40010 | 
					
						
							|  |  |  | 34888c8,2406000c | 
					
						
							|  |  |  | 34888cc,8e45b5a8 | 
					
						
							|  |  |  | 34888d0,c1024af | 
					
						
							|  |  |  | 34888d4,27a40014 | 
					
						
							|  |  |  | 34888d8,1200000a | 
					
						
							|  |  |  | 34888dc,3c02801c | 
					
						
							|  |  |  | 34888e0,344284a0 | 
					
						
							|  |  |  | 34888e4,90431cda | 
					
						
							|  |  |  | 34888e8,318c0 | 
					
						
							|  |  |  | 34888ec,3c02800f | 
					
						
							|  |  |  | 34888f0,431021 | 
					
						
							|  |  |  | 34888f4,97a30010 | 
					
						
							|  |  |  | 34888f8,a4438214 | 
					
						
							|  |  |  | 34888fc,93a30012 | 
					
						
							|  |  |  | 3488900,a0438216 | 
					
						
							|  |  |  | 3488904,1220000a | 
					
						
							|  |  |  | 3488908,3c02801c | 
					
						
							|  |  |  | 348890c,344284a0 | 
					
						
							|  |  |  | 3488910,90431cda | 
					
						
							|  |  |  | 3488914,318c0 | 
					
						
							|  |  |  | 3488918,3c02800f | 
					
						
							|  |  |  | 348891c,431021 | 
					
						
							|  |  |  | 3488920,97a30014 | 
					
						
							|  |  |  | 3488924,a4438218 | 
					
						
							|  |  |  | 3488928,93a30016 | 
					
						
							|  |  |  | 348892c,a043821a | 
					
						
							|  |  |  | 3488930,12000010 | 
					
						
							|  |  |  | 3488934,3c02801d | 
					
						
							|  |  |  | 3488938,3c02801c | 
					
						
							|  |  |  | 348893c,344284a0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3488940,97a30010 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3488944,a4431cf0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3488948,93a30012 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348894c,a0431cf2 | 
					
						
							|  |  |  | 3488950,97a30010 | 
					
						
							|  |  |  | 3488954,a4431d04 | 
					
						
							|  |  |  | 3488958,93a30012 | 
					
						
							|  |  |  | 348895c,a0431d06 | 
					
						
							|  |  |  | 3488960,97a30010 | 
					
						
							|  |  |  | 3488964,a4431d18 | 
					
						
							|  |  |  | 3488968,93a30012 | 
					
						
							|  |  |  | 348896c,a0431d1a | 
					
						
							|  |  |  | 3488970,3c02801d | 
					
						
							|  |  |  | 3488974,3442aa30 | 
					
						
							|  |  |  | 3488978,8c42067c | 
					
						
							|  |  |  | 348897c,10400027 | 
					
						
							|  |  |  | 3488980,8fbf0024 | 
					
						
							|  |  |  | 3488984,8c430130 | 
					
						
							|  |  |  | 3488988,10600025 | 
					
						
							|  |  |  | 348898c,8fb20020 | 
					
						
							|  |  |  | 3488990,12000010 | 
					
						
							|  |  |  | 3488994,24430234 | 
					
						
							|  |  |  | 3488998,93a40010 | 
					
						
							|  |  |  | 348899c,44840000 | 
					
						
							|  |  |  | 34889a4,46800020 | 
					
						
							|  |  |  | 34889a8,e4400234 | 
					
						
							|  |  |  | 34889ac,93a20011 | 
					
						
							|  |  |  | 34889b0,44820000 | 
					
						
							|  |  |  | 34889b8,46800020 | 
					
						
							|  |  |  | 34889bc,e4600004 | 
					
						
							|  |  |  | 34889c0,93a20012 | 
					
						
							|  |  |  | 34889c4,44820000 | 
					
						
							|  |  |  | 34889cc,46800020 | 
					
						
							|  |  |  | 34889d0,e4600008 | 
					
						
							|  |  |  | 34889d4,12200011 | 
					
						
							|  |  |  | 34889d8,8fbf0024 | 
					
						
							|  |  |  | 34889dc,93a20014 | 
					
						
							|  |  |  | 34889e0,44820000 | 
					
						
							|  |  |  | 34889e8,46800020 | 
					
						
							|  |  |  | 34889ec,e4600010 | 
					
						
							|  |  |  | 34889f0,93a20015 | 
					
						
							|  |  |  | 34889f4,44820000 | 
					
						
							|  |  |  | 34889fc,46800020 | 
					
						
							|  |  |  | 3488a00,e4600014 | 
					
						
							|  |  |  | 3488a04,93a20016 | 
					
						
							|  |  |  | 3488a08,44820000 | 
					
						
							|  |  |  | 3488a10,46800020 | 
					
						
							|  |  |  | 3488a14,e4600018 | 
					
						
							|  |  |  | 3488a18,8fbf0024 | 
					
						
							|  |  |  | 3488a1c,8fb20020 | 
					
						
							|  |  |  | 3488a20,8fb1001c | 
					
						
							|  |  |  | 3488a24,8fb00018 | 
					
						
							|  |  |  | 3488a28,3e00008 | 
					
						
							|  |  |  | 3488a2c,27bd0028 | 
					
						
							|  |  |  | 3488a30,27bdffe8 | 
					
						
							|  |  |  | 3488a34,afbf0014 | 
					
						
							|  |  |  | 3488a38,3c038041 | 
					
						
							|  |  |  | 3488a3c,8c62b5a8 | 
					
						
							|  |  |  | 3488a40,24420001 | 
					
						
							|  |  |  | 3488a44,c102037 | 
					
						
							|  |  |  | 3488a48,ac62b5a8 | 
					
						
							|  |  |  | 3488a4c,c102060 | 
					
						
							|  |  |  | 3488a54,c1020c9 | 
					
						
							|  |  |  | 3488a5c,c102203 | 
					
						
							|  |  |  | 3488a64,8fbf0014 | 
					
						
							|  |  |  | 3488a68,3e00008 | 
					
						
							|  |  |  | 3488a6c,27bd0018 | 
					
						
							|  |  |  | 3488a70,27bdffe8 | 
					
						
							|  |  |  | 3488a74,afbf0014 | 
					
						
							|  |  |  | 3488a78,801025 | 
					
						
							|  |  |  | 3488a7c,2c430193 | 
					
						
							|  |  |  | 3488a80,10600006 | 
					
						
							|  |  |  | 3488a84,a02025 | 
					
						
							|  |  |  | 3488a88,210c0 | 
					
						
							|  |  |  | 3488a8c,3c03800f | 
					
						
							|  |  |  | 3488a90,34638ff8 | 
					
						
							|  |  |  | 3488a94,10000008 | 
					
						
							|  |  |  | 3488a98,431021 | 
					
						
							|  |  |  | 3488a9c,2442fe6e | 
					
						
							|  |  |  | 3488aa0,21080 | 
					
						
							|  |  |  | 3488aa4,2403fff8 | 
					
						
							|  |  |  | 3488aa8,431024 | 
					
						
							|  |  |  | 3488aac,3c038040 | 
					
						
							|  |  |  | 3488ab0,24630c9c | 
					
						
							|  |  |  | 3488ab4,621021 | 
					
						
							|  |  |  | 3488ab8,8c450000 | 
					
						
							|  |  |  | 3488abc,8c460004 | 
					
						
							|  |  |  | 3488ac0,3c028000 | 
					
						
							|  |  |  | 3488ac4,24420df0 | 
					
						
							|  |  |  | 3488ac8,40f809 | 
					
						
							|  |  |  | 3488acc,c53023 | 
					
						
							|  |  |  | 3488ad0,8fbf0014 | 
					
						
							|  |  |  | 3488ad4,3e00008 | 
					
						
							|  |  |  | 3488ad8,27bd0018 | 
					
						
							|  |  |  | 3488adc,27bdffe8 | 
					
						
							|  |  |  | 3488ae0,afbf0014 | 
					
						
							|  |  |  | 3488ae4,801025 | 
					
						
							|  |  |  | 3488ae8,a02025 | 
					
						
							|  |  |  | 3488aec,a4450000 | 
					
						
							|  |  |  | 3488af0,c10229c | 
					
						
							|  |  |  | 3488af4,8c450004 | 
					
						
							|  |  |  | 3488af8,8fbf0014 | 
					
						
							|  |  |  | 3488afc,3e00008 | 
					
						
							|  |  |  | 3488b00,27bd0018 | 
					
						
							|  |  |  | 3488b04,27bdffe8 | 
					
						
							|  |  |  | 3488b08,afbf0014 | 
					
						
							|  |  |  | 3488b0c,afb00010 | 
					
						
							|  |  |  | 3488b10,3c028041 | 
					
						
							|  |  |  | 3488b14,2442c61c | 
					
						
							|  |  |  | 3488b18,24450040 | 
					
						
							|  |  |  | 3488b1c,94430000 | 
					
						
							|  |  |  | 3488b20,1064000b | 
					
						
							|  |  |  | 3488b24,408025 | 
					
						
							|  |  |  | 3488b28,54600006 | 
					
						
							|  |  |  | 3488b2c,24420008 | 
					
						
							|  |  |  | 3488b30,802825 | 
					
						
							|  |  |  | 3488b34,c1022b7 | 
					
						
							|  |  |  | 3488b38,402025 | 
					
						
							|  |  |  | 3488b3c,10000005 | 
					
						
							|  |  |  | 3488b40,2001025 | 
					
						
							|  |  |  | 3488b44,5445fff6 | 
					
						
							|  |  |  | 3488b48,94430000 | 
					
						
							|  |  |  | 3488b4c,8025 | 
					
						
							|  |  |  | 3488b50,2001025 | 
					
						
							|  |  |  | 3488b54,8fbf0014 | 
					
						
							|  |  |  | 3488b58,8fb00010 | 
					
						
							|  |  |  | 3488b5c,3e00008 | 
					
						
							|  |  |  | 3488b60,27bd0018 | 
					
						
							|  |  |  | 3488b64,3c03801c | 
					
						
							|  |  |  | 3488b68,346384a0 | 
					
						
							|  |  |  | 3488b6c,8c620000 | 
					
						
							|  |  |  | 3488b70,8c860004 | 
					
						
							|  |  |  | 3488b74,8c4502d0 | 
					
						
							|  |  |  | 3488b78,24a70008 | 
					
						
							|  |  |  | 3488b7c,ac4702d0 | 
					
						
							|  |  |  | 3488b80,3c02db06 | 
					
						
							|  |  |  | 3488b84,24420018 | 
					
						
							|  |  |  | 3488b88,aca20000 | 
					
						
							|  |  |  | 3488b8c,aca60004 | 
					
						
							|  |  |  | 3488b90,8c650000 | 
					
						
							|  |  |  | 3488b94,8c840004 | 
					
						
							|  |  |  | 3488b98,8ca302c0 | 
					
						
							|  |  |  | 3488b9c,24660008 | 
					
						
							|  |  |  | 3488ba0,aca602c0 | 
					
						
							|  |  |  | 3488ba4,ac620000 | 
					
						
							|  |  |  | 3488ba8,3e00008 | 
					
						
							|  |  |  | 3488bac,ac640004 | 
					
						
							|  |  |  | 3488bb0,27bdffe0 | 
					
						
							|  |  |  | 3488bb4,afbf0014 | 
					
						
							|  |  |  | 3488bb8,f7b40018 | 
					
						
							|  |  |  | 3488bbc,3c02800a | 
					
						
							|  |  |  | 3488bc0,3442a78c | 
					
						
							|  |  |  | 3488bc4,40f809 | 
					
						
							|  |  |  | 3488bc8,46006506 | 
					
						
							|  |  |  | 3488bcc,2442000c | 
					
						
							|  |  |  | 3488bd0,2025 | 
					
						
							|  |  |  | 3488bd4,1000000a | 
					
						
							|  |  |  | 3488bd8,2405000c | 
					
						
							|  |  |  | 3488bdc,c4600000 | 
					
						
							|  |  |  | 3488be0,46140002 | 
					
						
							|  |  |  | 3488be4,e4600000 | 
					
						
							|  |  |  | 3488be8,24630004 | 
					
						
							|  |  |  | 3488bec,5462fffc | 
					
						
							|  |  |  | 3488bf0,c4600000 | 
					
						
							|  |  |  | 3488bf4,24840004 | 
					
						
							|  |  |  | 3488bf8,10850003 | 
					
						
							|  |  |  | 3488bfc,24420010 | 
					
						
							|  |  |  | 3488c00,1000fff6 | 
					
						
							|  |  |  | 3488c04,2443fff4 | 
					
						
							|  |  |  | 3488c08,8fbf0014 | 
					
						
							|  |  |  | 3488c0c,d7b40018 | 
					
						
							|  |  |  | 3488c10,3e00008 | 
					
						
							|  |  |  | 3488c14,27bd0020 | 
					
						
							|  |  |  | 3488c18,27bdffd8 | 
					
						
							|  |  |  | 3488c1c,afbf0024 | 
					
						
							|  |  |  | 3488c20,afb30020 | 
					
						
							|  |  |  | 3488c24,afb2001c | 
					
						
							|  |  |  | 3488c28,afb10018 | 
					
						
							|  |  |  | 3488c2c,afb00014 | 
					
						
							|  |  |  | 3488c30,809825 | 
					
						
							|  |  |  | 3488c34,a09025 | 
					
						
							|  |  |  | 3488c38,c08025 | 
					
						
							|  |  |  | 3488c3c,3c118002 | 
					
						
							|  |  |  | 3488c40,26222438 | 
					
						
							|  |  |  | 3488c44,3025 | 
					
						
							|  |  |  | 3488c48,2002825 | 
					
						
							|  |  |  | 3488c4c,40f809 | 
					
						
							|  |  |  | 3488c50,2402025 | 
					
						
							|  |  |  | 3488c54,26312554 | 
					
						
							|  |  |  | 3488c58,3025 | 
					
						
							|  |  |  | 3488c5c,2002825 | 
					
						
							|  |  |  | 3488c60,220f809 | 
					
						
							|  |  |  | 3488c64,2402025 | 
					
						
							|  |  |  | 3488c68,2602825 | 
					
						
							|  |  |  | 3488c6c,3c028005 | 
					
						
							|  |  |  | 3488c70,244270c0 | 
					
						
							|  |  |  | 3488c74,40f809 | 
					
						
							|  |  |  | 3488c78,2002025 | 
					
						
							|  |  |  | 3488c7c,8fbf0024 | 
					
						
							|  |  |  | 3488c80,8fb30020 | 
					
						
							|  |  |  | 3488c84,8fb2001c | 
					
						
							|  |  |  | 3488c88,8fb10018 | 
					
						
							|  |  |  | 3488c8c,8fb00014 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3488c90,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3488c94,27bd0028 | 
					
						
							|  |  |  | 3488c98,44860000 | 
					
						
							|  |  |  | 3488c9c,24020063 | 
					
						
							|  |  |  | 3488ca0,54820005 | 
					
						
							|  |  |  | 3488ca4,84a20000 | 
					
						
							|  |  |  | 3488ca8,3c028041 | 
					
						
							|  |  |  | 3488cac,c442a228 | 
					
						
							|  |  |  | 3488cb0,3e00008 | 
					
						
							|  |  |  | 3488cb4,46020002 | 
					
						
							|  |  |  | 3488cb8,240300f1 | 
					
						
							|  |  |  | 3488cbc,54430008 | 
					
						
							|  |  |  | 3488cc0,24030015 | 
					
						
							|  |  |  | 3488cc4,24020046 | 
					
						
							|  |  |  | 3488cc8,1082000d | 
					
						
							|  |  |  | 3488ccc,2402002f | 
					
						
							|  |  |  | 3488cd0,1482000e | 
					
						
							|  |  |  | 3488cd4,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3488cd8,3e00008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3488cdc,c440a224 | 
					
						
							|  |  |  | 3488ce0,1443000a | 
					
						
							|  |  |  | 3488ce4,24020011 | 
					
						
							|  |  |  | 3488ce8,90a3001d | 
					
						
							|  |  |  | 3488cec,14620007 | 
					
						
							|  |  |  | 3488cf0,3c028041 | 
					
						
							|  |  |  | 3488cf4,c442a228 | 
					
						
							|  |  |  | 3488cf8,3e00008 | 
					
						
							|  |  |  | 3488cfc,46020002 | 
					
						
							|  |  |  | 3488d00,3c028041 | 
					
						
							|  |  |  | 3488d04,3e00008 | 
					
						
							|  |  |  | 3488d08,c440a224 | 
					
						
							|  |  |  | 3488d0c,3e00008 | 
					
						
							|  |  |  | 3488d14,27bdffd8 | 
					
						
							|  |  |  | 3488d18,afbf001c | 
					
						
							|  |  |  | 3488d1c,afb20018 | 
					
						
							|  |  |  | 3488d20,afb10014 | 
					
						
							|  |  |  | 3488d24,afb00010 | 
					
						
							|  |  |  | 3488d28,f7b40020 | 
					
						
							|  |  |  | 3488d2c,48202 | 
					
						
							|  |  |  | 3488d30,afa40028 | 
					
						
							|  |  |  | 3488d34,a08825 | 
					
						
							|  |  |  | 3488d38,c09025 | 
					
						
							|  |  |  | 3488d3c,4487a000 | 
					
						
							|  |  |  | 3488d40,108600 | 
					
						
							|  |  |  | 3488d44,108603 | 
					
						
							|  |  |  | 3488d48,c1022c1 | 
					
						
							|  |  |  | 3488d4c,42402 | 
					
						
							|  |  |  | 3488d50,c1022d9 | 
					
						
							|  |  |  | 3488d54,402025 | 
					
						
							|  |  |  | 3488d58,4406a000 | 
					
						
							|  |  |  | 3488d5c,2202825 | 
					
						
							|  |  |  | 3488d60,c102326 | 
					
						
							|  |  |  | 3488d64,2002025 | 
					
						
							|  |  |  | 3488d68,c1022ec | 
					
						
							|  |  |  | 3488d6c,46000306 | 
					
						
							|  |  |  | 3488d70,2604ffff | 
					
						
							|  |  |  | 3488d74,2403025 | 
					
						
							|  |  |  | 3488d78,2202825 | 
					
						
							|  |  |  | 3488d7c,42600 | 
					
						
							|  |  |  | 3488d80,c102306 | 
					
						
							|  |  |  | 3488d84,42603 | 
					
						
							|  |  |  | 3488d88,8fbf001c | 
					
						
							|  |  |  | 3488d8c,8fb20018 | 
					
						
							|  |  |  | 3488d90,8fb10014 | 
					
						
							|  |  |  | 3488d94,8fb00010 | 
					
						
							|  |  |  | 3488d98,d7b40020 | 
					
						
							|  |  |  | 3488d9c,3e00008 | 
					
						
							|  |  |  | 3488da0,27bd0028 | 
					
						
							|  |  |  | 3488da4,27bdffe0 | 
					
						
							|  |  |  | 3488da8,afbf001c | 
					
						
							|  |  |  | 3488dac,afb10018 | 
					
						
							|  |  |  | 3488db0,afb00014 | 
					
						
							|  |  |  | 3488db4,3c108041 | 
					
						
							|  |  |  | 3488db8,2610c61c | 
					
						
							|  |  |  | 3488dbc,26110040 | 
					
						
							|  |  |  | 3488dc0,a6000000 | 
					
						
							|  |  |  | 3488dc4,c102742 | 
					
						
							|  |  |  | 3488dc8,24041e70 | 
					
						
							|  |  |  | 3488dcc,ae020004 | 
					
						
							|  |  |  | 3488dd0,26100008 | 
					
						
							|  |  |  | 3488dd4,5611fffb | 
					
						
							|  |  |  | 3488dd8,a6000000 | 
					
						
							|  |  |  | 3488ddc,8fbf001c | 
					
						
							|  |  |  | 3488de0,8fb10018 | 
					
						
							|  |  |  | 3488de4,8fb00014 | 
					
						
							|  |  |  | 3488de8,3e00008 | 
					
						
							|  |  |  | 3488dec,27bd0020 | 
					
						
							|  |  |  | 3488df0,3c028041 | 
					
						
							|  |  |  | 3488df4,a440c61c | 
					
						
							|  |  |  | 3488df8,2442c61c | 
					
						
							|  |  |  | 3488dfc,a4400008 | 
					
						
							|  |  |  | 3488e00,a4400010 | 
					
						
							|  |  |  | 3488e04,a4400018 | 
					
						
							|  |  |  | 3488e08,a4400020 | 
					
						
							|  |  |  | 3488e0c,a4400028 | 
					
						
							|  |  |  | 3488e10,a4400030 | 
					
						
							|  |  |  | 3488e14,3e00008 | 
					
						
							|  |  |  | 3488e18,a4400038 | 
					
						
							|  |  |  | 3488e1c,27bdffe8 | 
					
						
							|  |  |  | 3488e20,afbf0014 | 
					
						
							|  |  |  | 3488e24,afb00010 | 
					
						
							|  |  |  | 3488e28,afa5001c | 
					
						
							|  |  |  | 3488e2c,10a0000e | 
					
						
							|  |  |  | 3488e30,afa60020 | 
					
						
							|  |  |  | 3488e34,808025 | 
					
						
							|  |  |  | 3488e38,93a40023 | 
					
						
							|  |  |  | 3488e3c,50800002 | 
					
						
							|  |  |  | 3488e40,97a40020 | 
					
						
							|  |  |  | 3488e44,3084ffff | 
					
						
							|  |  |  | 3488e48,c101eeb | 
					
						
							|  |  |  | 3488e50,c101edc | 
					
						
							|  |  |  | 3488e54,402025 | 
					
						
							|  |  |  | 3488e58,94430004 | 
					
						
							|  |  |  | 3488e5c,a6030000 | 
					
						
							|  |  |  | 3488e60,80420006 | 
					
						
							|  |  |  | 3488e64,a2020002 | 
					
						
							|  |  |  | 3488e68,8fbf0014 | 
					
						
							|  |  |  | 3488e6c,8fb00010 | 
					
						
							|  |  |  | 3488e70,3e00008 | 
					
						
							|  |  |  | 3488e74,27bd0018 | 
					
						
							|  |  |  | 3488e78,27bdffe0 | 
					
						
							|  |  |  | 3488e7c,afbf001c | 
					
						
							|  |  |  | 3488e80,afb00018 | 
					
						
							|  |  |  | 3488e84,808025 | 
					
						
							|  |  |  | 3488e88,30e700ff | 
					
						
							|  |  |  | 3488e8c,90c600a5 | 
					
						
							|  |  |  | 3488e90,c1019e1 | 
					
						
							|  |  |  | 3488e94,27a40010 | 
					
						
							|  |  |  | 3488e98,8fa50010 | 
					
						
							|  |  |  | 3488e9c,8fa60014 | 
					
						
							|  |  |  | 3488ea0,c102387 | 
					
						
							|  |  |  | 3488ea4,2002025 | 
					
						
							|  |  |  | 3488ea8,8fbf001c | 
					
						
							|  |  |  | 3488eac,8fb00018 | 
					
						
							|  |  |  | 3488eb0,3e00008 | 
					
						
							|  |  |  | 3488eb4,27bd0020 | 
					
						
							|  |  |  | 3488eb8,27bdffd8 | 
					
						
							|  |  |  | 3488ebc,afbf0024 | 
					
						
							|  |  |  | 3488ec0,afb10020 | 
					
						
							|  |  |  | 3488ec4,afb0001c | 
					
						
							|  |  |  | 3488ec8,808025 | 
					
						
							|  |  |  | 3488ecc,a08825 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3488ed0,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3488ed4,8c42a1cc | 
					
						
							|  |  |  | 3488ed8,afa20010 | 
					
						
							|  |  |  | 3488edc,3825 | 
					
						
							|  |  |  | 3488ee0,a03025 | 
					
						
							|  |  |  | 3488ee4,802825 | 
					
						
							|  |  |  | 3488ee8,c10239e | 
					
						
							|  |  |  | 3488eec,27a40010 | 
					
						
							|  |  |  | 3488ef0,3c028041 | 
					
						
							|  |  |  | 3488ef4,8c47a22c | 
					
						
							|  |  |  | 3488ef8,2203025 | 
					
						
							|  |  |  | 3488efc,2002825 | 
					
						
							|  |  |  | 3488f00,c102345 | 
					
						
							|  |  |  | 3488f04,8fa40010 | 
					
						
							|  |  |  | 3488f08,8fbf0024 | 
					
						
							|  |  |  | 3488f0c,8fb10020 | 
					
						
							|  |  |  | 3488f10,8fb0001c | 
					
						
							|  |  |  | 3488f14,3e00008 | 
					
						
							|  |  |  | 3488f18,27bd0028 | 
					
						
							|  |  |  | 3488f1c,27bdffd8 | 
					
						
							|  |  |  | 3488f20,afbf0024 | 
					
						
							|  |  |  | 3488f24,afb10020 | 
					
						
							|  |  |  | 3488f28,afb0001c | 
					
						
							|  |  |  | 3488f2c,808025 | 
					
						
							|  |  |  | 3488f30,9083001d | 
					
						
							|  |  |  | 3488f34,24020011 | 
					
						
							|  |  |  | 3488f38,10620007 | 
					
						
							|  |  |  | 3488f3c,a08825 | 
					
						
							|  |  |  | 3488f40,3c028001 | 
					
						
							|  |  |  | 3488f44,24423268 | 
					
						
							|  |  |  | 3488f48,40f809 | 
					
						
							|  |  |  | 3488f50,10000010 | 
					
						
							|  |  |  | 3488f54,8fbf0024 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3488f58,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3488f5c,8c42a1d0 | 
					
						
							|  |  |  | 3488f60,afa20010 | 
					
						
							|  |  |  | 3488f64,3825 | 
					
						
							|  |  |  | 3488f68,a03025 | 
					
						
							|  |  |  | 3488f6c,802825 | 
					
						
							|  |  |  | 3488f70,c10239e | 
					
						
							|  |  |  | 3488f74,27a40010 | 
					
						
							|  |  |  | 3488f78,3c028041 | 
					
						
							|  |  |  | 3488f7c,8c47a22c | 
					
						
							|  |  |  | 3488f80,2203025 | 
					
						
							|  |  |  | 3488f84,2002825 | 
					
						
							|  |  |  | 3488f88,c102345 | 
					
						
							|  |  |  | 3488f8c,8fa40010 | 
					
						
							|  |  |  | 3488f90,8fbf0024 | 
					
						
							|  |  |  | 3488f94,8fb10020 | 
					
						
							|  |  |  | 3488f98,8fb0001c | 
					
						
							|  |  |  | 3488f9c,3e00008 | 
					
						
							|  |  |  | 3488fa0,27bd0028 | 
					
						
							|  |  |  | 3488fa4,27bdffd8 | 
					
						
							|  |  |  | 3488fa8,afbf0024 | 
					
						
							|  |  |  | 3488fac,afb10020 | 
					
						
							|  |  |  | 3488fb0,afb0001c | 
					
						
							|  |  |  | 3488fb4,808025 | 
					
						
							|  |  |  | 3488fb8,a08825 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3488fbc,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3488fc0,8c42a1d4 | 
					
						
							|  |  |  | 3488fc4,afa20010 | 
					
						
							|  |  |  | 3488fc8,2407004f | 
					
						
							|  |  |  | 3488fcc,a03025 | 
					
						
							|  |  |  | 3488fd0,802825 | 
					
						
							|  |  |  | 3488fd4,c10239e | 
					
						
							|  |  |  | 3488fd8,27a40010 | 
					
						
							|  |  |  | 3488fdc,3c028041 | 
					
						
							|  |  |  | 3488fe0,8c47a230 | 
					
						
							|  |  |  | 3488fe4,2203025 | 
					
						
							|  |  |  | 3488fe8,2002825 | 
					
						
							|  |  |  | 3488fec,c102345 | 
					
						
							|  |  |  | 3488ff0,8fa40010 | 
					
						
							|  |  |  | 3488ff4,8fbf0024 | 
					
						
							|  |  |  | 3488ff8,8fb10020 | 
					
						
							|  |  |  | 3488ffc,8fb0001c | 
					
						
							|  |  |  | 3489000,3e00008 | 
					
						
							|  |  |  | 3489004,27bd0028 | 
					
						
							|  |  |  | 3489008,27bdffd8 | 
					
						
							|  |  |  | 348900c,afbf0024 | 
					
						
							|  |  |  | 3489010,afb10020 | 
					
						
							|  |  |  | 3489014,afb0001c | 
					
						
							|  |  |  | 3489018,808025 | 
					
						
							|  |  |  | 348901c,a08825 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3489020,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3489024,8c42a1d8 | 
					
						
							|  |  |  | 3489028,afa20010 | 
					
						
							|  |  |  | 348902c,3825 | 
					
						
							|  |  |  | 3489030,a03025 | 
					
						
							|  |  |  | 3489034,802825 | 
					
						
							|  |  |  | 3489038,c10239e | 
					
						
							|  |  |  | 348903c,27a40010 | 
					
						
							|  |  |  | 3489040,3c028041 | 
					
						
							|  |  |  | 3489044,8c47a234 | 
					
						
							|  |  |  | 3489048,2203025 | 
					
						
							|  |  |  | 348904c,2002825 | 
					
						
							|  |  |  | 3489050,c102345 | 
					
						
							|  |  |  | 3489054,8fa40010 | 
					
						
							|  |  |  | 3489058,8fbf0024 | 
					
						
							|  |  |  | 348905c,8fb10020 | 
					
						
							|  |  |  | 3489060,8fb0001c | 
					
						
							|  |  |  | 3489064,3e00008 | 
					
						
							|  |  |  | 3489068,27bd0028 | 
					
						
							|  |  |  | 348906c,27bdffd8 | 
					
						
							|  |  |  | 3489070,afbf0024 | 
					
						
							|  |  |  | 3489074,afb10020 | 
					
						
							|  |  |  | 3489078,afb0001c | 
					
						
							|  |  |  | 348907c,808025 | 
					
						
							|  |  |  | 3489080,a08825 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3489084,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3489088,8c42a1dc | 
					
						
							|  |  |  | 348908c,afa20010 | 
					
						
							|  |  |  | 3489090,2407000c | 
					
						
							|  |  |  | 3489094,a03025 | 
					
						
							|  |  |  | 3489098,802825 | 
					
						
							|  |  |  | 348909c,c10239e | 
					
						
							|  |  |  | 34890a0,27a40010 | 
					
						
							|  |  |  | 34890a4,3c028041 | 
					
						
							|  |  |  | 34890a8,8c47a238 | 
					
						
							|  |  |  | 34890ac,2203025 | 
					
						
							|  |  |  | 34890b0,2002825 | 
					
						
							|  |  |  | 34890b4,c102345 | 
					
						
							|  |  |  | 34890b8,8fa40010 | 
					
						
							|  |  |  | 34890bc,8fbf0024 | 
					
						
							|  |  |  | 34890c0,8fb10020 | 
					
						
							|  |  |  | 34890c4,8fb0001c | 
					
						
							|  |  |  | 34890c8,3e00008 | 
					
						
							|  |  |  | 34890cc,27bd0028 | 
					
						
							|  |  |  | 34890d0,27bdffd0 | 
					
						
							|  |  |  | 34890d4,afbf002c | 
					
						
							|  |  |  | 34890d8,afb10028 | 
					
						
							|  |  |  | 34890dc,afb00024 | 
					
						
							|  |  |  | 34890e0,808025 | 
					
						
							|  |  |  | 34890e4,afa00010 | 
					
						
							|  |  |  | 34890e8,afa00014 | 
					
						
							|  |  |  | 34890ec,9482001c | 
					
						
							|  |  |  | 34890f0,24030001 | 
					
						
							|  |  |  | 34890f4,14430008 | 
					
						
							|  |  |  | 34890f8,a08825 | 
					
						
							|  |  |  | 34890fc,24070015 | 
					
						
							|  |  |  | 3489100,90a600a5 | 
					
						
							|  |  |  | 3489104,802825 | 
					
						
							|  |  |  | 3489108,c1019e1 | 
					
						
							|  |  |  | 348910c,27a40010 | 
					
						
							|  |  |  | 3489110,10000012 | 
					
						
							|  |  |  | 3489114,afa00018 | 
					
						
							|  |  |  | 3489118,24030007 | 
					
						
							|  |  |  | 348911c,14430008 | 
					
						
							|  |  |  | 3489120,24030a0c | 
					
						
							|  |  |  | 3489124,24070058 | 
					
						
							|  |  |  | 3489128,90a600a5 | 
					
						
							|  |  |  | 348912c,802825 | 
					
						
							|  |  |  | 3489130,c1019e1 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3489134,27a40010 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3489138,10000008 | 
					
						
							|  |  |  | 348913c,afa00018 | 
					
						
							|  |  |  | 3489140,54430006 | 
					
						
							|  |  |  | 3489144,afa00018 | 
					
						
							|  |  |  | 3489148,3c050010 | 
					
						
							|  |  |  | 348914c,34a5010a | 
					
						
							|  |  |  | 3489150,c1019b9 | 
					
						
							|  |  |  | 3489154,27a40010 | 
					
						
							|  |  |  | 3489158,afa00018 | 
					
						
							|  |  |  | 348915c,8fa50010 | 
					
						
							|  |  |  | 3489160,8fa60014 | 
					
						
							|  |  |  | 3489164,c102387 | 
					
						
							|  |  |  | 3489168,27a40018 | 
					
						
							|  |  |  | 348916c,97a20018 | 
					
						
							|  |  |  | 3489170,10400008 | 
					
						
							|  |  |  | 3489174,2203025 | 
					
						
							|  |  |  | 3489178,3c028041 | 
					
						
							|  |  |  | 348917c,8c47a224 | 
					
						
							|  |  |  | 3489180,2002825 | 
					
						
							|  |  |  | 3489184,c102345 | 
					
						
							|  |  |  | 3489188,8fa40018 | 
					
						
							|  |  |  | 348918c,10000005 | 
					
						
							|  |  |  | 3489190,8fbf002c | 
					
						
							|  |  |  | 3489194,2002825 | 
					
						
							|  |  |  | 3489198,c102306 | 
					
						
							|  |  |  | 348919c,82040141 | 
					
						
							|  |  |  | 34891a0,8fbf002c | 
					
						
							|  |  |  | 34891a4,8fb10028 | 
					
						
							|  |  |  | 34891a8,8fb00024 | 
					
						
							|  |  |  | 34891ac,3e00008 | 
					
						
							|  |  |  | 34891b0,27bd0030 | 
					
						
							|  |  |  | 34891b4,27bdffd0 | 
					
						
							|  |  |  | 34891b8,afbf002c | 
					
						
							|  |  |  | 34891bc,afb10028 | 
					
						
							|  |  |  | 34891c0,afb00024 | 
					
						
							|  |  |  | 34891c4,808025 | 
					
						
							|  |  |  | 34891c8,afa00010 | 
					
						
							|  |  |  | 34891cc,afa00014 | 
					
						
							|  |  |  | 34891d0,9482001c | 
					
						
							|  |  |  | 34891d4,10400004 | 
					
						
							|  |  |  | 34891d8,a08825 | 
					
						
							|  |  |  | 34891dc,24030005 | 
					
						
							|  |  |  | 34891e0,54430007 | 
					
						
							|  |  |  | 34891e4,afa00018 | 
					
						
							|  |  |  | 34891e8,24070034 | 
					
						
							|  |  |  | 34891ec,922600a5 | 
					
						
							|  |  |  | 34891f0,2002825 | 
					
						
							|  |  |  | 34891f4,c1019e1 | 
					
						
							|  |  |  | 34891f8,27a40010 | 
					
						
							|  |  |  | 34891fc,afa00018 | 
					
						
							|  |  |  | 3489200,8fa50010 | 
					
						
							|  |  |  | 3489204,8fa60014 | 
					
						
							|  |  |  | 3489208,c102387 | 
					
						
							|  |  |  | 348920c,27a40018 | 
					
						
							|  |  |  | 3489210,97a20018 | 
					
						
							|  |  |  | 3489214,10400008 | 
					
						
							|  |  |  | 3489218,2203025 | 
					
						
							|  |  |  | 348921c,3c028041 | 
					
						
							|  |  |  | 3489220,8c47a224 | 
					
						
							|  |  |  | 3489224,2002825 | 
					
						
							|  |  |  | 3489228,c102345 | 
					
						
							|  |  |  | 348922c,8fa40018 | 
					
						
							|  |  |  | 3489230,10000005 | 
					
						
							|  |  |  | 3489234,8fbf002c | 
					
						
							|  |  |  | 3489238,2002825 | 
					
						
							|  |  |  | 348923c,c102306 | 
					
						
							|  |  |  | 3489240,82040147 | 
					
						
							|  |  |  | 3489244,8fbf002c | 
					
						
							|  |  |  | 3489248,8fb10028 | 
					
						
							|  |  |  | 348924c,8fb00024 | 
					
						
							|  |  |  | 3489250,3e00008 | 
					
						
							|  |  |  | 3489254,27bd0030 | 
					
						
							|  |  |  | 3489258,27bdffd8 | 
					
						
							|  |  |  | 348925c,afbf0024 | 
					
						
							|  |  |  | 3489260,afb10020 | 
					
						
							|  |  |  | 3489264,afb0001c | 
					
						
							|  |  |  | 3489268,808025 | 
					
						
							|  |  |  | 348926c,a08825 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3489270,3c028041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3489274,8c42a1cc | 
					
						
							|  |  |  | 3489278,afa20010 | 
					
						
							|  |  |  | 348927c,2407003e | 
					
						
							|  |  |  | 3489280,a03025 | 
					
						
							|  |  |  | 3489284,802825 | 
					
						
							|  |  |  | 3489288,c10239e | 
					
						
							|  |  |  | 348928c,27a40010 | 
					
						
							|  |  |  | 3489290,3c028041 | 
					
						
							|  |  |  | 3489294,8c47a224 | 
					
						
							|  |  |  | 3489298,2203025 | 
					
						
							|  |  |  | 348929c,2002825 | 
					
						
							|  |  |  | 34892a0,c102345 | 
					
						
							|  |  |  | 34892a4,8fa40010 | 
					
						
							|  |  |  | 34892a8,8fbf0024 | 
					
						
							|  |  |  | 34892ac,8fb10020 | 
					
						
							|  |  |  | 34892b0,8fb0001c | 
					
						
							|  |  |  | 34892b4,3e00008 | 
					
						
							|  |  |  | 34892b8,27bd0028 | 
					
						
							|  |  |  | 34892bc,801025 | 
					
						
							|  |  |  | 34892c0,14c00002 | 
					
						
							|  |  |  | 34892c4,a6001b | 
					
						
							|  |  |  | 34892c8,7000d | 
					
						
							|  |  |  | 34892cc,2810 | 
					
						
							|  |  |  | 34892d0,3812 | 
					
						
							|  |  |  | 34892d4,3c03aaaa | 
					
						
							|  |  |  | 34892d8,3463aaab | 
					
						
							|  |  |  | 34892dc,e30019 | 
					
						
							|  |  |  | 34892e0,1810 | 
					
						
							|  |  |  | 34892e4,31882 | 
					
						
							|  |  |  | 34892e8,32040 | 
					
						
							|  |  |  | 34892ec,831821 | 
					
						
							|  |  |  | 34892f0,31840 | 
					
						
							|  |  |  | 34892f4,e31823 | 
					
						
							|  |  |  | 34892f8,44850000 | 
					
						
							|  |  |  | 34892fc,4a10004 | 
					
						
							|  |  |  | 3489300,468000a1 | 
					
						
							|  |  |  | 3489304,3c048041 | 
					
						
							|  |  |  | 3489308,d480a248 | 
					
						
							|  |  |  | 348930c,46201080 | 
					
						
							|  |  |  | 3489310,462010a0 | 
					
						
							|  |  |  | 3489314,44860000 | 
					
						
							|  |  |  | 3489318,4c10004 | 
					
						
							|  |  |  | 348931c,46800021 | 
					
						
							|  |  |  | 3489320,3c048041 | 
					
						
							|  |  |  | 3489324,d484a248 | 
					
						
							|  |  |  | 3489328,46240000 | 
					
						
							|  |  |  | 348932c,46200020 | 
					
						
							|  |  |  | 3489330,46001083 | 
					
						
							|  |  |  | 3489334,3c048041 | 
					
						
							|  |  |  | 3489338,c484a23c | 
					
						
							|  |  |  | 348933c,46022101 | 
					
						
							|  |  |  | 3489340,24640001 | 
					
						
							|  |  |  | 3489344,3c068041 | 
					
						
							|  |  |  | 3489348,24c6a1e0 | 
					
						
							|  |  |  | 348934c,32840 | 
					
						
							|  |  |  | 3489350,a32821 | 
					
						
							|  |  |  | 3489354,c52821 | 
					
						
							|  |  |  | 3489358,90a50001 | 
					
						
							|  |  |  | 348935c,44850000 | 
					
						
							|  |  |  | 3489364,46800020 | 
					
						
							|  |  |  | 3489368,46040002 | 
					
						
							|  |  |  | 348936c,42840 | 
					
						
							|  |  |  | 3489370,a42821 | 
					
						
							|  |  |  | 3489374,c53021 | 
					
						
							|  |  |  | 3489378,90c50001 | 
					
						
							|  |  |  | 348937c,44853000 | 
					
						
							|  |  |  | 3489384,468031a0 | 
					
						
							|  |  |  | 3489388,46023182 | 
					
						
							|  |  |  | 348938c,46060000 | 
					
						
							|  |  |  | 3489390,3c058041 | 
					
						
							|  |  |  | 3489394,c4a6a240 | 
					
						
							|  |  |  | 3489398,4600303e | 
					
						
							|  |  |  | 34893a0,45030005 | 
					
						
							|  |  |  | 34893a4,46060001 | 
					
						
							|  |  |  | 34893a8,4600000d | 
					
						
							|  |  |  | 34893ac,44050000 | 
					
						
							|  |  |  | 34893b0,10000006 | 
					
						
							|  |  |  | 34893b4,30a700ff | 
					
						
							|  |  |  | 34893b8,4600000d | 
					
						
							|  |  |  | 34893bc,44050000 | 
					
						
							|  |  |  | 34893c0,3c068000 | 
					
						
							|  |  |  | 34893c4,a62825 | 
					
						
							|  |  |  | 34893c8,30a700ff | 
					
						
							|  |  |  | 34893cc,3c068041 | 
					
						
							|  |  |  | 34893d0,24c6a1e0 | 
					
						
							|  |  |  | 34893d4,32840 | 
					
						
							|  |  |  | 34893d8,a32821 | 
					
						
							|  |  |  | 34893dc,c52821 | 
					
						
							|  |  |  | 34893e0,90a50002 | 
					
						
							|  |  |  | 34893e4,44850000 | 
					
						
							|  |  |  | 34893ec,46800020 | 
					
						
							|  |  |  | 34893f0,46040002 | 
					
						
							|  |  |  | 34893f4,42840 | 
					
						
							|  |  |  | 34893f8,a42821 | 
					
						
							|  |  |  | 34893fc,c53021 | 
					
						
							|  |  |  | 3489400,90c50002 | 
					
						
							|  |  |  | 3489404,44853000 | 
					
						
							|  |  |  | 348940c,468031a0 | 
					
						
							|  |  |  | 3489410,46023182 | 
					
						
							|  |  |  | 3489414,46060000 | 
					
						
							|  |  |  | 3489418,3c058041 | 
					
						
							|  |  |  | 348941c,c4a6a240 | 
					
						
							|  |  |  | 3489420,4600303e | 
					
						
							|  |  |  | 3489428,45030005 | 
					
						
							|  |  |  | 348942c,46060001 | 
					
						
							|  |  |  | 3489430,4600000d | 
					
						
							|  |  |  | 3489434,44050000 | 
					
						
							|  |  |  | 3489438,10000006 | 
					
						
							|  |  |  | 348943c,30a600ff | 
					
						
							|  |  |  | 3489440,4600000d | 
					
						
							|  |  |  | 3489444,44050000 | 
					
						
							|  |  |  | 3489448,3c068000 | 
					
						
							|  |  |  | 348944c,a62825 | 
					
						
							|  |  |  | 3489450,30a600ff | 
					
						
							|  |  |  | 3489454,32840 | 
					
						
							|  |  |  | 3489458,a31821 | 
					
						
							|  |  |  | 348945c,3c088041 | 
					
						
							|  |  |  | 3489460,2508a1e0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3489464,681821 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3489468,90650000 | 
					
						
							|  |  |  | 348946c,44850000 | 
					
						
							|  |  |  | 3489474,46800020 | 
					
						
							|  |  |  | 3489478,46040002 | 
					
						
							|  |  |  | 348947c,41840 | 
					
						
							|  |  |  | 3489480,641821 | 
					
						
							|  |  |  | 3489484,681821 | 
					
						
							|  |  |  | 3489488,90630000 | 
					
						
							|  |  |  | 348948c,44832000 | 
					
						
							|  |  |  | 3489494,46802120 | 
					
						
							|  |  |  | 3489498,46022082 | 
					
						
							|  |  |  | 348949c,46020000 | 
					
						
							|  |  |  | 34894a0,3c038041 | 
					
						
							|  |  |  | 34894a4,c462a240 | 
					
						
							|  |  |  | 34894a8,4600103e | 
					
						
							|  |  |  | 34894b0,45030005 | 
					
						
							|  |  |  | 34894b4,46020001 | 
					
						
							|  |  |  | 34894b8,4600000d | 
					
						
							|  |  |  | 34894bc,44030000 | 
					
						
							|  |  |  | 34894c0,10000006 | 
					
						
							|  |  |  | 34894c4,a0430000 | 
					
						
							|  |  |  | 34894c8,4600000d | 
					
						
							|  |  |  | 34894cc,44030000 | 
					
						
							|  |  |  | 34894d0,3c048000 | 
					
						
							|  |  |  | 34894d4,641825 | 
					
						
							|  |  |  | 34894d8,a0430000 | 
					
						
							|  |  |  | 34894dc,a0470001 | 
					
						
							|  |  |  | 34894e0,3e00008 | 
					
						
							|  |  |  | 34894e4,a0460002 | 
					
						
							|  |  |  | 34894e8,3c028011 | 
					
						
							|  |  |  | 34894ec,3442a5d0 | 
					
						
							|  |  |  | 34894f0,24030140 | 
					
						
							|  |  |  | 34894f4,a4431424 | 
					
						
							|  |  |  | 34894f8,90440032 | 
					
						
							|  |  |  | 34894fc,41840 | 
					
						
							|  |  |  | 3489500,641821 | 
					
						
							|  |  |  | 3489504,31900 | 
					
						
							|  |  |  | 3489508,3e00008 | 
					
						
							|  |  |  | 348950c,a0430033 | 
					
						
							|  |  |  | 3489510,24a20002 | 
					
						
							|  |  |  | 3489514,24a50082 | 
					
						
							|  |  |  | 3489518,24065700 | 
					
						
							|  |  |  | 348951c,24070004 | 
					
						
							|  |  |  | 3489520,9443fffe | 
					
						
							|  |  |  | 3489524,50660008 | 
					
						
							|  |  |  | 3489528,24420004 | 
					
						
							|  |  |  | 348952c,50600006 | 
					
						
							|  |  |  | 3489530,24420004 | 
					
						
							|  |  |  | 3489534,94430000 | 
					
						
							|  |  |  | 3489538,2c630004 | 
					
						
							|  |  |  | 348953c,54600001 | 
					
						
							|  |  |  | 3489540,a4470000 | 
					
						
							|  |  |  | 3489544,24420004 | 
					
						
							|  |  |  | 3489548,5445fff6 | 
					
						
							|  |  |  | 348954c,9443fffe | 
					
						
							|  |  |  | 3489550,3e00008 | 
					
						
							|  |  |  | 3489558,27bdffe8 | 
					
						
							|  |  |  | 348955c,afbf0014 | 
					
						
							|  |  |  | 3489560,c102742 | 
					
						
							|  |  |  | 3489564,24040400 | 
					
						
							|  |  |  | 3489568,3c038041 | 
					
						
							|  |  |  | 348956c,ac62b5ac | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3489570,3c038041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3489574,ac62b5b0 | 
					
						
							|  |  |  | 3489578,8fbf0014 | 
					
						
							|  |  |  | 348957c,3e00008 | 
					
						
							|  |  |  | 3489580,27bd0018 | 
					
						
							|  |  |  | 3489584,80820000 | 
					
						
							|  |  |  | 3489588,10400026 | 
					
						
							|  |  |  | 348958c,24870001 | 
					
						
							|  |  |  | 3489590,3c038041 | 
					
						
							|  |  |  | 3489594,8c68b5ac | 
					
						
							|  |  |  | 3489598,25080400 | 
					
						
							|  |  |  | 348959c,3c038041 | 
					
						
							|  |  |  | 34895a0,8c63b5b0 | 
					
						
							|  |  |  | 34895a4,5825 | 
					
						
							|  |  |  | 34895a8,3c0aff00 | 
					
						
							|  |  |  | 34895ac,254a0fff | 
					
						
							|  |  |  | 34895b0,30c60fff | 
					
						
							|  |  |  | 34895b4,240df000 | 
					
						
							|  |  |  | 34895b8,3c098041 | 
					
						
							|  |  |  | 34895bc,2529a438 | 
					
						
							|  |  |  | 34895c0,240c0001 | 
					
						
							|  |  |  | 34895c4,68202b | 
					
						
							|  |  |  | 34895c8,54800005 | 
					
						
							|  |  |  | 34895cc,a0620000 | 
					
						
							|  |  |  | 34895d0,11600014 | 
					
						
							|  |  |  | 34895d4,3c028041 | 
					
						
							|  |  |  | 34895d8,3e00008 | 
					
						
							|  |  |  | 34895dc,ac43b5b0 | 
					
						
							|  |  |  | 34895e0,30a40fff | 
					
						
							|  |  |  | 34895e4,42300 | 
					
						
							|  |  |  | 34895e8,8c620000 | 
					
						
							|  |  |  | 34895ec,4a1024 | 
					
						
							|  |  |  | 34895f0,441025 | 
					
						
							|  |  |  | 34895f4,4d1024 | 
					
						
							|  |  |  | 34895f8,461025 | 
					
						
							|  |  |  | 34895fc,ac620000 | 
					
						
							|  |  |  | 3489600,24630004 | 
					
						
							|  |  |  | 3489604,95220004 | 
					
						
							|  |  |  | 3489608,a22821 | 
					
						
							|  |  |  | 348960c,24e70001 | 
					
						
							|  |  |  | 3489610,80e2ffff | 
					
						
							|  |  |  | 3489614,1440ffeb | 
					
						
							|  |  |  | 3489618,1805825 | 
					
						
							|  |  |  | 348961c,3c028041 | 
					
						
							|  |  |  | 3489620,ac43b5b0 | 
					
						
							|  |  |  | 3489624,3e00008 | 
					
						
							|  |  |  | 348962c,27bdffb8 | 
					
						
							|  |  |  | 3489630,afbf0044 | 
					
						
							|  |  |  | 3489634,afbe0040 | 
					
						
							|  |  |  | 3489638,afb7003c | 
					
						
							|  |  |  | 348963c,afb60038 | 
					
						
							|  |  |  | 3489640,afb50034 | 
					
						
							|  |  |  | 3489644,afb40030 | 
					
						
							|  |  |  | 3489648,afb3002c | 
					
						
							|  |  |  | 348964c,afb20028 | 
					
						
							|  |  |  | 3489650,afb10024 | 
					
						
							|  |  |  | 3489654,afb00020 | 
					
						
							|  |  |  | 3489658,80a825 | 
					
						
							|  |  |  | 348965c,b025 | 
					
						
							|  |  |  | 3489660,9025 | 
					
						
							|  |  |  | 3489664,3c138041 | 
					
						
							|  |  |  | 3489668,2673a438 | 
					
						
							|  |  |  | 348966c,3c178041 | 
					
						
							|  |  |  | 3489670,3c148041 | 
					
						
							|  |  |  | 3489674,3c1e38e3 | 
					
						
							|  |  |  | 3489678,24070012 | 
					
						
							|  |  |  | 348967c,2c03025 | 
					
						
							|  |  |  | 3489680,2602825 | 
					
						
							|  |  |  | 3489684,c101bdf | 
					
						
							|  |  |  | 3489688,2a02025 | 
					
						
							|  |  |  | 348968c,8ef0b5ac | 
					
						
							|  |  |  | 3489690,8e82b5b0 | 
					
						
							|  |  |  | 3489694,202102b | 
					
						
							|  |  |  | 3489698,50400026 | 
					
						
							|  |  |  | 348969c,26520001 | 
					
						
							|  |  |  | 34896a0,37d18e39 | 
					
						
							|  |  |  | 34896a4,82020000 | 
					
						
							|  |  |  | 34896a8,2002825 | 
					
						
							|  |  |  | 34896ac,2442ffe0 | 
					
						
							|  |  |  | 34896b0,510018 | 
					
						
							|  |  |  | 34896b4,1810 | 
					
						
							|  |  |  | 34896b8,31883 | 
					
						
							|  |  |  | 34896bc,227c3 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 34896c0,641823 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 34896c4,14720016 | 
					
						
							|  |  |  | 34896c8,26100004 | 
					
						
							|  |  |  | 34896cc,8ca70000 | 
					
						
							|  |  |  | 34896d0,73b02 | 
					
						
							|  |  |  | 34896d4,510018 | 
					
						
							|  |  |  | 34896d8,1810 | 
					
						
							|  |  |  | 34896dc,31883 | 
					
						
							|  |  |  | 34896e0,641823 | 
					
						
							|  |  |  | 34896e4,330c0 | 
					
						
							|  |  |  | 34896e8,c33021 | 
					
						
							|  |  |  | 34896ec,63040 | 
					
						
							|  |  |  | 34896f0,96630006 | 
					
						
							|  |  |  | 34896f4,afa30018 | 
					
						
							|  |  |  | 34896f8,96630004 | 
					
						
							|  |  |  | 34896fc,afa30014 | 
					
						
							|  |  |  | 3489700,8ca30000 | 
					
						
							|  |  |  | 3489704,30630fff | 
					
						
							|  |  |  | 3489708,afa30010 | 
					
						
							|  |  |  | 348970c,30e70fff | 
					
						
							|  |  |  | 3489710,463023 | 
					
						
							|  |  |  | 3489714,2602825 | 
					
						
							|  |  |  | 3489718,c101c47 | 
					
						
							|  |  |  | 348971c,2a02025 | 
					
						
							|  |  |  | 3489720,8e82b5b0 | 
					
						
							|  |  |  | 3489724,202102b | 
					
						
							|  |  |  | 3489728,5440ffdf | 
					
						
							|  |  |  | 348972c,82020000 | 
					
						
							|  |  |  | 3489730,26520001 | 
					
						
							|  |  |  | 3489734,24020006 | 
					
						
							|  |  |  | 3489738,1642ffcf | 
					
						
							|  |  |  | 348973c,26d60012 | 
					
						
							|  |  |  | 3489740,3c028041 | 
					
						
							|  |  |  | 3489744,8c43b5ac | 
					
						
							|  |  |  | 3489748,3c028041 | 
					
						
							|  |  |  | 348974c,ac43b5b0 | 
					
						
							|  |  |  | 3489750,8fbf0044 | 
					
						
							|  |  |  | 3489754,8fbe0040 | 
					
						
							|  |  |  | 3489758,8fb7003c | 
					
						
							|  |  |  | 348975c,8fb60038 | 
					
						
							|  |  |  | 3489760,8fb50034 | 
					
						
							|  |  |  | 3489764,8fb40030 | 
					
						
							|  |  |  | 3489768,8fb3002c | 
					
						
							|  |  |  | 348976c,8fb20028 | 
					
						
							|  |  |  | 3489770,8fb10024 | 
					
						
							|  |  |  | 3489774,8fb00020 | 
					
						
							|  |  |  | 3489778,3e00008 | 
					
						
							|  |  |  | 348977c,27bd0048 | 
					
						
							|  |  |  | 3489780,3c028041 | 
					
						
							|  |  |  | 3489784,24030001 | 
					
						
							|  |  |  | 3489788,ac43b5b8 | 
					
						
							|  |  |  | 348978c,3c038041 | 
					
						
							|  |  |  | 3489790,8c62b5bc | 
					
						
							|  |  |  | 3489794,2c440006 | 
					
						
							|  |  |  | 3489798,50800001 | 
					
						
							|  |  |  | 348979c,24020005 | 
					
						
							|  |  |  | 34897a0,3e00008 | 
					
						
							|  |  |  | 34897a4,ac62b5bc | 
					
						
							|  |  |  | 34897a8,27bdffb8 | 
					
						
							|  |  |  | 34897ac,afbf0044 | 
					
						
							|  |  |  | 34897b0,afbe0040 | 
					
						
							|  |  |  | 34897b4,afb6003c | 
					
						
							|  |  |  | 34897b8,afb50038 | 
					
						
							|  |  |  | 34897bc,afb40034 | 
					
						
							|  |  |  | 34897c0,afb30030 | 
					
						
							|  |  |  | 34897c4,afb2002c | 
					
						
							|  |  |  | 34897c8,afb10028 | 
					
						
							|  |  |  | 34897cc,afb00024 | 
					
						
							|  |  |  | 34897d0,3a0f025 | 
					
						
							|  |  |  | 34897d4,3c028041 | 
					
						
							|  |  |  | 34897d8,9442b5b4 | 
					
						
							|  |  |  | 34897dc,10400133 | 
					
						
							|  |  |  | 34897e0,3a0a825 | 
					
						
							|  |  |  | 34897e4,3c02801d | 
					
						
							|  |  |  | 34897e8,3442aa30 | 
					
						
							|  |  |  | 34897ec,8c42066c | 
					
						
							|  |  |  | 34897f0,3c033000 | 
					
						
							|  |  |  | 34897f4,24630483 | 
					
						
							|  |  |  | 34897f8,431024 | 
					
						
							|  |  |  | 34897fc,1440012b | 
					
						
							|  |  |  | 3489800,808025 | 
					
						
							|  |  |  | 3489804,3c02801c | 
					
						
							|  |  |  | 3489808,344284a0 | 
					
						
							|  |  |  | 348980c,8c430008 | 
					
						
							|  |  |  | 3489810,3c02800f | 
					
						
							|  |  |  | 3489814,8c4213ec | 
					
						
							|  |  |  | 3489818,54620125 | 
					
						
							|  |  |  | 348981c,2a0e825 | 
					
						
							|  |  |  | 3489820,3c028011 | 
					
						
							|  |  |  | 3489824,3442a5d0 | 
					
						
							|  |  |  | 3489828,8c47135c | 
					
						
							|  |  |  | 348982c,14e0011f | 
					
						
							|  |  |  | 3489830,3c02800e | 
					
						
							|  |  |  | 3489834,3442f1b0 | 
					
						
							|  |  |  | 3489838,8c420000 | 
					
						
							|  |  |  | 348983c,30420020 | 
					
						
							|  |  |  | 3489840,1440011a | 
					
						
							|  |  |  | 3489844,3c028041 | 
					
						
							|  |  |  | 3489848,8c43b5b8 | 
					
						
							|  |  |  | 348984c,24020001 | 
					
						
							|  |  |  | 3489850,1062000a | 
					
						
							|  |  |  | 3489854,3c02801c | 
					
						
							|  |  |  | 3489858,344284a0 | 
					
						
							|  |  |  | 348985c,3c030001 | 
					
						
							|  |  |  | 3489860,431021 | 
					
						
							|  |  |  | 3489864,94430934 | 
					
						
							|  |  |  | 3489868,24020006 | 
					
						
							|  |  |  | 348986c,54620110 | 
					
						
							|  |  |  | 3489870,2a0e825 | 
					
						
							|  |  |  | 3489874,10000009 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3489878,3c038041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348987c,344284a0 | 
					
						
							|  |  |  | 3489880,3c030001 | 
					
						
							|  |  |  | 3489884,431021 | 
					
						
							|  |  |  | 3489888,94430934 | 
					
						
							|  |  |  | 348988c,24020006 | 
					
						
							|  |  |  | 3489890,14620007 | 
					
						
							|  |  |  | 3489894,3c028041 | 
					
						
							|  |  |  | 3489898,3c038041 | 
					
						
							|  |  |  | 348989c,8c62b5bc | 
					
						
							|  |  |  | 34898a0,3042001f | 
					
						
							|  |  |  | 34898a4,ac62b5bc | 
					
						
							|  |  |  | 34898a8,10000022 | 
					
						
							|  |  |  | 34898ac,241300ff | 
					
						
							|  |  |  | 34898b0,8c42b5bc | 
					
						
							|  |  |  | 34898b4,2c430006 | 
					
						
							|  |  |  | 34898b8,1060000a | 
					
						
							|  |  |  | 34898bc,2c43006a | 
					
						
							|  |  |  | 34898c0,29a00 | 
					
						
							|  |  |  | 34898c4,2629823 | 
					
						
							|  |  |  | 34898c8,3c02cccc | 
					
						
							|  |  |  | 34898cc,3442cccd | 
					
						
							|  |  |  | 34898d0,2620019 | 
					
						
							|  |  |  | 34898d4,9810 | 
					
						
							|  |  |  | 34898d8,139882 | 
					
						
							|  |  |  | 34898dc,10000015 | 
					
						
							|  |  |  | 34898e0,327300ff | 
					
						
							|  |  |  | 34898e4,14600013 | 
					
						
							|  |  |  | 34898e8,241300ff | 
					
						
							|  |  |  | 34898ec,2c4300ba | 
					
						
							|  |  |  | 34898f0,1060000b | 
					
						
							|  |  |  | 34898f4,21a00 | 
					
						
							|  |  |  | 34898f8,621023 | 
					
						
							|  |  |  | 34898fc,24429769 | 
					
						
							|  |  |  | 3489900,3c03cccc | 
					
						
							|  |  |  | 3489904,3463cccd | 
					
						
							|  |  |  | 3489908,430019 | 
					
						
							|  |  |  | 348990c,1010 | 
					
						
							|  |  |  | 3489910,29982 | 
					
						
							|  |  |  | 3489914,139827 | 
					
						
							|  |  |  | 3489918,10000006 | 
					
						
							|  |  |  | 348991c,327300ff | 
					
						
							|  |  |  | 3489920,3c028041 | 
					
						
							|  |  |  | 3489924,ac40b5b8 | 
					
						
							|  |  |  | 3489928,3c028041 | 
					
						
							|  |  |  | 348992c,100000df | 
					
						
							|  |  |  | 3489930,ac40b5bc | 
					
						
							|  |  |  | 3489934,3c038041 | 
					
						
							|  |  |  | 3489938,8c62b5bc | 
					
						
							|  |  |  | 348993c,24420001 | 
					
						
							|  |  |  | 3489940,ac62b5bc | 
					
						
							|  |  |  | 3489944,3c028011 | 
					
						
							|  |  |  | 3489948,3442a5d0 | 
					
						
							|  |  |  | 348994c,8c4808c4 | 
					
						
							|  |  |  | 3489950,19000011 | 
					
						
							|  |  |  | 3489954,1001025 | 
					
						
							|  |  |  | 3489958,e05025 | 
					
						
							|  |  |  | 348995c,3c056666 | 
					
						
							|  |  |  | 3489960,24a56667 | 
					
						
							|  |  |  | 3489964,254a0001 | 
					
						
							|  |  |  | 3489968,401825 | 
					
						
							|  |  |  | 348996c,450018 | 
					
						
							|  |  |  | 3489970,2010 | 
					
						
							|  |  |  | 3489974,42083 | 
					
						
							|  |  |  | 3489978,217c3 | 
					
						
							|  |  |  | 348997c,2863000a | 
					
						
							|  |  |  | 3489980,1060fff8 | 
					
						
							|  |  |  | 3489984,821023 | 
					
						
							|  |  |  | 3489988,15400005 | 
					
						
							|  |  |  | 348998c,3c028041 | 
					
						
							|  |  |  | 3489990,10000002 | 
					
						
							|  |  |  | 3489994,240a0001 | 
					
						
							|  |  |  | 3489998,240a0001 | 
					
						
							|  |  |  | 348999c,3c028041 | 
					
						
							|  |  |  | 34899a0,9445b552 | 
					
						
							|  |  |  | 34899a4,18a00010 | 
					
						
							|  |  |  | 34899a8,a01025 | 
					
						
							|  |  |  | 34899ac,3c066666 | 
					
						
							|  |  |  | 34899b0,24c66667 | 
					
						
							|  |  |  | 34899b4,24e70001 | 
					
						
							|  |  |  | 34899b8,401825 | 
					
						
							|  |  |  | 34899bc,460018 | 
					
						
							|  |  |  | 34899c0,2010 | 
					
						
							|  |  |  | 34899c4,42083 | 
					
						
							|  |  |  | 34899c8,217c3 | 
					
						
							|  |  |  | 34899cc,2863000a | 
					
						
							|  |  |  | 34899d0,1060fff8 | 
					
						
							|  |  |  | 34899d4,821023 | 
					
						
							|  |  |  | 34899d8,54e00005 | 
					
						
							|  |  |  | 34899dc,1473821 | 
					
						
							|  |  |  | 34899e0,10000002 | 
					
						
							|  |  |  | 34899e4,24070001 | 
					
						
							|  |  |  | 34899e8,24070001 | 
					
						
							|  |  |  | 34899ec,1473821 | 
					
						
							|  |  |  | 34899f0,24f40001 | 
					
						
							|  |  |  | 34899f4,3c028041 | 
					
						
							|  |  |  | 34899f8,2442a438 | 
					
						
							|  |  |  | 34899fc,94430004 | 
					
						
							|  |  |  | 3489a00,740018 | 
					
						
							|  |  |  | 3489a04,2012 | 
					
						
							|  |  |  | 3489a08,3c038041 | 
					
						
							|  |  |  | 3489a0c,2463a418 | 
					
						
							|  |  |  | 3489a10,94660004 | 
					
						
							|  |  |  | 3489a14,862021 | 
					
						
							|  |  |  | 3489a18,497c2 | 
					
						
							|  |  |  | 3489a1c,2449021 | 
					
						
							|  |  |  | 3489a20,129043 | 
					
						
							|  |  |  | 3489a24,129023 | 
					
						
							|  |  |  | 3489a28,265200a0 | 
					
						
							|  |  |  | 3489a2c,94420006 | 
					
						
							|  |  |  | 3489a30,44820000 | 
					
						
							|  |  |  | 3489a38,46800021 | 
					
						
							|  |  |  | 3489a3c,3c028041 | 
					
						
							|  |  |  | 3489a40,d446a250 | 
					
						
							|  |  |  | 3489a44,46260002 | 
					
						
							|  |  |  | 3489a48,3c028041 | 
					
						
							|  |  |  | 3489a4c,d442a258 | 
					
						
							|  |  |  | 3489a50,46201001 | 
					
						
							|  |  |  | 3489a54,3c028041 | 
					
						
							|  |  |  | 3489a58,d444a260 | 
					
						
							|  |  |  | 3489a5c,46240000 | 
					
						
							|  |  |  | 3489a60,4620000d | 
					
						
							|  |  |  | 3489a64,44060000 | 
					
						
							|  |  |  | 3489a68,94620006 | 
					
						
							|  |  |  | 3489a6c,44820000 | 
					
						
							|  |  |  | 3489a74,46800021 | 
					
						
							|  |  |  | 3489a78,46260002 | 
					
						
							|  |  |  | 3489a7c,46201081 | 
					
						
							|  |  |  | 3489a80,3c028041 | 
					
						
							|  |  |  | 3489a84,d440a268 | 
					
						
							|  |  |  | 3489a88,46201080 | 
					
						
							|  |  |  | 3489a8c,46241080 | 
					
						
							|  |  |  | 3489a90,4620100d | 
					
						
							|  |  |  | 3489a94,44110000 | 
					
						
							|  |  |  | 3489a98,24e20009 | 
					
						
							|  |  |  | 3489a9c,210c2 | 
					
						
							|  |  |  | 3489aa0,210c0 | 
					
						
							|  |  |  | 3489aa4,3a2e823 | 
					
						
							|  |  |  | 3489aa8,27a40020 | 
					
						
							|  |  |  | 3489aac,941021 | 
					
						
							|  |  |  | 3489ab0,19400015 | 
					
						
							|  |  |  | 3489ab4,a0400000 | 
					
						
							|  |  |  | 3489ab8,2549ffff | 
					
						
							|  |  |  | 3489abc,894821 | 
					
						
							|  |  |  | 3489ac0,806025 | 
					
						
							|  |  |  | 3489ac4,3c0b6666 | 
					
						
							|  |  |  | 3489ac8,256b6667 | 
					
						
							|  |  |  | 3489acc,10b0018 | 
					
						
							|  |  |  | 3489ad0,1810 | 
					
						
							|  |  |  | 3489ad4,31883 | 
					
						
							|  |  |  | 3489ad8,817c3 | 
					
						
							|  |  |  | 3489adc,621823 | 
					
						
							|  |  |  | 3489ae0,31080 | 
					
						
							|  |  |  | 3489ae4,431021 | 
					
						
							|  |  |  | 3489ae8,21040 | 
					
						
							|  |  |  | 3489aec,1021023 | 
					
						
							|  |  |  | 3489af0,24420030 | 
					
						
							|  |  |  | 3489af4,a1220000 | 
					
						
							|  |  |  | 3489af8,604025 | 
					
						
							|  |  |  | 3489afc,1201025 | 
					
						
							|  |  |  | 3489b00,144cfff2 | 
					
						
							|  |  |  | 3489b04,2529ffff | 
					
						
							|  |  |  | 3489b08,8a1021 | 
					
						
							|  |  |  | 3489b0c,2403002f | 
					
						
							|  |  |  | 3489b10,a0430000 | 
					
						
							|  |  |  | 3489b14,147102a | 
					
						
							|  |  |  | 3489b18,10400012 | 
					
						
							|  |  |  | 3489b1c,873821 | 
					
						
							|  |  |  | 3489b20,8a5021 | 
					
						
							|  |  |  | 3489b24,3c086666 | 
					
						
							|  |  |  | 3489b28,25086667 | 
					
						
							|  |  |  | 3489b2c,a80018 | 
					
						
							|  |  |  | 3489b30,1810 | 
					
						
							|  |  |  | 3489b34,31883 | 
					
						
							|  |  |  | 3489b38,517c3 | 
					
						
							|  |  |  | 3489b3c,621823 | 
					
						
							|  |  |  | 3489b40,31080 | 
					
						
							|  |  |  | 3489b44,431021 | 
					
						
							|  |  |  | 3489b48,21040 | 
					
						
							|  |  |  | 3489b4c,a21023 | 
					
						
							|  |  |  | 3489b50,24420030 | 
					
						
							|  |  |  | 3489b54,a0e20000 | 
					
						
							|  |  |  | 3489b58,24e7ffff | 
					
						
							|  |  |  | 3489b5c,14eafff3 | 
					
						
							|  |  |  | 3489b60,602825 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3489b64,8e020008 | 
					
						
							|  |  |  | 3489b68,24430008 | 
					
						
							|  |  |  | 3489b6c,ae030008 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3489b70,3c03de00 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3489b74,ac430000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3489b78,3c038041 | 
					
						
							|  |  |  | 3489b7c,2463a488 | 
					
						
							|  |  |  | 3489b80,ac430004 | 
					
						
							|  |  |  | 3489b84,8e020008 | 
					
						
							|  |  |  | 3489b88,24430008 | 
					
						
							|  |  |  | 3489b8c,ae030008 | 
					
						
							|  |  |  | 3489b90,3c03e700 | 
					
						
							|  |  |  | 3489b94,ac430000 | 
					
						
							|  |  |  | 3489b98,ac400004 | 
					
						
							|  |  |  | 3489b9c,8e020008 | 
					
						
							|  |  |  | 3489ba0,24430008 | 
					
						
							|  |  |  | 3489ba4,ae030008 | 
					
						
							|  |  |  | 3489ba8,3c03fc11 | 
					
						
							|  |  |  | 3489bac,34639623 | 
					
						
							|  |  |  | 3489bb0,ac430000 | 
					
						
							|  |  |  | 3489bb4,3c03ff2f | 
					
						
							|  |  |  | 3489bb8,3463ffff | 
					
						
							|  |  |  | 3489bbc,ac430004 | 
					
						
							|  |  |  | 3489bc0,8e030008 | 
					
						
							|  |  |  | 3489bc4,24620008 | 
					
						
							|  |  |  | 3489bc8,ae020008 | 
					
						
							|  |  |  | 3489bcc,3c16fa00 | 
					
						
							|  |  |  | 3489bd0,ac760000 | 
					
						
							|  |  |  | 3489bd4,3c02dad3 | 
					
						
							|  |  |  | 3489bd8,24420b00 | 
					
						
							|  |  |  | 3489bdc,2621025 | 
					
						
							|  |  |  | 3489be0,ac620004 | 
					
						
							|  |  |  | 3489be4,c102561 | 
					
						
							|  |  |  | 3489be8,2402825 | 
					
						
							|  |  |  | 3489bec,3c028041 | 
					
						
							|  |  |  | 3489bf0,9442a43c | 
					
						
							|  |  |  | 3489bf4,540018 | 
					
						
							|  |  |  | 3489bf8,a012 | 
					
						
							|  |  |  | 3489bfc,292a021 | 
					
						
							|  |  |  | 3489c00,8e020008 | 
					
						
							|  |  |  | 3489c04,24430008 | 
					
						
							|  |  |  | 3489c08,ae030008 | 
					
						
							|  |  |  | 3489c0c,ac560000 | 
					
						
							|  |  |  | 3489c10,3c03f4ec | 
					
						
							|  |  |  | 3489c14,24633000 | 
					
						
							|  |  |  | 3489c18,2639825 | 
					
						
							|  |  |  | 3489c1c,ac530004 | 
					
						
							|  |  |  | 3489c20,3c028041 | 
					
						
							|  |  |  | 3489c24,8c46b5bc | 
					
						
							|  |  |  | 3489c28,63042 | 
					
						
							|  |  |  | 3489c2c,24070001 | 
					
						
							|  |  |  | 3489c30,30c6000f | 
					
						
							|  |  |  | 3489c34,3c128041 | 
					
						
							|  |  |  | 3489c38,2645a418 | 
					
						
							|  |  |  | 3489c3c,c101bdf | 
					
						
							|  |  |  | 3489c40,2002025 | 
					
						
							|  |  |  | 3489c44,2645a418 | 
					
						
							|  |  |  | 3489c48,94a20006 | 
					
						
							|  |  |  | 3489c4c,afa20018 | 
					
						
							|  |  |  | 3489c50,94a20004 | 
					
						
							|  |  |  | 3489c54,afa20014 | 
					
						
							|  |  |  | 3489c58,afb10010 | 
					
						
							|  |  |  | 3489c5c,2803825 | 
					
						
							|  |  |  | 3489c60,3025 | 
					
						
							|  |  |  | 3489c64,c101c47 | 
					
						
							|  |  |  | 3489c68,2002025 | 
					
						
							|  |  |  | 3489c6c,c10258b | 
					
						
							|  |  |  | 3489c70,2002025 | 
					
						
							|  |  |  | 3489c74,8e020008 | 
					
						
							|  |  |  | 3489c78,24430008 | 
					
						
							|  |  |  | 3489c7c,ae030008 | 
					
						
							|  |  |  | 3489c80,3c03e900 | 
					
						
							|  |  |  | 3489c84,ac430000 | 
					
						
							|  |  |  | 3489c88,ac400004 | 
					
						
							|  |  |  | 3489c8c,8e020008 | 
					
						
							|  |  |  | 3489c90,24430008 | 
					
						
							|  |  |  | 3489c94,ae030008 | 
					
						
							|  |  |  | 3489c98,3c03df00 | 
					
						
							|  |  |  | 3489c9c,ac430000 | 
					
						
							|  |  |  | 3489ca0,ac400004 | 
					
						
							|  |  |  | 3489ca4,10000002 | 
					
						
							|  |  |  | 3489ca8,2a0e825 | 
					
						
							|  |  |  | 3489cac,2a0e825 | 
					
						
							|  |  |  | 3489cb0,3c0e825 | 
					
						
							|  |  |  | 3489cb4,8fbf0044 | 
					
						
							|  |  |  | 3489cb8,8fbe0040 | 
					
						
							|  |  |  | 3489cbc,8fb6003c | 
					
						
							|  |  |  | 3489cc0,8fb50038 | 
					
						
							|  |  |  | 3489cc4,8fb40034 | 
					
						
							|  |  |  | 3489cc8,8fb30030 | 
					
						
							|  |  |  | 3489ccc,8fb2002c | 
					
						
							|  |  |  | 3489cd0,8fb10028 | 
					
						
							|  |  |  | 3489cd4,8fb00024 | 
					
						
							|  |  |  | 3489cd8,3e00008 | 
					
						
							|  |  |  | 3489cdc,27bd0048 | 
					
						
							|  |  |  | 3489ce0,3c028040 | 
					
						
							|  |  |  | 3489ce4,a040306c | 
					
						
							|  |  |  | 3489ce8,3c028040 | 
					
						
							|  |  |  | 3489cec,3e00008 | 
					
						
							|  |  |  | 3489cf0,ac403070 | 
					
						
							|  |  |  | 3489cf4,3c038041 | 
					
						
							|  |  |  | 3489cf8,3c028050 | 
					
						
							|  |  |  | 3489cfc,24420000 | 
					
						
							|  |  |  | 3489d00,3e00008 | 
					
						
							|  |  |  | 3489d04,ac62b5c0 | 
					
						
							|  |  |  | 3489d08,3082000f | 
					
						
							|  |  |  | 3489d0c,10400009 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 3489d10,3c038041 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 3489d14,417c3 | 
					
						
							|  |  |  | 3489d18,21702 | 
					
						
							|  |  |  | 3489d1c,821821 | 
					
						
							|  |  |  | 3489d20,3063000f | 
					
						
							|  |  |  | 3489d24,431023 | 
					
						
							|  |  |  | 3489d28,24420010 | 
					
						
							|  |  |  | 3489d2c,822021 | 
					
						
							|  |  |  | 3489d30,3c038041 | 
					
						
							|  |  |  | 3489d34,8c62b5c0 | 
					
						
							|  |  |  | 3489d38,442021 | 
					
						
							|  |  |  | 3489d3c,3e00008 | 
					
						
							|  |  |  | 3489d40,ac64b5c0 | 
					
						
							|  |  |  | 3489d44,27bdffe8 | 
					
						
							|  |  |  | 3489d48,afbf0014 | 
					
						
							|  |  |  | 3489d4c,afb00010 | 
					
						
							|  |  |  | 3489d50,808025 | 
					
						
							|  |  |  | 3489d54,c102742 | 
					
						
							|  |  |  | 3489d58,8c840008 | 
					
						
							|  |  |  | 3489d5c,402025 | 
					
						
							|  |  |  | 3489d60,ae020000 | 
					
						
							|  |  |  | 3489d64,8e060008 | 
					
						
							|  |  |  | 3489d68,3c028000 | 
					
						
							|  |  |  | 3489d6c,24420df0 | 
					
						
							|  |  |  | 3489d70,40f809 | 
					
						
							|  |  |  | 3489d74,8e050004 | 
					
						
							|  |  |  | 3489d78,8fbf0014 | 
					
						
							|  |  |  | 3489d7c,8fb00010 | 
					
						
							|  |  |  | 3489d80,3e00008 | 
					
						
							|  |  |  | 3489d84,27bd0018 | 
					
						
							|  |  |  | 3489d88,3c02800f | 
					
						
							|  |  |  | 3489d8c,a0401640 | 
					
						
							|  |  |  | 3489d90,3c028041 | 
					
						
							|  |  |  | 3489d94,a040b5c4 | 
					
						
							|  |  |  | 3489d98,3c028011 | 
					
						
							|  |  |  | 3489d9c,3442a5d0 | 
					
						
							|  |  |  | 3489da0,8c420004 | 
					
						
							|  |  |  | 3489da4,14400086 | 
					
						
							|  |  |  | 3489da8,3c028011 | 
					
						
							|  |  |  | 3489dac,3442a5d0 | 
					
						
							|  |  |  | 3489db0,8c421360 | 
					
						
							|  |  |  | 3489db4,2c420004 | 
					
						
							|  |  |  | 3489db8,10400081 | 
					
						
							|  |  |  | 3489dbc,3c028011 | 
					
						
							|  |  |  | 3489dc0,3442a5d0 | 
					
						
							|  |  |  | 3489dc4,8c420000 | 
					
						
							|  |  |  | 3489dc8,240301fd | 
					
						
							|  |  |  | 3489dcc,14430005 | 
					
						
							|  |  |  | 3489dd0,3c038011 | 
					
						
							|  |  |  | 3489dd4,3c02800f | 
					
						
							|  |  |  | 3489dd8,24030001 | 
					
						
							|  |  |  | 3489ddc,3e00008 | 
					
						
							|  |  |  | 3489de0,a0431640 | 
					
						
							|  |  |  | 3489de4,3463a5d0 | 
					
						
							|  |  |  | 3489de8,94630ed6 | 
					
						
							|  |  |  | 3489dec,30630100 | 
					
						
							|  |  |  | 3489df0,1460000a | 
					
						
							|  |  |  | 3489df4,3c038011 | 
					
						
							|  |  |  | 3489df8,24030157 | 
					
						
							|  |  |  | 3489dfc,10430003 | 
					
						
							|  |  |  | 3489e00,240301f9 | 
					
						
							|  |  |  | 3489e04,14430005 | 
					
						
							|  |  |  | 3489e08,3c038011 | 
					
						
							|  |  |  | 3489e0c,3c02800f | 
					
						
							|  |  |  | 3489e10,24030002 | 
					
						
							|  |  |  | 3489e14,3e00008 | 
					
						
							|  |  |  | 3489e18,a0431640 | 
					
						
							|  |  |  | 3489e1c,3463a5d0 | 
					
						
							|  |  |  | 3489e20,94630edc | 
					
						
							|  |  |  | 3489e24,30640400 | 
					
						
							|  |  |  | 3489e28,54800016 | 
					
						
							|  |  |  | 3489e2c,3c028011 | 
					
						
							|  |  |  | 3489e30,240404da | 
					
						
							|  |  |  | 3489e34,10440005 | 
					
						
							|  |  |  | 3489e38,2404ffbf | 
					
						
							|  |  |  | 3489e3c,441024 | 
					
						
							|  |  |  | 3489e40,2404019d | 
					
						
							|  |  |  | 3489e44,14440005 | 
					
						
							|  |  |  | 3489e48,3c02801c | 
					
						
							|  |  |  | 3489e4c,3c02800f | 
					
						
							|  |  |  | 3489e50,24030003 | 
					
						
							|  |  |  | 3489e54,3e00008 | 
					
						
							|  |  |  | 3489e58,a0431640 | 
					
						
							|  |  |  | 3489e5c,344284a0 | 
					
						
							|  |  |  | 3489e60,944200a4 | 
					
						
							|  |  |  | 3489e64,2442ffa8 | 
					
						
							|  |  |  | 3489e68,2c420002 | 
					
						
							|  |  |  | 3489e6c,10400005 | 
					
						
							|  |  |  | 3489e70,3c028011 | 
					
						
							|  |  |  | 3489e74,3c02800f | 
					
						
							|  |  |  | 3489e78,24030003 | 
					
						
							|  |  |  | 3489e7c,3e00008 | 
					
						
							|  |  |  | 3489e80,a0431640 | 
					
						
							|  |  |  | 3489e84,3442a5d0 | 
					
						
							|  |  |  | 3489e88,8c4200a4 | 
					
						
							|  |  |  | 3489e8c,30420007 | 
					
						
							|  |  |  | 3489e90,24040007 | 
					
						
							|  |  |  | 3489e94,5444001f | 
					
						
							|  |  |  | 3489e98,30630200 | 
					
						
							|  |  |  | 3489e9c,3c028011 | 
					
						
							|  |  |  | 3489ea0,3442a5d0 | 
					
						
							|  |  |  | 3489ea4,8c42037c | 
					
						
							|  |  |  | 3489ea8,30420002 | 
					
						
							|  |  |  | 3489eac,54400019 | 
					
						
							|  |  |  | 3489eb0,30630200 | 
					
						
							|  |  |  | 3489eb4,3c02801c | 
					
						
							|  |  |  | 3489eb8,344284a0 | 
					
						
							|  |  |  | 3489ebc,944200a4 | 
					
						
							|  |  |  | 3489ec0,2442ffae | 
					
						
							|  |  |  | 3489ec4,2c420002 | 
					
						
							|  |  |  | 3489ec8,50400012 | 
					
						
							|  |  |  | 3489ecc,30630200 | 
					
						
							|  |  |  | 3489ed0,3c028041 | 
					
						
							|  |  |  | 3489ed4,24040002 | 
					
						
							|  |  |  | 3489ed8,a044b5c4 | 
					
						
							|  |  |  | 3489edc,3c028011 | 
					
						
							|  |  |  | 3489ee0,3442a5d0 | 
					
						
							|  |  |  | 3489ee4,8c420000 | 
					
						
							|  |  |  | 3489ee8,24040191 | 
					
						
							|  |  |  | 3489eec,10440008 | 
					
						
							|  |  |  | 3489ef0,24040205 | 
					
						
							|  |  |  | 3489ef4,10440006 | 
					
						
							|  |  |  | 3489ef8,240400db | 
					
						
							|  |  |  | 3489efc,10440004 | 
					
						
							|  |  |  | 3489f00,3c02800f | 
					
						
							|  |  |  | 3489f04,24030005 | 
					
						
							|  |  |  | 3489f08,3e00008 | 
					
						
							|  |  |  | 3489f0c,a0431640 | 
					
						
							|  |  |  | 3489f10,30630200 | 
					
						
							|  |  |  | 3489f14,1460002a | 
					
						
							|  |  |  | 3489f18,3c02801c | 
					
						
							|  |  |  | 3489f1c,344284a0 | 
					
						
							|  |  |  | 3489f20,3c030001 | 
					
						
							|  |  |  | 3489f24,431021 | 
					
						
							|  |  |  | 3489f28,84431e1a | 
					
						
							|  |  |  | 3489f2c,240204d6 | 
					
						
							|  |  |  | 3489f30,14620005 | 
					
						
							|  |  |  | 3489f34,3c02801c | 
					
						
							|  |  |  | 3489f38,3c02800f | 
					
						
							|  |  |  | 3489f3c,24030002 | 
					
						
							|  |  |  | 3489f40,3e00008 | 
					
						
							|  |  |  | 3489f44,a0431640 | 
					
						
							|  |  |  | 3489f48,344284a0 | 
					
						
							|  |  |  | 3489f4c,944200a4 | 
					
						
							|  |  |  | 3489f50,2c430054 | 
					
						
							|  |  |  | 3489f54,50600006 | 
					
						
							|  |  |  | 3489f58,2442ffa0 | 
					
						
							|  |  |  | 3489f5c,2c420052 | 
					
						
							|  |  |  | 3489f60,14400017 | 
					
						
							|  |  |  | 3489f64,3c028041 | 
					
						
							|  |  |  | 3489f68,10000006 | 
					
						
							|  |  |  | 3489f6c,9042b5c4 | 
					
						
							|  |  |  | 3489f70,3042ffff | 
					
						
							|  |  |  | 3489f74,2c420002 | 
					
						
							|  |  |  | 3489f78,10400011 | 
					
						
							|  |  |  | 3489f7c,3c028041 | 
					
						
							|  |  |  | 3489f80,9042b5c4 | 
					
						
							|  |  |  | 3489f84,14400005 | 
					
						
							|  |  |  | 3489f88,3c028011 | 
					
						
							|  |  |  | 3489f8c,3c028041 | 
					
						
							|  |  |  | 3489f90,24030001 | 
					
						
							|  |  |  | 3489f94,a043b5c4 | 
					
						
							|  |  |  | 3489f98,3c028011 | 
					
						
							|  |  |  | 3489f9c,3442a5d0 | 
					
						
							|  |  |  | 3489fa0,8c420000 | 
					
						
							|  |  |  | 3489fa4,240300db | 
					
						
							|  |  |  | 3489fa8,10430005 | 
					
						
							|  |  |  | 3489fac,24030195 | 
					
						
							|  |  |  | 3489fb0,10430003 | 
					
						
							|  |  |  | 3489fb4,3c02800f | 
					
						
							|  |  |  | 3489fb8,24030002 | 
					
						
							|  |  |  | 3489fbc,a0431640 | 
					
						
							|  |  |  | 3489fc0,3e00008 | 
					
						
							|  |  |  | 3489fc8,33c2 | 
					
						
							|  |  |  | 3489fcc,664399c4 | 
					
						
							|  |  |  | 3489fd0,cc45ffc6 | 
					
						
							|  |  |  | 3489fd4,ff47ffc8 | 
					
						
							|  |  |  | 3489fd8,ff49e0ca | 
					
						
							|  |  |  | 3489fdc,c24ba3cc | 
					
						
							|  |  |  | 3489fe0,854d660d | 
					
						
							|  |  |  | 3489fe4,440f2200 | 
					
						
							|  |  |  | 3489fe8,85d1a352 | 
					
						
							|  |  |  | 3489fec,c2d3e045 | 
					
						
							|  |  |  | 3489ff0,1010101 | 
					
						
							|  |  |  | 3489ff4,1010101 | 
					
						
							|  |  |  | 3489ff8,1010101 | 
					
						
							|  |  |  | 3489ffc,1010101 | 
					
						
							|  |  |  | 348a000,1010101 | 
					
						
							|  |  |  | 348a01c,1010000 | 
					
						
							|  |  |  | 348a024,1010101 | 
					
						
							|  |  |  | 348a028,1000101 | 
					
						
							|  |  |  | 348a02c,10101 | 
					
						
							|  |  |  | 348a030,10000 | 
					
						
							|  |  |  | 348a034,2b242525 | 
					
						
							|  |  |  | 348a038,26262626 | 
					
						
							|  |  |  | 348a03c,27272727 | 
					
						
							|  |  |  | 348a040,27272727 | 
					
						
							|  |  |  | 348a044,500080d | 
					
						
							|  |  |  | 348a048,1051508 | 
					
						
							|  |  |  | 348a04c,d01052a | 
					
						
							|  |  |  | 348a050,80d0127 | 
					
						
							|  |  |  | 348a054,f080b01 | 
					
						
							|  |  |  | 348a058,4d510b02 | 
					
						
							|  |  |  | 348a060,97ff6350 | 
					
						
							|  |  |  | 348a064,45ff5028 | 
					
						
							|  |  |  | 348a068,57456397 | 
					
						
							|  |  |  | 348a06c,ff5e45ff | 
					
						
							|  |  |  | 348a070,9f006545 | 
					
						
							|  |  |  | 348a074,ff63ff6c | 
					
						
							|  |  |  | 348a078,45fff063 | 
					
						
							|  |  |  | 348a07c,7345ffff | 
					
						
							|  |  |  | 348a080,ff503aff | 
					
						
							|  |  |  | 348a084,ffff573a | 
					
						
							|  |  |  | 348a088,ffffff5e | 
					
						
							|  |  |  | 348a08c,3affffff | 
					
						
							|  |  |  | 348a090,653affff | 
					
						
							|  |  |  | 348a094,ff6c3aff | 
					
						
							|  |  |  | 348a098,ffff733a | 
					
						
							|  |  |  | 348a09c,5a0c00 | 
					
						
							|  |  |  | 348a0a0,720c0096 | 
					
						
							|  |  |  | 348a0a4,c009618 | 
					
						
							|  |  |  | 348a0a8,1652a00 | 
					
						
							|  |  |  | 348a0ac,4e2a005a | 
					
						
							|  |  |  | 348a0b0,2a000000 | 
					
						
							|  |  |  | 348a0b4,c004e00 | 
					
						
							|  |  |  | 348a0b8,c015a00 | 
					
						
							|  |  |  | 348a0bc,c026600 | 
					
						
							|  |  |  | 348a0c0,c037200 | 
					
						
							|  |  |  | 348a0c4,c047e00 | 
					
						
							|  |  |  | 348a0c8,c058a00 | 
					
						
							|  |  |  | 348a0cc,c064e0c | 
					
						
							|  |  |  | 348a0d0,75a0c | 
					
						
							|  |  |  | 348a0d4,c09660c | 
					
						
							|  |  |  | 348a0d8,a720c | 
					
						
							|  |  |  | 348a0dc,c0c7e0c | 
					
						
							|  |  |  | 348a0e0,c0d8a0c | 
					
						
							|  |  |  | 348a0e4,c0e4e18 | 
					
						
							|  |  |  | 348a0e8,c0f5a18 | 
					
						
							|  |  |  | 348a0ec,c106618 | 
					
						
							|  |  |  | 348a0f0,c117218 | 
					
						
							|  |  |  | 348a0f4,c127e18 | 
					
						
							|  |  |  | 348a0f8,c138a18 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348a0fc,ffff | 
					
						
							|  |  |  | 348a100,ffff | 
					
						
							|  |  |  | 348a104,ffff | 
					
						
							|  |  |  | 348a108,ffff | 
					
						
							|  |  |  | 348a10c,ffff | 
					
						
							|  |  |  | 348a110,ffff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348a114,ffff | 
					
						
							|  |  |  | 348a118,ffff | 
					
						
							|  |  |  | 348a11c,ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348a120,ffff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348a124,ffff | 
					
						
							|  |  |  | 348a128,ffff | 
					
						
							|  |  |  | 348a12c,ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348a130,ffff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348a134,c3b7e2a | 
					
						
							|  |  |  | 348a138,c3c8a2a | 
					
						
							|  |  |  | 348a13c,c3d962a | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348a140,ffff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348a144,c3e7e36 | 
					
						
							|  |  |  | 348a148,b3f8b37 | 
					
						
							|  |  |  | 348a14c,b409737 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348a150,ffff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348a154,c417e42 | 
					
						
							|  |  |  | 348a158,c428a42 | 
					
						
							|  |  |  | 348a15c,c439642 | 
					
						
							|  |  |  | 348a160,ffff | 
					
						
							|  |  |  | 348a164,c447e4f | 
					
						
							|  |  |  | 348a168,c458a4f | 
					
						
							|  |  |  | 348a16c,c46964f | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348a170,ffff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348a174,c149600 | 
					
						
							|  |  |  | 348a178,ffff | 
					
						
							|  |  |  | 348a17c,2c061b31 | 
					
						
							|  |  |  | 348a180,2c072931 | 
					
						
							|  |  |  | 348a184,2c083731 | 
					
						
							|  |  |  | 348a188,2a096f51 | 
					
						
							|  |  |  | 348a18c,2c0a722a | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348a190,ffff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348a194,2c00370a | 
					
						
							|  |  |  | 348a198,2c01371a | 
					
						
							|  |  |  | 348a19c,2c022922 | 
					
						
							|  |  |  | 348a1a0,2c031b1a | 
					
						
							|  |  |  | 348a1a4,2c041b0a | 
					
						
							|  |  |  | 348a1a8,2c052902 | 
					
						
							|  |  |  | 348a1ac,ffff | 
					
						
							|  |  |  | 348a1b0,ffff | 
					
						
							|  |  |  | 348a1b4,8040a458 | 
					
						
							|  |  |  | 348a1b8,8040a448 | 
					
						
							|  |  |  | 348a1bc,8040a3d8 | 
					
						
							|  |  |  | 348a1c0,c8ff6482 | 
					
						
							|  |  |  | 348a1c4,82ffff64 | 
					
						
							|  |  |  | 348a1c8,64ff5aff | 
					
						
							|  |  |  | 348a1cc,bd1400 | 
					
						
							|  |  |  | 348a1d0,aa0200 | 
					
						
							|  |  |  | 348a1d4,bd1300 | 
					
						
							|  |  |  | 348a1d8,15c6300 | 
					
						
							|  |  |  | 348a1dc,de2f00 | 
					
						
							|  |  |  | 348a1e0,e01010e0 | 
					
						
							|  |  |  | 348a1e4,e01010e0 | 
					
						
							|  |  |  | 348a1e8,1010e0e0 | 
					
						
							|  |  |  | 348a1ec,1010e0e0 | 
					
						
							|  |  |  | 348a1f0,10e0e010 | 
					
						
							|  |  |  | 348a1f4,10000000 | 
					
						
							|  |  |  | 348a1f8,4d510000 | 
					
						
							|  |  |  | 348a1fc,4e6f726d | 
					
						
							|  |  |  | 348a200,616c0000 | 
					
						
							|  |  |  | 348a204,bdcccccd | 
					
						
							|  |  |  | 348a208,3dcccccd | 
					
						
							|  |  |  | 348a20c,43510000 | 
					
						
							|  |  |  | 348a210,41100000 | 
					
						
							|  |  |  | 348a214,4f000000 | 
					
						
							|  |  |  | 348a218,42080000 | 
					
						
							|  |  |  | 348a21c,c20c0000 | 
					
						
							|  |  |  | 348a220,420c0000 | 
					
						
							|  |  |  | 348a224,3f800000 | 
					
						
							|  |  |  | 348a228,3f000000 | 
					
						
							|  |  |  | 348a22c,41c80000 | 
					
						
							|  |  |  | 348a230,3fa00000 | 
					
						
							|  |  |  | 348a234,40000000 | 
					
						
							|  |  |  | 348a238,40200000 | 
					
						
							|  |  |  | 348a23c,3f800000 | 
					
						
							|  |  |  | 348a240,4f000000 | 
					
						
							|  |  |  | 348a248,41f00000 | 
					
						
							|  |  |  | 348a250,3ff80000 | 
					
						
							|  |  |  | 348a258,406e0000 | 
					
						
							|  |  |  | 348a260,3ff00000 | 
					
						
							|  |  |  | 348a268,40080000 | 
					
						
							|  |  |  | 348a270,80409fc8 | 
					
						
							|  |  |  | 348a274,10203 | 
					
						
							|  |  |  | 348a278,4050607 | 
					
						
							|  |  |  | 348a27c,ffffffff | 
					
						
							|  |  |  | 348a280,ffff0000 | 
					
						
							|  |  |  | 348a284,ff00ff | 
					
						
							|  |  |  | 348a288,3c000064 | 
					
						
							|  |  |  | 348a28c,ffff8200 | 
					
						
							|  |  |  | 348a290,c832ffc8 | 
					
						
							|  |  |  | 348a294,c8000000 | 
					
						
							|  |  |  | 348a298,104465 | 
					
						
							|  |  |  | 348a29c,6b750000 | 
					
						
							|  |  |  | 348a2a4,110446f | 
					
						
							|  |  |  | 348a2a8,646f6e67 | 
					
						
							|  |  |  | 348a2ac,6f000000 | 
					
						
							|  |  |  | 348a2b0,2104a61 | 
					
						
							|  |  |  | 348a2b4,62750000 | 
					
						
							|  |  |  | 348a2bc,3d0466f | 
					
						
							|  |  |  | 348a2c0,72657374 | 
					
						
							|  |  |  | 348a2c8,4d04669 | 
					
						
							|  |  |  | 348a2cc,72650000 | 
					
						
							|  |  |  | 348a2d4,5d05761 | 
					
						
							|  |  |  | 348a2d8,74657200 | 
					
						
							|  |  |  | 348a2e0,7d05368 | 
					
						
							|  |  |  | 348a2e4,61646f77 | 
					
						
							|  |  |  | 348a2ec,6d05370 | 
					
						
							|  |  |  | 348a2f0,69726974 | 
					
						
							|  |  |  | 348a2f8,890426f | 
					
						
							|  |  |  | 348a2fc,74570000 | 
					
						
							|  |  |  | 348a304,9104963 | 
					
						
							|  |  |  | 348a308,65000000 | 
					
						
							|  |  |  | 348a310,ca04869 | 
					
						
							|  |  |  | 348a314,64656f75 | 
					
						
							|  |  |  | 348a318,74000000 | 
					
						
							|  |  |  | 348a31c,b804754 | 
					
						
							|  |  |  | 348a320,47000000 | 
					
						
							|  |  |  | 348a328,dc04761 | 
					
						
							|  |  |  | 348a32c,6e6f6e00 | 
					
						
							|  |  |  | 348a334,2 | 
					
						
							|  |  |  | 348a33c,3f800000 | 
					
						
							|  |  |  | 348a348,1 | 
					
						
							|  |  |  | 348a34c,30006 | 
					
						
							|  |  |  | 348a350,70009 | 
					
						
							|  |  |  | 348a354,b000e | 
					
						
							|  |  |  | 348a358,f0010 | 
					
						
							|  |  |  | 348a35c,110019 | 
					
						
							|  |  |  | 348a360,1a002b | 
					
						
							|  |  |  | 348a364,2c002e | 
					
						
							|  |  |  | 348a368,300032 | 
					
						
							|  |  |  | 348a36c,35003c | 
					
						
							|  |  |  | 348a370,400041 | 
					
						
							|  |  |  | 348a374,460051 | 
					
						
							|  |  |  | 348a378,540109 | 
					
						
							|  |  |  | 348a37c,10b010c | 
					
						
							|  |  |  | 348a380,10e010f | 
					
						
							|  |  |  | 348a384,1100113 | 
					
						
							|  |  |  | 348a38c,1 | 
					
						
							|  |  |  | 348a390,1 | 
					
						
							|  |  |  | 348a394,2 | 
					
						
							|  |  |  | 348a398,1 | 
					
						
							|  |  |  | 348a39c,2 | 
					
						
							|  |  |  | 348a3a0,2 | 
					
						
							|  |  |  | 348a3a4,3 | 
					
						
							|  |  |  | 348a3a8,1 | 
					
						
							|  |  |  | 348a3ac,2 | 
					
						
							|  |  |  | 348a3b0,2 | 
					
						
							|  |  |  | 348a3b4,3 | 
					
						
							|  |  |  | 348a3b8,2 | 
					
						
							|  |  |  | 348a3bc,3 | 
					
						
							|  |  |  | 348a3c0,3 | 
					
						
							|  |  |  | 348a3c4,4 | 
					
						
							|  |  |  | 348a3cc,100010 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348a3d0,a0301 | 
					
						
							|  |  |  | 348a3d4,1000000 | 
					
						
							|  |  |  | 348a3dc,100010 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348a3e0,20002 | 
					
						
							|  |  |  | 348a3e4,2000000 | 
					
						
							|  |  |  | 348a3ec,80008 | 
					
						
							|  |  |  | 348a3f0,a0301 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348a3f4,1000000 | 
					
						
							|  |  |  | 348a3fc,100010 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348a400,30301 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348a404,1000000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348a40c,100018 | 
					
						
							|  |  |  | 348a410,10301 | 
					
						
							|  |  |  | 348a414,1000000 | 
					
						
							|  |  |  | 348a41c,100010 | 
					
						
							|  |  |  | 348a420,100301 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348a424,1000000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348a42c,200020 | 
					
						
							|  |  |  | 348a430,10302 | 
					
						
							|  |  |  | 348a434,2000000 | 
					
						
							|  |  |  | 348a43c,8000e | 
					
						
							|  |  |  | 348a440,5f0301 | 
					
						
							|  |  |  | 348a444,1000000 | 
					
						
							|  |  |  | 348a44c,180018 | 
					
						
							|  |  |  | 348a450,140003 | 
					
						
							|  |  |  | 348a454,4000000 | 
					
						
							|  |  |  | 348a45c,200020 | 
					
						
							|  |  |  | 348a460,5a0003 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348a464,4000000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348a46c,100010 | 
					
						
							|  |  |  | 348a470,60301 | 
					
						
							|  |  |  | 348a474,1000000 | 
					
						
							|  |  |  | 348a47c,100010 | 
					
						
							|  |  |  | 348a480,30003 | 
					
						
							|  |  |  | 348a484,4000000 | 
					
						
							|  |  |  | 348a488,e7000000 | 
					
						
							|  |  |  | 348a490,d9000000 | 
					
						
							|  |  |  | 348a498,ed000000 | 
					
						
							|  |  |  | 348a49c,5003c0 | 
					
						
							|  |  |  | 348a4a0,ef002cf0 | 
					
						
							|  |  |  | 348a4a4,504244 | 
					
						
							|  |  |  | 348a4a8,df000000 | 
					
						
							|  |  |  | 348a4c4,4d8e0032 | 
					
						
							|  |  |  | 348a4c8,ce2001 | 
					
						
							|  |  |  | 348a4cc,80407e00 | 
					
						
							|  |  |  | 348a4d0,80407890 | 
					
						
							|  |  |  | 348a4d4,ffffffff | 
					
						
							|  |  |  | 348a4d8,4d8c0034 | 
					
						
							|  |  |  | 348a4dc,bb1201 | 
					
						
							|  |  |  | 348a4e0,80407c38 | 
					
						
							|  |  |  | 348a4e4,80407890 | 
					
						
							|  |  |  | 348a4e8,ffffffff | 
					
						
							|  |  |  | 348a4ec,4d090033 | 
					
						
							|  |  |  | 348a4f0,d92801 | 
					
						
							|  |  |  | 348a4f4,80407c38 | 
					
						
							|  |  |  | 348a4f8,80407890 | 
					
						
							|  |  |  | 348a4fc,ffffffff | 
					
						
							|  |  |  | 348a500,53030031 | 
					
						
							|  |  |  | 348a504,e93500 | 
					
						
							|  |  |  | 348a508,80407c38 | 
					
						
							|  |  |  | 348a50c,80407890 | 
					
						
							|  |  |  | 348a510,ffffffff | 
					
						
							|  |  |  | 348a514,53060030 | 
					
						
							|  |  |  | 348a518,e73300 | 
					
						
							|  |  |  | 348a51c,80407c38 | 
					
						
							|  |  |  | 348a520,80407890 | 
					
						
							|  |  |  | 348a524,ffffffff | 
					
						
							|  |  |  | 348a528,530e0035 | 
					
						
							|  |  |  | 348a52c,e83400 | 
					
						
							|  |  |  | 348a530,80407c38 | 
					
						
							|  |  |  | 348a534,80407890 | 
					
						
							|  |  |  | 348a538,ffffffff | 
					
						
							|  |  |  | 348a53c,4d000037 | 
					
						
							|  |  |  | 348a540,c71b01 | 
					
						
							|  |  |  | 348a544,80407c38 | 
					
						
							|  |  |  | 348a548,80407890 | 
					
						
							|  |  |  | 348a54c,ffffffff | 
					
						
							|  |  |  | 348a550,530a0036 | 
					
						
							|  |  |  | 348a554,dd2d00 | 
					
						
							|  |  |  | 348a558,80407c38 | 
					
						
							|  |  |  | 348a55c,80407890 | 
					
						
							|  |  |  | 348a560,ffffffff | 
					
						
							|  |  |  | 348a564,530b004f | 
					
						
							|  |  |  | 348a568,dd2e00 | 
					
						
							|  |  |  | 348a56c,80407c38 | 
					
						
							|  |  |  | 348a570,80407890 | 
					
						
							|  |  |  | 348a574,ffffffff | 
					
						
							|  |  |  | 348a578,530f0039 | 
					
						
							|  |  |  | 348a57c,ea3600 | 
					
						
							|  |  |  | 348a580,80407c38 | 
					
						
							|  |  |  | 348a584,80407890 | 
					
						
							|  |  |  | 348a588,ffffffff | 
					
						
							|  |  |  | 348a58c,53230069 | 
					
						
							|  |  |  | 348a590,ef3b00 | 
					
						
							|  |  |  | 348a594,80407c38 | 
					
						
							|  |  |  | 348a598,80407af4 | 
					
						
							|  |  |  | 348a59c,ffffffff | 
					
						
							|  |  |  | 348a5a0,5308003a | 
					
						
							|  |  |  | 348a5a4,de2f00 | 
					
						
							|  |  |  | 348a5a8,80407c38 | 
					
						
							|  |  |  | 348a5ac,80407890 | 
					
						
							|  |  |  | 348a5b0,ffffffff | 
					
						
							|  |  |  | 348a5b4,53110038 | 
					
						
							|  |  |  | 348a5b8,f64100 | 
					
						
							|  |  |  | 348a5bc,80407c38 | 
					
						
							|  |  |  | 348a5c0,80407890 | 
					
						
							|  |  |  | 348a5c4,ffffffff | 
					
						
							|  |  |  | 348a5c8,532f0002 | 
					
						
							|  |  |  | 348a5cc,1095e00 | 
					
						
							|  |  |  | 348a5d0,80407c38 | 
					
						
							|  |  |  | 348a5d4,80407890 | 
					
						
							|  |  |  | 348a5d8,ffffffff | 
					
						
							|  |  |  | 348a5dc,53140042 | 
					
						
							|  |  |  | 348a5e0,c60100 | 
					
						
							|  |  |  | 348a5e4,80407c38 | 
					
						
							|  |  |  | 348a5e8,80407890 | 
					
						
							|  |  |  | 348a5ec,ffffffff | 
					
						
							|  |  |  | 348a5f0,53150043 | 
					
						
							|  |  |  | 348a5f4,eb3800 | 
					
						
							|  |  |  | 348a5f8,80407c38 | 
					
						
							|  |  |  | 348a5fc,80407890 | 
					
						
							|  |  |  | 348a600,ffffffff | 
					
						
							|  |  |  | 348a604,53160044 | 
					
						
							|  |  |  | 348a608,eb3700 | 
					
						
							|  |  |  | 348a60c,80407c38 | 
					
						
							|  |  |  | 348a610,80407890 | 
					
						
							|  |  |  | 348a614,ffffffff | 
					
						
							|  |  |  | 348a618,53170045 | 
					
						
							|  |  |  | 348a61c,eb3900 | 
					
						
							|  |  |  | 348a620,80407c38 | 
					
						
							|  |  |  | 348a624,80407890 | 
					
						
							|  |  |  | 348a628,ffffffff | 
					
						
							|  |  |  | 348a62c,53180046 | 
					
						
							|  |  |  | 348a630,c60100 | 
					
						
							|  |  |  | 348a634,80407c38 | 
					
						
							|  |  |  | 348a638,80407890 | 
					
						
							|  |  |  | 348a63c,ffffffff | 
					
						
							|  |  |  | 348a640,531a0098 | 
					
						
							|  |  |  | 348a644,df3000 | 
					
						
							|  |  |  | 348a648,80407c38 | 
					
						
							|  |  |  | 348a64c,80407890 | 
					
						
							|  |  |  | 348a650,ffffffff | 
					
						
							|  |  |  | 348a654,531b0099 | 
					
						
							|  |  |  | 348a658,10b4500 | 
					
						
							|  |  |  | 348a65c,80407e40 | 
					
						
							|  |  |  | 348a660,80407890 | 
					
						
							|  |  |  | 348a664,ffffffff | 
					
						
							|  |  |  | 348a668,53100048 | 
					
						
							|  |  |  | 348a66c,f33e01 | 
					
						
							|  |  |  | 348a670,80407c38 | 
					
						
							|  |  |  | 348a674,80407890 | 
					
						
							|  |  |  | 348a678,ffffffff | 
					
						
							|  |  |  | 348a67c,53250010 | 
					
						
							|  |  |  | 348a680,1364f00 | 
					
						
							|  |  |  | 348a684,80407c38 | 
					
						
							|  |  |  | 348a688,80407890 | 
					
						
							|  |  |  | 348a68c,ffffffff | 
					
						
							|  |  |  | 348a690,53260011 | 
					
						
							|  |  |  | 348a694,1353200 | 
					
						
							|  |  |  | 348a698,80407c38 | 
					
						
							|  |  |  | 348a69c,80407890 | 
					
						
							|  |  |  | 348a6a0,ffffffff | 
					
						
							|  |  |  | 348a6a4,5322000b | 
					
						
							|  |  |  | 348a6a8,1094400 | 
					
						
							|  |  |  | 348a6ac,80407c38 | 
					
						
							|  |  |  | 348a6b0,80407890 | 
					
						
							|  |  |  | 348a6b4,ffffffff | 
					
						
							|  |  |  | 348a6b8,53240012 | 
					
						
							|  |  |  | 348a6bc,1343100 | 
					
						
							|  |  |  | 348a6c0,80407c38 | 
					
						
							|  |  |  | 348a6c4,80407890 | 
					
						
							|  |  |  | 348a6c8,ffffffff | 
					
						
							|  |  |  | 348a6cc,53270013 | 
					
						
							|  |  |  | 348a6d0,1375000 | 
					
						
							|  |  |  | 348a6d4,80407c38 | 
					
						
							|  |  |  | 348a6d8,80407890 | 
					
						
							|  |  |  | 348a6dc,ffffffff | 
					
						
							|  |  |  | 348a6e0,532b0017 | 
					
						
							|  |  |  | 348a6e4,1385100 | 
					
						
							|  |  |  | 348a6e8,80407c38 | 
					
						
							|  |  |  | 348a6ec,80407890 | 
					
						
							|  |  |  | 348a6f0,ffffffff | 
					
						
							|  |  |  | 348a6f4,532d9001 | 
					
						
							|  |  |  | 348a6f8,da2900 | 
					
						
							|  |  |  | 348a6fc,80407c38 | 
					
						
							|  |  |  | 348a700,80407890 | 
					
						
							|  |  |  | 348a704,ffffffff | 
					
						
							|  |  |  | 348a708,532e000b | 
					
						
							|  |  |  | 348a70c,1094400 | 
					
						
							|  |  |  | 348a710,80407c38 | 
					
						
							|  |  |  | 348a714,80407890 | 
					
						
							|  |  |  | 348a718,ffffffff | 
					
						
							|  |  |  | 348a71c,53300003 | 
					
						
							|  |  |  | 348a720,1415400 | 
					
						
							|  |  |  | 348a724,80407c38 | 
					
						
							|  |  |  | 348a728,80407890 | 
					
						
							|  |  |  | 348a72c,ffffffff | 
					
						
							|  |  |  | 348a730,53310004 | 
					
						
							|  |  |  | 348a734,1405300 | 
					
						
							|  |  |  | 348a738,80407c38 | 
					
						
							|  |  |  | 348a73c,80407890 | 
					
						
							|  |  |  | 348a740,ffffffff | 
					
						
							|  |  |  | 348a744,53320005 | 
					
						
							|  |  |  | 348a748,f54000 | 
					
						
							|  |  |  | 348a74c,80407c38 | 
					
						
							|  |  |  | 348a750,80407890 | 
					
						
							|  |  |  | 348a754,ffffffff | 
					
						
							|  |  |  | 348a758,53330008 | 
					
						
							|  |  |  | 348a75c,1435600 | 
					
						
							|  |  |  | 348a760,80407c38 | 
					
						
							|  |  |  | 348a764,80407890 | 
					
						
							|  |  |  | 348a768,ffffffff | 
					
						
							|  |  |  | 348a76c,53340009 | 
					
						
							|  |  |  | 348a770,1465700 | 
					
						
							|  |  |  | 348a774,80407c38 | 
					
						
							|  |  |  | 348a778,80407890 | 
					
						
							|  |  |  | 348a77c,ffffffff | 
					
						
							|  |  |  | 348a780,5335000d | 
					
						
							|  |  |  | 348a784,1495a00 | 
					
						
							|  |  |  | 348a788,80407c38 | 
					
						
							|  |  |  | 348a78c,80407890 | 
					
						
							|  |  |  | 348a790,ffffffff | 
					
						
							|  |  |  | 348a794,5336000e | 
					
						
							|  |  |  | 348a798,13f5200 | 
					
						
							|  |  |  | 348a79c,80407c38 | 
					
						
							|  |  |  | 348a7a0,80407890 | 
					
						
							|  |  |  | 348a7a4,ffffffff | 
					
						
							|  |  |  | 348a7a8,5337000a | 
					
						
							|  |  |  | 348a7ac,1425500 | 
					
						
							|  |  |  | 348a7b0,80407c38 | 
					
						
							|  |  |  | 348a7b4,80407890 | 
					
						
							|  |  |  | 348a7b8,ffffffff | 
					
						
							|  |  |  | 348a7bc,533b00a4 | 
					
						
							|  |  |  | 348a7c0,18d7400 | 
					
						
							|  |  |  | 348a7c4,80407c38 | 
					
						
							|  |  |  | 348a7c8,80407890 | 
					
						
							|  |  |  | 348a7cc,ffffffff | 
					
						
							|  |  |  | 348a7d0,533d004b | 
					
						
							|  |  |  | 348a7d4,f84300 | 
					
						
							|  |  |  | 348a7d8,80407c38 | 
					
						
							|  |  |  | 348a7dc,80407890 | 
					
						
							|  |  |  | 348a7e0,ffffffff | 
					
						
							|  |  |  | 348a7e4,533e004c | 
					
						
							|  |  |  | 348a7e8,cb1d01 | 
					
						
							|  |  |  | 348a7ec,80407c38 | 
					
						
							|  |  |  | 348a7f0,80407890 | 
					
						
							|  |  |  | 348a7f4,ffffffff | 
					
						
							|  |  |  | 348a7f8,533f004d | 
					
						
							|  |  |  | 348a7fc,dc2c01 | 
					
						
							|  |  |  | 348a800,80407c38 | 
					
						
							|  |  |  | 348a804,80407890 | 
					
						
							|  |  |  | 348a808,ffffffff | 
					
						
							|  |  |  | 348a80c,5340004e | 
					
						
							|  |  |  | 348a810,ee3a00 | 
					
						
							|  |  |  | 348a814,80407c38 | 
					
						
							|  |  |  | 348a818,80407890 | 
					
						
							|  |  |  | 348a81c,ffffffff | 
					
						
							|  |  |  | 348a820,53420050 | 
					
						
							|  |  |  | 348a824,f23c00 | 
					
						
							|  |  |  | 348a828,80407c38 | 
					
						
							|  |  |  | 348a82c,80407890 | 
					
						
							|  |  |  | 348a830,ffffffff | 
					
						
							|  |  |  | 348a834,53430051 | 
					
						
							|  |  |  | 348a838,f23d00 | 
					
						
							|  |  |  | 348a83c,80407c38 | 
					
						
							|  |  |  | 348a840,80407890 | 
					
						
							|  |  |  | 348a844,ffffffff | 
					
						
							|  |  |  | 348a848,53450053 | 
					
						
							|  |  |  | 348a84c,1184700 | 
					
						
							|  |  |  | 348a850,80407c38 | 
					
						
							|  |  |  | 348a854,80407890 | 
					
						
							|  |  |  | 348a858,ffffffff | 
					
						
							|  |  |  | 348a85c,53460054 | 
					
						
							|  |  |  | 348a860,1575f00 | 
					
						
							|  |  |  | 348a864,80407c38 | 
					
						
							|  |  |  | 348a868,80407890 | 
					
						
							|  |  |  | 348a86c,ffffffff | 
					
						
							|  |  |  | 348a870,534b0056 | 
					
						
							|  |  |  | 348a874,be1600 | 
					
						
							|  |  |  | 348a878,80407c38 | 
					
						
							|  |  |  | 348a87c,80407890 | 
					
						
							|  |  |  | 348a880,ffffffff | 
					
						
							|  |  |  | 348a884,534c0057 | 
					
						
							|  |  |  | 348a888,be1700 | 
					
						
							|  |  |  | 348a88c,80407c38 | 
					
						
							|  |  |  | 348a890,80407890 | 
					
						
							|  |  |  | 348a894,ffffffff | 
					
						
							|  |  |  | 348a898,534d0058 | 
					
						
							|  |  |  | 348a89c,bf1800 | 
					
						
							|  |  |  | 348a8a0,80407c38 | 
					
						
							|  |  |  | 348a8a4,80407890 | 
					
						
							|  |  |  | 348a8a8,ffffffff | 
					
						
							|  |  |  | 348a8ac,534e0059 | 
					
						
							|  |  |  | 348a8b0,bf1900 | 
					
						
							|  |  |  | 348a8b4,80407c38 | 
					
						
							|  |  |  | 348a8b8,80407890 | 
					
						
							|  |  |  | 348a8bc,ffffffff | 
					
						
							|  |  |  | 348a8c0,534f005a | 
					
						
							|  |  |  | 348a8c4,bf1a00 | 
					
						
							|  |  |  | 348a8c8,80407c38 | 
					
						
							|  |  |  | 348a8cc,80407890 | 
					
						
							|  |  |  | 348a8d0,ffffffff | 
					
						
							|  |  |  | 348a8d4,5351005b | 
					
						
							|  |  |  | 348a8d8,12d4900 | 
					
						
							|  |  |  | 348a8dc,80407c38 | 
					
						
							|  |  |  | 348a8e0,80407890 | 
					
						
							|  |  |  | 348a8e4,ffffffff | 
					
						
							|  |  |  | 348a8e8,5352005c | 
					
						
							|  |  |  | 348a8ec,12d4a00 | 
					
						
							|  |  |  | 348a8f0,80407c38 | 
					
						
							|  |  |  | 348a8f4,80407890 | 
					
						
							|  |  |  | 348a8f8,ffffffff | 
					
						
							|  |  |  | 348a8fc,535300cd | 
					
						
							|  |  |  | 348a900,db2a00 | 
					
						
							|  |  |  | 348a904,80407c38 | 
					
						
							|  |  |  | 348a908,80407890 | 
					
						
							|  |  |  | 348a90c,ffffffff | 
					
						
							|  |  |  | 348a910,535400ce | 
					
						
							|  |  |  | 348a914,db2b00 | 
					
						
							|  |  |  | 348a918,80407c38 | 
					
						
							|  |  |  | 348a91c,80407890 | 
					
						
							|  |  |  | 348a920,ffffffff | 
					
						
							|  |  |  | 348a924,536f0068 | 
					
						
							|  |  |  | 348a928,c82100 | 
					
						
							|  |  |  | 348a92c,80407c38 | 
					
						
							|  |  |  | 348a930,80407890 | 
					
						
							|  |  |  | 348a934,ffffffff | 
					
						
							|  |  |  | 348a938,5370007b | 
					
						
							|  |  |  | 348a93c,d72400 | 
					
						
							|  |  |  | 348a940,80407c38 | 
					
						
							|  |  |  | 348a944,80407890 | 
					
						
							|  |  |  | 348a948,ffffffff | 
					
						
							|  |  |  | 348a94c,5341004a | 
					
						
							|  |  |  | 348a950,10e4600 | 
					
						
							|  |  |  | 348a954,80407c38 | 
					
						
							|  |  |  | 348a958,80407a70 | 
					
						
							|  |  |  | 348a95c,ffffffff | 
					
						
							|  |  |  | 348a960,4d5800dc | 
					
						
							|  |  |  | 348a964,1194801 | 
					
						
							|  |  |  | 348a968,80407e1c | 
					
						
							|  |  |  | 348a96c,80407890 | 
					
						
							|  |  |  | 348a970,ffffffff | 
					
						
							|  |  |  | 348a974,3d7200c6 | 
					
						
							|  |  |  | 348a978,bd1301 | 
					
						
							|  |  |  | 348a97c,80407c38 | 
					
						
							|  |  |  | 348a980,80407898 | 
					
						
							|  |  |  | 348a984,ffffffff | 
					
						
							|  |  |  | 348a988,3e7a00c2 | 
					
						
							|  |  |  | 348a98c,bd1401 | 
					
						
							|  |  |  | 348a990,80407c38 | 
					
						
							|  |  |  | 348a994,80407898 | 
					
						
							|  |  |  | 348a998,ffffffff | 
					
						
							|  |  |  | 348a99c,537400c7 | 
					
						
							|  |  |  | 348a9a0,b90a02 | 
					
						
							|  |  |  | 348a9a4,80407c38 | 
					
						
							|  |  |  | 348a9a8,80407890 | 
					
						
							|  |  |  | 348a9ac,ffffffff | 
					
						
							|  |  |  | 348a9b0,53750067 | 
					
						
							|  |  |  | 348a9b4,b80b01 | 
					
						
							|  |  |  | 348a9b8,80407c38 | 
					
						
							|  |  |  | 348a9bc,80407890 | 
					
						
							|  |  |  | 348a9c0,ffffffff | 
					
						
							|  |  |  | 348a9c4,53760066 | 
					
						
							|  |  |  | 348a9c8,c81c01 | 
					
						
							|  |  |  | 348a9cc,80407c38 | 
					
						
							|  |  |  | 348a9d0,80407890 | 
					
						
							|  |  |  | 348a9d4,ffffffff | 
					
						
							|  |  |  | 348a9d8,53770060 | 
					
						
							|  |  |  | 348a9dc,aa0203 | 
					
						
							|  |  |  | 348a9e0,80407c38 | 
					
						
							|  |  |  | 348a9e4,80407890 | 
					
						
							|  |  |  | 348a9e8,ffffffff | 
					
						
							|  |  |  | 348a9ec,53780052 | 
					
						
							|  |  |  | 348a9f0,cd1e01 | 
					
						
							|  |  |  | 348a9f4,80407c38 | 
					
						
							|  |  |  | 348a9f8,80407890 | 
					
						
							|  |  |  | 348a9fc,ffffffff | 
					
						
							|  |  |  | 348aa00,53790052 | 
					
						
							|  |  |  | 348aa04,cd1f01 | 
					
						
							|  |  |  | 348aa08,80407c38 | 
					
						
							|  |  |  | 348aa0c,80407890 | 
					
						
							|  |  |  | 348aa10,ffffffff | 
					
						
							|  |  |  | 348aa14,5356005e | 
					
						
							|  |  |  | 348aa18,d12200 | 
					
						
							|  |  |  | 348aa1c,80407c38 | 
					
						
							|  |  |  | 348aa20,80407ac8 | 
					
						
							|  |  |  | 348aa24,1ffff | 
					
						
							|  |  |  | 348aa28,5357005f | 
					
						
							|  |  |  | 348aa2c,d12300 | 
					
						
							|  |  |  | 348aa30,80407c38 | 
					
						
							|  |  |  | 348aa34,80407ac8 | 
					
						
							|  |  |  | 348aa38,2ffff | 
					
						
							|  |  |  | 348aa3c,5321009a | 
					
						
							|  |  |  | 348aa40,da2900 | 
					
						
							|  |  |  | 348aa44,80407c38 | 
					
						
							|  |  |  | 348aa48,80407890 | 
					
						
							|  |  |  | 348aa4c,ffffffff | 
					
						
							|  |  |  | 348aa50,4d830055 | 
					
						
							|  |  |  | 348aa54,b70901 | 
					
						
							|  |  |  | 348aa58,80407c38 | 
					
						
							|  |  |  | 348aa5c,80407890 | 
					
						
							|  |  |  | 348aa60,ffffffff | 
					
						
							|  |  |  | 348aa64,4d9200e6 | 
					
						
							|  |  |  | 348aa68,d82501 | 
					
						
							|  |  |  | 348aa6c,80407de4 | 
					
						
							|  |  |  | 348aa70,80407890 | 
					
						
							|  |  |  | 348aa74,ffffffff | 
					
						
							|  |  |  | 348aa78,4d9300e6 | 
					
						
							|  |  |  | 348aa7c,d82601 | 
					
						
							|  |  |  | 348aa80,80407de4 | 
					
						
							|  |  |  | 348aa84,80407890 | 
					
						
							|  |  |  | 348aa88,ffffffff | 
					
						
							|  |  |  | 348aa8c,4d9400e6 | 
					
						
							|  |  |  | 348aa90,d82701 | 
					
						
							|  |  |  | 348aa94,80407de4 | 
					
						
							|  |  |  | 348aa98,80407890 | 
					
						
							|  |  |  | 348aa9c,ffffffff | 
					
						
							|  |  |  | 348aaa0,4d84006f | 
					
						
							|  |  |  | 348aaa4,17f6d01 | 
					
						
							|  |  |  | 348aaa8,80407c38 | 
					
						
							|  |  |  | 348aaac,80407890 | 
					
						
							|  |  |  | 348aab0,ffffffff | 
					
						
							|  |  |  | 348aab4,4d8500cc | 
					
						
							|  |  |  | 348aab8,17f6e01 | 
					
						
							|  |  |  | 348aabc,80407c38 | 
					
						
							|  |  |  | 348aac0,80407890 | 
					
						
							|  |  |  | 348aac4,ffffffff | 
					
						
							|  |  |  | 348aac8,4d8600f0 | 
					
						
							|  |  |  | 348aacc,17f6f01 | 
					
						
							|  |  |  | 348aad0,80407c38 | 
					
						
							|  |  |  | 348aad4,80407890 | 
					
						
							|  |  |  | 348aad8,ffffffff | 
					
						
							|  |  |  | 348aadc,3d7200c6 | 
					
						
							|  |  |  | 348aae0,bd1301 | 
					
						
							|  |  |  | 348aae4,80407c38 | 
					
						
							|  |  |  | 348aae8,80407898 | 
					
						
							|  |  |  | 348aaec,ffffffff | 
					
						
							|  |  |  | 348aaf0,53820098 | 
					
						
							|  |  |  | 348aaf4,df3000 | 
					
						
							|  |  |  | 348aaf8,80407c38 | 
					
						
							|  |  |  | 348aafc,80407890 | 
					
						
							|  |  |  | 348ab00,ffffffff | 
					
						
							|  |  |  | 348ab04,53280014 | 
					
						
							|  |  |  | 348ab08,1505b00 | 
					
						
							|  |  |  | 348ab0c,80407c38 | 
					
						
							|  |  |  | 348ab10,80407890 | 
					
						
							|  |  |  | 348ab14,ffffffff | 
					
						
							|  |  |  | 348ab18,53290015 | 
					
						
							|  |  |  | 348ab1c,1515c00 | 
					
						
							|  |  |  | 348ab20,80407c38 | 
					
						
							|  |  |  | 348ab24,80407890 | 
					
						
							|  |  |  | 348ab28,ffffffff | 
					
						
							|  |  |  | 348ab2c,532a0016 | 
					
						
							|  |  |  | 348ab30,1525d00 | 
					
						
							|  |  |  | 348ab34,80407c38 | 
					
						
							|  |  |  | 348ab38,80407890 | 
					
						
							|  |  |  | 348ab3c,ffffffff | 
					
						
							|  |  |  | 348ab40,53500079 | 
					
						
							|  |  |  | 348ab44,1475800 | 
					
						
							|  |  |  | 348ab48,80407c38 | 
					
						
							|  |  |  | 348ab4c,80407890 | 
					
						
							|  |  |  | 348ab50,ffffffff | 
					
						
							|  |  |  | 348ab54,4d8700f1 | 
					
						
							|  |  |  | 348ab58,17f7101 | 
					
						
							|  |  |  | 348ab5c,80407c38 | 
					
						
							|  |  |  | 348ab60,80407890 | 
					
						
							|  |  |  | 348ab64,ffffffff | 
					
						
							|  |  |  | 348ab68,4d8800f2 | 
					
						
							|  |  |  | 348ab6c,17f7201 | 
					
						
							|  |  |  | 348ab70,80407c38 | 
					
						
							|  |  |  | 348ab74,80407890 | 
					
						
							|  |  |  | 348ab78,ffffffff | 
					
						
							|  |  |  | 348ab7c,533d000c | 
					
						
							|  |  |  | 348ab80,f84300 | 
					
						
							|  |  |  | 348ab84,80407c38 | 
					
						
							|  |  |  | 348ab88,80407998 | 
					
						
							|  |  |  | 348ab8c,ffffffff | 
					
						
							|  |  |  | 348ab90,53040070 | 
					
						
							|  |  |  | 348ab94,1586000 | 
					
						
							|  |  |  | 348ab98,80407c38 | 
					
						
							|  |  |  | 348ab9c,80407890 | 
					
						
							|  |  |  | 348aba0,ffffffff | 
					
						
							|  |  |  | 348aba4,530c0071 | 
					
						
							|  |  |  | 348aba8,1586100 | 
					
						
							|  |  |  | 348abac,80407c38 | 
					
						
							|  |  |  | 348abb0,80407890 | 
					
						
							|  |  |  | 348abb4,ffffffff | 
					
						
							|  |  |  | 348abb8,53120072 | 
					
						
							|  |  |  | 348abbc,1586200 | 
					
						
							|  |  |  | 348abc0,80407c38 | 
					
						
							|  |  |  | 348abc4,80407890 | 
					
						
							|  |  |  | 348abc8,ffffffff | 
					
						
							|  |  |  | 348abcc,5b7100b4 | 
					
						
							|  |  |  | 348abd0,15c6301 | 
					
						
							|  |  |  | 348abd4,80407c38 | 
					
						
							|  |  |  | 348abd8,80407890 | 
					
						
							|  |  |  | 348abdc,ffffffff | 
					
						
							|  |  |  | 348abe0,530500ad | 
					
						
							|  |  |  | 348abe4,15d6400 | 
					
						
							|  |  |  | 348abe8,80407c38 | 
					
						
							|  |  |  | 348abec,80407890 | 
					
						
							|  |  |  | 348abf0,ffffffff | 
					
						
							|  |  |  | 348abf4,530d00ae | 
					
						
							|  |  |  | 348abf8,15d6500 | 
					
						
							|  |  |  | 348abfc,80407c38 | 
					
						
							|  |  |  | 348ac00,80407890 | 
					
						
							|  |  |  | 348ac04,ffffffff | 
					
						
							|  |  |  | 348ac08,531300af | 
					
						
							|  |  |  | 348ac0c,15d6600 | 
					
						
							|  |  |  | 348ac10,80407c38 | 
					
						
							|  |  |  | 348ac14,80407890 | 
					
						
							|  |  |  | 348ac18,ffffffff | 
					
						
							|  |  |  | 348ac1c,53470007 | 
					
						
							|  |  |  | 348ac20,17b6c00 | 
					
						
							|  |  |  | 348ac24,80407c38 | 
					
						
							|  |  |  | 348ac28,80407890 | 
					
						
							|  |  |  | 348ac2c,ffffffff | 
					
						
							|  |  |  | 348ac30,53480007 | 
					
						
							|  |  |  | 348ac34,17b6c00 | 
					
						
							|  |  |  | 348ac38,80407c38 | 
					
						
							|  |  |  | 348ac3c,80407890 | 
					
						
							|  |  |  | 348ac40,ffffffff | 
					
						
							|  |  |  | 348ac44,4d8a0037 | 
					
						
							|  |  |  | 348ac48,c71b01 | 
					
						
							|  |  |  | 348ac4c,80407c38 | 
					
						
							|  |  |  | 348ac50,80407890 | 
					
						
							|  |  |  | 348ac54,ffffffff | 
					
						
							|  |  |  | 348ac58,4d8b0037 | 
					
						
							|  |  |  | 348ac5c,c71b01 | 
					
						
							|  |  |  | 348ac60,80407c38 | 
					
						
							|  |  |  | 348ac64,80407890 | 
					
						
							|  |  |  | 348ac68,ffffffff | 
					
						
							|  |  |  | 348ac6c,4d8c0034 | 
					
						
							|  |  |  | 348ac70,bb1201 | 
					
						
							|  |  |  | 348ac74,80407c38 | 
					
						
							|  |  |  | 348ac78,80407890 | 
					
						
							|  |  |  | 348ac7c,ffffffff | 
					
						
							|  |  |  | 348ac80,4d8d0034 | 
					
						
							|  |  |  | 348ac84,bb1201 | 
					
						
							|  |  |  | 348ac88,80407c38 | 
					
						
							|  |  |  | 348ac8c,80407890 | 
					
						
							|  |  |  | 348ac90,ffffffff | 
					
						
							|  |  |  | 348ac94,4d020032 | 
					
						
							|  |  |  | 348ac98,ce2001 | 
					
						
							|  |  |  | 348ac9c,80407e00 | 
					
						
							|  |  |  | 348aca0,80407890 | 
					
						
							|  |  |  | 348aca4,ffffffff | 
					
						
							|  |  |  | 348aca8,4d8f0032 | 
					
						
							|  |  |  | 348acac,ce2001 | 
					
						
							|  |  |  | 348acb0,80407e00 | 
					
						
							|  |  |  | 348acb4,80407890 | 
					
						
							|  |  |  | 348acb8,ffffffff | 
					
						
							|  |  |  | 348acbc,4d900032 | 
					
						
							|  |  |  | 348acc0,ce2001 | 
					
						
							|  |  |  | 348acc4,80407e00 | 
					
						
							|  |  |  | 348acc8,80407890 | 
					
						
							|  |  |  | 348accc,ffffffff | 
					
						
							|  |  |  | 348acd0,4d910032 | 
					
						
							|  |  |  | 348acd4,ce2001 | 
					
						
							|  |  |  | 348acd8,80407e00 | 
					
						
							|  |  |  | 348acdc,80407890 | 
					
						
							|  |  |  | 348ace0,ffffffff | 
					
						
							|  |  |  | 348ace4,4d9500dc | 
					
						
							|  |  |  | 348ace8,1194801 | 
					
						
							|  |  |  | 348acec,80407e1c | 
					
						
							|  |  |  | 348acf0,80407890 | 
					
						
							|  |  |  | 348acf4,ffffffff | 
					
						
							|  |  |  | 348acf8,4d960033 | 
					
						
							|  |  |  | 348acfc,d92801 | 
					
						
							|  |  |  | 348ad00,80407c38 | 
					
						
							|  |  |  | 348ad04,80407890 | 
					
						
							|  |  |  | 348ad08,ffffffff | 
					
						
							|  |  |  | 348ad0c,4d970033 | 
					
						
							|  |  |  | 348ad10,d92801 | 
					
						
							|  |  |  | 348ad14,80407c38 | 
					
						
							|  |  |  | 348ad18,80407890 | 
					
						
							|  |  |  | 348ad1c,ffffffff | 
					
						
							|  |  |  | 348ad20,53190047 | 
					
						
							|  |  |  | 348ad24,f43f00 | 
					
						
							|  |  |  | 348ad28,80407c38 | 
					
						
							|  |  |  | 348ad2c,80407890 | 
					
						
							|  |  |  | 348ad30,ffffffff | 
					
						
							|  |  |  | 348ad34,531d007a | 
					
						
							|  |  |  | 348ad38,1746800 | 
					
						
							|  |  |  | 348ad3c,80407c38 | 
					
						
							|  |  |  | 348ad40,80407890 | 
					
						
							|  |  |  | 348ad44,ffffffff | 
					
						
							|  |  |  | 348ad48,531c005d | 
					
						
							|  |  |  | 348ad4c,1736700 | 
					
						
							|  |  |  | 348ad50,80407c38 | 
					
						
							|  |  |  | 348ad54,80407890 | 
					
						
							|  |  |  | 348ad58,ffffffff | 
					
						
							|  |  |  | 348ad5c,53200097 | 
					
						
							|  |  |  | 348ad60,1766a00 | 
					
						
							|  |  |  | 348ad64,80407c38 | 
					
						
							|  |  |  | 348ad68,80407890 | 
					
						
							|  |  |  | 348ad6c,ffffffff | 
					
						
							|  |  |  | 348ad70,531e00f9 | 
					
						
							|  |  |  | 348ad74,1767000 | 
					
						
							|  |  |  | 348ad78,80407c38 | 
					
						
							|  |  |  | 348ad7c,80407890 | 
					
						
							|  |  |  | 348ad80,ffffffff | 
					
						
							|  |  |  | 348ad84,537700f3 | 
					
						
							|  |  |  | 348ad88,aa0201 | 
					
						
							|  |  |  | 348ad8c,80407c38 | 
					
						
							|  |  |  | 348ad90,80407890 | 
					
						
							|  |  |  | 348ad94,ffffffff | 
					
						
							|  |  |  | 348ad98,4d8400f4 | 
					
						
							|  |  |  | 348ad9c,17f6d01 | 
					
						
							|  |  |  | 348ada0,80407c38 | 
					
						
							|  |  |  | 348ada4,80407890 | 
					
						
							|  |  |  | 348ada8,ffffffff | 
					
						
							|  |  |  | 348adac,4d8500f5 | 
					
						
							|  |  |  | 348adb0,17f6e01 | 
					
						
							|  |  |  | 348adb4,80407c38 | 
					
						
							|  |  |  | 348adb8,80407890 | 
					
						
							|  |  |  | 348adbc,ffffffff | 
					
						
							|  |  |  | 348adc0,4d8600f6 | 
					
						
							|  |  |  | 348adc4,17f6f01 | 
					
						
							|  |  |  | 348adc8,80407c38 | 
					
						
							|  |  |  | 348adcc,80407890 | 
					
						
							|  |  |  | 348add0,ffffffff | 
					
						
							|  |  |  | 348add4,4d8700f7 | 
					
						
							|  |  |  | 348add8,17f7101 | 
					
						
							|  |  |  | 348addc,80407c38 | 
					
						
							|  |  |  | 348ade0,80407890 | 
					
						
							|  |  |  | 348ade4,ffffffff | 
					
						
							|  |  |  | 348ade8,537a00fa | 
					
						
							|  |  |  | 348adec,bd1401 | 
					
						
							|  |  |  | 348adf0,80407c38 | 
					
						
							|  |  |  | 348adf4,80407898 | 
					
						
							|  |  |  | 348adf8,ffffffff | 
					
						
							|  |  |  | 348adfc,53980090 | 
					
						
							|  |  |  | 348ae00,c71b01 | 
					
						
							|  |  |  | 348ae04,80407c38 | 
					
						
							|  |  |  | 348ae08,80407890 | 
					
						
							|  |  |  | 348ae0c,ffffffff | 
					
						
							|  |  |  | 348ae10,53990091 | 
					
						
							|  |  |  | 348ae14,c71b01 | 
					
						
							|  |  |  | 348ae18,80407c38 | 
					
						
							|  |  |  | 348ae1c,80407890 | 
					
						
							|  |  |  | 348ae20,ffffffff | 
					
						
							|  |  |  | 348ae24,539a00a7 | 
					
						
							|  |  |  | 348ae28,bb1201 | 
					
						
							|  |  |  | 348ae2c,80407c38 | 
					
						
							|  |  |  | 348ae30,80407890 | 
					
						
							|  |  |  | 348ae34,ffffffff | 
					
						
							|  |  |  | 348ae38,539b00a8 | 
					
						
							|  |  |  | 348ae3c,bb1201 | 
					
						
							|  |  |  | 348ae40,80407c38 | 
					
						
							|  |  |  | 348ae44,80407890 | 
					
						
							|  |  |  | 348ae48,ffffffff | 
					
						
							|  |  |  | 348ae4c,5349006c | 
					
						
							|  |  |  | 348ae50,17b7300 | 
					
						
							|  |  |  | 348ae54,80407c38 | 
					
						
							|  |  |  | 348ae58,80407890 | 
					
						
							|  |  |  | 348ae5c,ffffffff | 
					
						
							|  |  |  | 348ae60,53419002 | 
					
						
							|  |  |  | 348ae68,80407c38 | 
					
						
							|  |  |  | 348ae6c,80407a94 | 
					
						
							|  |  |  | 348ae70,ffffffff | 
					
						
							|  |  |  | 348aeb0,ffffffff | 
					
						
							|  |  |  | 348aeb4,dd2d00 | 
					
						
							|  |  |  | 348aeb8,80407c40 | 
					
						
							|  |  |  | 348aebc,80407890 | 
					
						
							|  |  |  | 348aec0,ffffffff | 
					
						
							|  |  |  | 348aec4,ffffffff | 
					
						
							|  |  |  | 348aec8,1475800 | 
					
						
							|  |  |  | 348aecc,80407c54 | 
					
						
							|  |  |  | 348aed0,80407890 | 
					
						
							|  |  |  | 348aed4,ffffffff | 
					
						
							|  |  |  | 348aed8,ffffffff | 
					
						
							|  |  |  | 348aedc,bf1800 | 
					
						
							|  |  |  | 348aee0,80407c80 | 
					
						
							|  |  |  | 348aee4,80407890 | 
					
						
							|  |  |  | 348aee8,ffffffff | 
					
						
							|  |  |  | 348aeec,ffffffff | 
					
						
							|  |  |  | 348aef0,e93500 | 
					
						
							|  |  |  | 348aef4,80407cac | 
					
						
							|  |  |  | 348aef8,80407890 | 
					
						
							|  |  |  | 348aefc,ffffffff | 
					
						
							|  |  |  | 348af00,ffffffff | 
					
						
							|  |  |  | 348af04,e73300 | 
					
						
							|  |  |  | 348af08,80407cd4 | 
					
						
							|  |  |  | 348af0c,80407890 | 
					
						
							|  |  |  | 348af10,ffffffff | 
					
						
							|  |  |  | 348af14,ffffffff | 
					
						
							|  |  |  | 348af18,d12200 | 
					
						
							|  |  |  | 348af1c,80407d04 | 
					
						
							|  |  |  | 348af20,80407890 | 
					
						
							|  |  |  | 348af24,ffffffff | 
					
						
							|  |  |  | 348af28,ffffffff | 
					
						
							|  |  |  | 348af2c,db2a00 | 
					
						
							|  |  |  | 348af30,80407d34 | 
					
						
							|  |  |  | 348af34,80407890 | 
					
						
							|  |  |  | 348af38,ffffffff | 
					
						
							|  |  |  | 348af3c,ffffffff | 
					
						
							|  |  |  | 348af40,bb1201 | 
					
						
							|  |  |  | 348af44,80407d4c | 
					
						
							|  |  |  | 348af48,80407890 | 
					
						
							|  |  |  | 348af4c,ffffffff | 
					
						
							|  |  |  | 348af50,ffffffff | 
					
						
							|  |  |  | 348af54,c71b01 | 
					
						
							|  |  |  | 348af58,80407d68 | 
					
						
							|  |  |  | 348af5c,80407890 | 
					
						
							|  |  |  | 348af60,ffffffff | 
					
						
							|  |  |  | 348af64,ffffffff | 
					
						
							|  |  |  | 348af68,d92800 | 
					
						
							|  |  |  | 348af6c,80407d94 | 
					
						
							|  |  |  | 348af70,80407890 | 
					
						
							|  |  |  | 348af74,ffffffff | 
					
						
							|  |  |  | 348af78,ffffffff | 
					
						
							|  |  |  | 348af7c,cd1e00 | 
					
						
							|  |  |  | 348af80,80407d84 | 
					
						
							|  |  |  | 348af84,80407890 | 
					
						
							|  |  |  | 348af88,ffffffff | 
					
						
							|  |  |  | 348af8c,ffffffff | 
					
						
							|  |  |  | 348af90,10e4600 | 
					
						
							|  |  |  | 348af94,80407dc4 | 
					
						
							|  |  |  | 348af98,80407890 | 
					
						
							|  |  |  | 348af9c,ffffffff | 
					
						
							|  |  |  | 348afa0,53410043 | 
					
						
							|  |  |  | 348afa4,c60100 | 
					
						
							|  |  |  | 348afa8,80407c38 | 
					
						
							|  |  |  | 348afac,804079a4 | 
					
						
							|  |  |  | 348afb0,15ffff | 
					
						
							|  |  |  | 348afb4,53410044 | 
					
						
							|  |  |  | 348afb8,c60100 | 
					
						
							|  |  |  | 348afbc,80407c38 | 
					
						
							|  |  |  | 348afc0,804079a4 | 
					
						
							|  |  |  | 348afc4,16ffff | 
					
						
							|  |  |  | 348afc8,53410045 | 
					
						
							|  |  |  | 348afcc,c60100 | 
					
						
							|  |  |  | 348afd0,80407c38 | 
					
						
							|  |  |  | 348afd4,804079a4 | 
					
						
							|  |  |  | 348afd8,17ffff | 
					
						
							|  |  |  | 348afdc,53410046 | 
					
						
							|  |  |  | 348afe0,1776b00 | 
					
						
							|  |  |  | 348afe4,80407c38 | 
					
						
							|  |  |  | 348afe8,804079a4 | 
					
						
							|  |  |  | 348afec,18ffff | 
					
						
							|  |  |  | 348aff0,53410047 | 
					
						
							|  |  |  | 348aff4,f43f00 | 
					
						
							|  |  |  | 348aff8,80407c38 | 
					
						
							|  |  |  | 348affc,804079a4 | 
					
						
							|  |  |  | 348b000,19ffff | 
					
						
							|  |  |  | 348b004,5341005d | 
					
						
							|  |  |  | 348b008,1736700 | 
					
						
							|  |  |  | 348b00c,80407c38 | 
					
						
							|  |  |  | 348b010,804079a4 | 
					
						
							|  |  |  | 348b014,1cffff | 
					
						
							|  |  |  | 348b018,5341007a | 
					
						
							|  |  |  | 348b01c,1746800 | 
					
						
							|  |  |  | 348b020,80407c38 | 
					
						
							|  |  |  | 348b024,804079a4 | 
					
						
							|  |  |  | 348b028,1dffff | 
					
						
							|  |  |  | 348b02c,534100f9 | 
					
						
							|  |  |  | 348b030,1767000 | 
					
						
							|  |  |  | 348b034,80407c38 | 
					
						
							|  |  |  | 348b038,804079a4 | 
					
						
							|  |  |  | 348b03c,1effff | 
					
						
							|  |  |  | 348b040,53410097 | 
					
						
							|  |  |  | 348b044,1766a00 | 
					
						
							|  |  |  | 348b048,80407c38 | 
					
						
							|  |  |  | 348b04c,804079a4 | 
					
						
							|  |  |  | 348b050,20ffff | 
					
						
							|  |  |  | 348b054,53410006 | 
					
						
							|  |  |  | 348b058,b90a02 | 
					
						
							|  |  |  | 348b05c,80407c38 | 
					
						
							|  |  |  | 348b060,804079dc | 
					
						
							|  |  |  | 348b064,10003 | 
					
						
							|  |  |  | 348b068,5341001c | 
					
						
							|  |  |  | 348b06c,b90a02 | 
					
						
							|  |  |  | 348b070,80407c38 | 
					
						
							|  |  |  | 348b074,804079dc | 
					
						
							|  |  |  | 348b078,10004 | 
					
						
							|  |  |  | 348b07c,5341001d | 
					
						
							|  |  |  | 348b080,b90a02 | 
					
						
							|  |  |  | 348b084,80407c38 | 
					
						
							|  |  |  | 348b088,804079dc | 
					
						
							|  |  |  | 348b08c,10005 | 
					
						
							|  |  |  | 348b090,5341001e | 
					
						
							|  |  |  | 348b094,b90a02 | 
					
						
							|  |  |  | 348b098,80407c38 | 
					
						
							|  |  |  | 348b09c,804079dc | 
					
						
							|  |  |  | 348b0a0,10006 | 
					
						
							|  |  |  | 348b0a4,5341002a | 
					
						
							|  |  |  | 348b0a8,b90a02 | 
					
						
							|  |  |  | 348b0ac,80407c38 | 
					
						
							|  |  |  | 348b0b0,804079dc | 
					
						
							|  |  |  | 348b0b4,10007 | 
					
						
							|  |  |  | 348b0b8,53410061 | 
					
						
							|  |  |  | 348b0bc,b90a02 | 
					
						
							|  |  |  | 348b0c0,80407c38 | 
					
						
							|  |  |  | 348b0c4,804079dc | 
					
						
							|  |  |  | 348b0c8,1000a | 
					
						
							|  |  |  | 348b0cc,53410062 | 
					
						
							|  |  |  | 348b0d0,b80b01 | 
					
						
							|  |  |  | 348b0d4,80407c38 | 
					
						
							|  |  |  | 348b0d8,804079dc | 
					
						
							|  |  |  | 348b0dc,20000 | 
					
						
							|  |  |  | 348b0e0,53410063 | 
					
						
							|  |  |  | 348b0e4,b80b01 | 
					
						
							|  |  |  | 348b0e8,80407c38 | 
					
						
							|  |  |  | 348b0ec,804079dc | 
					
						
							|  |  |  | 348b0f0,20001 | 
					
						
							|  |  |  | 348b0f4,53410064 | 
					
						
							|  |  |  | 348b0f8,b80b01 | 
					
						
							|  |  |  | 348b0fc,80407c38 | 
					
						
							|  |  |  | 348b100,804079dc | 
					
						
							|  |  |  | 348b104,20002 | 
					
						
							|  |  |  | 348b108,53410065 | 
					
						
							|  |  |  | 348b10c,b80b01 | 
					
						
							|  |  |  | 348b110,80407c38 | 
					
						
							|  |  |  | 348b114,804079dc | 
					
						
							|  |  |  | 348b118,20003 | 
					
						
							|  |  |  | 348b11c,5341007c | 
					
						
							|  |  |  | 348b120,b80b01 | 
					
						
							|  |  |  | 348b124,80407c38 | 
					
						
							|  |  |  | 348b128,804079dc | 
					
						
							|  |  |  | 348b12c,20004 | 
					
						
							|  |  |  | 348b130,5341007d | 
					
						
							|  |  |  | 348b134,b80b01 | 
					
						
							|  |  |  | 348b138,80407c38 | 
					
						
							|  |  |  | 348b13c,804079dc | 
					
						
							|  |  |  | 348b140,20005 | 
					
						
							|  |  |  | 348b144,5341007e | 
					
						
							|  |  |  | 348b148,b80b01 | 
					
						
							|  |  |  | 348b14c,80407c38 | 
					
						
							|  |  |  | 348b150,804079dc | 
					
						
							|  |  |  | 348b154,20006 | 
					
						
							|  |  |  | 348b158,5341007f | 
					
						
							|  |  |  | 348b15c,b80b01 | 
					
						
							|  |  |  | 348b160,80407c38 | 
					
						
							|  |  |  | 348b164,804079dc | 
					
						
							|  |  |  | 348b168,20007 | 
					
						
							|  |  |  | 348b16c,534100a2 | 
					
						
							|  |  |  | 348b170,b80b01 | 
					
						
							|  |  |  | 348b174,80407c38 | 
					
						
							|  |  |  | 348b178,804079dc | 
					
						
							|  |  |  | 348b17c,20008 | 
					
						
							|  |  |  | 348b180,53410087 | 
					
						
							|  |  |  | 348b184,b80b01 | 
					
						
							|  |  |  | 348b188,80407c38 | 
					
						
							|  |  |  | 348b18c,804079dc | 
					
						
							|  |  |  | 348b190,20009 | 
					
						
							|  |  |  | 348b194,53410088 | 
					
						
							|  |  |  | 348b198,c81c01 | 
					
						
							|  |  |  | 348b19c,80407c38 | 
					
						
							|  |  |  | 348b1a0,804079dc | 
					
						
							|  |  |  | 348b1a4,40000 | 
					
						
							|  |  |  | 348b1a8,53410089 | 
					
						
							|  |  |  | 348b1ac,c81c01 | 
					
						
							|  |  |  | 348b1b0,80407c38 | 
					
						
							|  |  |  | 348b1b4,804079dc | 
					
						
							|  |  |  | 348b1b8,40001 | 
					
						
							|  |  |  | 348b1bc,5341008a | 
					
						
							|  |  |  | 348b1c0,c81c01 | 
					
						
							|  |  |  | 348b1c4,80407c38 | 
					
						
							|  |  |  | 348b1c8,804079dc | 
					
						
							|  |  |  | 348b1cc,40002 | 
					
						
							|  |  |  | 348b1d0,5341008b | 
					
						
							|  |  |  | 348b1d4,c81c01 | 
					
						
							|  |  |  | 348b1d8,80407c38 | 
					
						
							|  |  |  | 348b1dc,804079dc | 
					
						
							|  |  |  | 348b1e0,40003 | 
					
						
							|  |  |  | 348b1e4,5341008c | 
					
						
							|  |  |  | 348b1e8,c81c01 | 
					
						
							|  |  |  | 348b1ec,80407c38 | 
					
						
							|  |  |  | 348b1f0,804079dc | 
					
						
							|  |  |  | 348b1f4,40004 | 
					
						
							|  |  |  | 348b1f8,5341008e | 
					
						
							|  |  |  | 348b1fc,c81c01 | 
					
						
							|  |  |  | 348b200,80407c38 | 
					
						
							|  |  |  | 348b204,804079dc | 
					
						
							|  |  |  | 348b208,40005 | 
					
						
							|  |  |  | 348b20c,5341008f | 
					
						
							|  |  |  | 348b210,c81c01 | 
					
						
							|  |  |  | 348b214,80407c38 | 
					
						
							|  |  |  | 348b218,804079dc | 
					
						
							|  |  |  | 348b21c,40006 | 
					
						
							|  |  |  | 348b220,534100a3 | 
					
						
							|  |  |  | 348b224,c81c01 | 
					
						
							|  |  |  | 348b228,80407c38 | 
					
						
							|  |  |  | 348b22c,804079dc | 
					
						
							|  |  |  | 348b230,40007 | 
					
						
							|  |  |  | 348b234,534100a5 | 
					
						
							|  |  |  | 348b238,c81c01 | 
					
						
							|  |  |  | 348b23c,80407c38 | 
					
						
							|  |  |  | 348b240,804079dc | 
					
						
							|  |  |  | 348b244,40008 | 
					
						
							|  |  |  | 348b248,53410092 | 
					
						
							|  |  |  | 348b24c,c81c01 | 
					
						
							|  |  |  | 348b250,80407c38 | 
					
						
							|  |  |  | 348b254,804079dc | 
					
						
							|  |  |  | 348b258,40009 | 
					
						
							|  |  |  | 348b25c,53410093 | 
					
						
							|  |  |  | 348b260,aa0203 | 
					
						
							|  |  |  | 348b264,80407c38 | 
					
						
							|  |  |  | 348b268,804079f0 | 
					
						
							|  |  |  | 348b26c,3ffff | 
					
						
							|  |  |  | 348b270,53410094 | 
					
						
							|  |  |  | 348b274,aa0203 | 
					
						
							|  |  |  | 348b278,80407c38 | 
					
						
							|  |  |  | 348b27c,804079f0 | 
					
						
							|  |  |  | 348b280,4ffff | 
					
						
							|  |  |  | 348b284,53410095 | 
					
						
							|  |  |  | 348b288,aa0203 | 
					
						
							|  |  |  | 348b28c,80407c38 | 
					
						
							|  |  |  | 348b290,804079f0 | 
					
						
							|  |  |  | 348b294,5ffff | 
					
						
							|  |  |  | 348b298,534100a6 | 
					
						
							|  |  |  | 348b29c,aa0203 | 
					
						
							|  |  |  | 348b2a0,80407c38 | 
					
						
							|  |  |  | 348b2a4,804079f0 | 
					
						
							|  |  |  | 348b2a8,6ffff | 
					
						
							|  |  |  | 348b2ac,534100a9 | 
					
						
							|  |  |  | 348b2b0,aa0203 | 
					
						
							|  |  |  | 348b2b4,80407c38 | 
					
						
							|  |  |  | 348b2b8,804079f0 | 
					
						
							|  |  |  | 348b2bc,7ffff | 
					
						
							|  |  |  | 348b2c0,5341009b | 
					
						
							|  |  |  | 348b2c4,aa0203 | 
					
						
							|  |  |  | 348b2c8,80407c38 | 
					
						
							|  |  |  | 348b2cc,804079f0 | 
					
						
							|  |  |  | 348b2d0,8ffff | 
					
						
							|  |  |  | 348b2d4,5341009f | 
					
						
							|  |  |  | 348b2d8,aa0203 | 
					
						
							|  |  |  | 348b2dc,80407c38 | 
					
						
							|  |  |  | 348b2e0,804079f0 | 
					
						
							|  |  |  | 348b2e4,bffff | 
					
						
							|  |  |  | 348b2e8,534100a0 | 
					
						
							|  |  |  | 348b2ec,aa0203 | 
					
						
							|  |  |  | 348b2f0,80407c38 | 
					
						
							|  |  |  | 348b2f4,804079f0 | 
					
						
							|  |  |  | 348b2f8,cffff | 
					
						
							|  |  |  | 348b2fc,534100a1 | 
					
						
							|  |  |  | 348b300,aa0203 | 
					
						
							|  |  |  | 348b304,80407c38 | 
					
						
							|  |  |  | 348b308,804079f0 | 
					
						
							|  |  |  | 348b30c,dffff | 
					
						
							|  |  |  | 348b310,534100e9 | 
					
						
							|  |  |  | 348b314,1941300 | 
					
						
							|  |  |  | 348b318,80407c38 | 
					
						
							|  |  |  | 348b31c,80407a14 | 
					
						
							|  |  |  | 348b320,ffffffff | 
					
						
							|  |  |  | 348b324,534100e4 | 
					
						
							|  |  |  | 348b328,cd1e00 | 
					
						
							|  |  |  | 348b32c,80407c38 | 
					
						
							|  |  |  | 348b330,80407a30 | 
					
						
							|  |  |  | 348b334,ffffffff | 
					
						
							|  |  |  | 348b338,534100e8 | 
					
						
							|  |  |  | 348b33c,cd1f00 | 
					
						
							|  |  |  | 348b340,80407c38 | 
					
						
							|  |  |  | 348b344,80407a4c | 
					
						
							|  |  |  | 348b348,ffffffff | 
					
						
							|  |  |  | 348b34c,53410073 | 
					
						
							|  |  |  | 348b350,b60300 | 
					
						
							|  |  |  | 348b354,80407c38 | 
					
						
							|  |  |  | 348b358,80407a7c | 
					
						
							|  |  |  | 348b35c,6ffff | 
					
						
							|  |  |  | 348b360,53410074 | 
					
						
							|  |  |  | 348b364,b60400 | 
					
						
							|  |  |  | 348b368,80407c38 | 
					
						
							|  |  |  | 348b36c,80407a7c | 
					
						
							|  |  |  | 348b370,7ffff | 
					
						
							|  |  |  | 348b374,53410075 | 
					
						
							|  |  |  | 348b378,b60500 | 
					
						
							|  |  |  | 348b37c,80407c38 | 
					
						
							|  |  |  | 348b380,80407a7c | 
					
						
							|  |  |  | 348b384,8ffff | 
					
						
							|  |  |  | 348b388,53410076 | 
					
						
							|  |  |  | 348b38c,b60600 | 
					
						
							|  |  |  | 348b390,80407c38 | 
					
						
							|  |  |  | 348b394,80407a7c | 
					
						
							|  |  |  | 348b398,9ffff | 
					
						
							|  |  |  | 348b39c,53410077 | 
					
						
							|  |  |  | 348b3a0,b60700 | 
					
						
							|  |  |  | 348b3a4,80407c38 | 
					
						
							|  |  |  | 348b3a8,80407a7c | 
					
						
							|  |  |  | 348b3ac,affff | 
					
						
							|  |  |  | 348b3b0,53410078 | 
					
						
							|  |  |  | 348b3b4,b60800 | 
					
						
							|  |  |  | 348b3b8,80407c38 | 
					
						
							|  |  |  | 348b3bc,80407a7c | 
					
						
							|  |  |  | 348b3c0,bffff | 
					
						
							|  |  |  | 348b3c4,534100d4 | 
					
						
							|  |  |  | 348b3c8,b60400 | 
					
						
							|  |  |  | 348b3cc,80407c38 | 
					
						
							|  |  |  | 348b3d0,80407a7c | 
					
						
							|  |  |  | 348b3d4,cffff | 
					
						
							|  |  |  | 348b3d8,534100d2 | 
					
						
							|  |  |  | 348b3dc,b60600 | 
					
						
							|  |  |  | 348b3e0,80407c38 | 
					
						
							|  |  |  | 348b3e4,80407a7c | 
					
						
							|  |  |  | 348b3e8,dffff | 
					
						
							|  |  |  | 348b3ec,534100d1 | 
					
						
							|  |  |  | 348b3f0,b60300 | 
					
						
							|  |  |  | 348b3f4,80407c38 | 
					
						
							|  |  |  | 348b3f8,80407a7c | 
					
						
							|  |  |  | 348b3fc,effff | 
					
						
							|  |  |  | 348b400,534100d3 | 
					
						
							|  |  |  | 348b404,b60800 | 
					
						
							|  |  |  | 348b408,80407c38 | 
					
						
							|  |  |  | 348b40c,80407a7c | 
					
						
							|  |  |  | 348b410,fffff | 
					
						
							|  |  |  | 348b414,534100d5 | 
					
						
							|  |  |  | 348b418,b60500 | 
					
						
							|  |  |  | 348b41c,80407c38 | 
					
						
							|  |  |  | 348b420,80407a7c | 
					
						
							|  |  |  | 348b424,10ffff | 
					
						
							|  |  |  | 348b428,534100d6 | 
					
						
							|  |  |  | 348b42c,b60700 | 
					
						
							|  |  |  | 348b430,80407c38 | 
					
						
							|  |  |  | 348b434,80407a7c | 
					
						
							|  |  |  | 348b438,11ffff | 
					
						
							|  |  |  | 348b43c,534100f8 | 
					
						
							|  |  |  | 348b440,d12300 | 
					
						
							|  |  |  | 348b444,80407c38 | 
					
						
							|  |  |  | 348b448,80407960 | 
					
						
							|  |  |  | 348b44c,3ffff | 
					
						
							|  |  |  | 348b450,53149099 | 
					
						
							|  |  |  | 348b454,10b4500 | 
					
						
							|  |  |  | 348b458,80407c38 | 
					
						
							|  |  |  | 348b45c,80407890 | 
					
						
							|  |  |  | 348b460,ffffffff | 
					
						
							|  |  |  | 348b464,53419048 | 
					
						
							|  |  |  | 348b468,f33e00 | 
					
						
							|  |  |  | 348b46c,80407c38 | 
					
						
							|  |  |  | 348b470,80407ab0 | 
					
						
							|  |  |  | 348b474,ffffffff | 
					
						
							|  |  |  | 348b478,53419003 | 
					
						
							|  |  |  | 348b47c,1933500 | 
					
						
							|  |  |  | 348b480,80407c38 | 
					
						
							|  |  |  | 348b484,804078a4 | 
					
						
							|  |  |  | 348b488,ffffffff | 
					
						
							|  |  |  | 348b48c,53419097 | 
					
						
							|  |  |  | 348b490,ef3b00 | 
					
						
							|  |  |  | 348b494,80407c38 | 
					
						
							|  |  |  | 348b498,80407890 | 
					
						
							|  |  |  | 348b49c,ffffffff | 
					
						
							|  |  |  | 348b4a0,4d419098 | 
					
						
							|  |  |  | 348b4a4,ef3b01 | 
					
						
							|  |  |  | 348b4a8,80407c38 | 
					
						
							|  |  |  | 348b4ac,80407890 | 
					
						
							|  |  |  | 348b4b0,ffffffff | 
					
						
							|  |  |  | 348b4b8,1 | 
					
						
							|  |  |  | 348b4bc,1 | 
					
						
							|  |  |  | 348b4c0,d | 
					
						
							|  |  |  | 348b4c4,41200000 | 
					
						
							|  |  |  | 348b4c8,41200000 | 
					
						
							|  |  |  | 348b4cc,8040a458 | 
					
						
							|  |  |  | 348b4d0,8040a448 | 
					
						
							|  |  |  | 348b4d8,df000000 | 
					
						
							|  |  |  | 348b4e0,80112f1a | 
					
						
							|  |  |  | 348b4e4,80112f14 | 
					
						
							|  |  |  | 348b4e8,80112f0e | 
					
						
							|  |  |  | 348b4ec,80112f08 | 
					
						
							|  |  |  | 348b4f0,8011320a | 
					
						
							|  |  |  | 348b4f4,80113204 | 
					
						
							|  |  |  | 348b4f8,801131fe | 
					
						
							|  |  |  | 348b4fc,801131f8 | 
					
						
							|  |  |  | 348b500,801131f2 | 
					
						
							|  |  |  | 348b504,801131ec | 
					
						
							|  |  |  | 348b508,801131e6 | 
					
						
							|  |  |  | 348b50c,801131e0 | 
					
						
							|  |  |  | 348b510,8012be1e | 
					
						
							|  |  |  | 348b514,8012be20 | 
					
						
							|  |  |  | 348b518,8012be1c | 
					
						
							|  |  |  | 348b51c,8012be12 | 
					
						
							|  |  |  | 348b520,8012be14 | 
					
						
							|  |  |  | 348b524,8012be10 | 
					
						
							|  |  |  | 348b528,801c7672 | 
					
						
							|  |  |  | 348b52c,801c767a | 
					
						
							|  |  |  | 348b530,801c7950 | 
					
						
							|  |  |  | 348b534,8011bd50 | 
					
						
							|  |  |  | 348b538,8011bd38 | 
					
						
							|  |  |  | 348b53c,801d8b9e | 
					
						
							|  |  |  | 348b540,801d8b92 | 
					
						
							|  |  |  | 348b544,c80000 | 
					
						
							|  |  |  | 348b54c,ff0046 | 
					
						
							|  |  |  | 348b550,32ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348c6a0,db000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348c6a4,db000 | 
					
						
							|  |  |  | 348c6a8,db000 | 
					
						
							|  |  |  | 348c6ac,cb000 | 
					
						
							|  |  |  | 348c6b0,cb000 | 
					
						
							|  |  |  | 348c6b4,ca000 | 
					
						
							|  |  |  | 348c6bc,db000 | 
					
						
							|  |  |  | 348c6c0,db000 | 
					
						
							|  |  |  | 348c6d8,e8ac00 | 
					
						
							|  |  |  | 348c6dc,e8ac00 | 
					
						
							|  |  |  | 348c6e0,e8ac00 | 
					
						
							|  |  |  | 348c6e4,e8ac00 | 
					
						
							|  |  |  | 348c70c,d77d0 | 
					
						
							|  |  |  | 348c710,2e3ab0 | 
					
						
							|  |  |  | 348c714,7d0c90 | 
					
						
							|  |  |  | 348c718,8ffffffd | 
					
						
							|  |  |  | 348c71c,c96e00 | 
					
						
							|  |  |  | 348c720,2e4ac00 | 
					
						
							|  |  |  | 348c724,effffff4 | 
					
						
							|  |  |  | 348c728,ab0e500 | 
					
						
							|  |  |  | 348c72c,c95e000 | 
					
						
							|  |  |  | 348c730,e59c000 | 
					
						
							|  |  |  | 348c748,79000 | 
					
						
							|  |  |  | 348c74c,5ceeb40 | 
					
						
							|  |  |  | 348c750,cc8a990 | 
					
						
							|  |  |  | 348c754,da79000 | 
					
						
							|  |  |  | 348c758,8ecb400 | 
					
						
							|  |  |  | 348c75c,4adda0 | 
					
						
							|  |  |  | 348c760,797e2 | 
					
						
							|  |  |  | 348c764,c88aae0 | 
					
						
							|  |  |  | 348c768,6ceed70 | 
					
						
							|  |  |  | 348c76c,79000 | 
					
						
							|  |  |  | 348c770,79000 | 
					
						
							|  |  |  | 348c780,6dea0000 | 
					
						
							|  |  |  | 348c784,c94d6000 | 
					
						
							|  |  |  | 348c788,c94d6033 | 
					
						
							|  |  |  | 348c78c,6deb6bc6 | 
					
						
							|  |  |  | 348c790,8cb600 | 
					
						
							|  |  |  | 348c794,7ca4cec4 | 
					
						
							|  |  |  | 348c798,3109c3bb | 
					
						
							|  |  |  | 348c79c,9c3bb | 
					
						
							|  |  |  | 348c7a0,2ced4 | 
					
						
							|  |  |  | 348c7b8,4cefb00 | 
					
						
							|  |  |  | 348c7bc,ad50000 | 
					
						
							|  |  |  | 348c7c0,8e30000 | 
					
						
							|  |  |  | 348c7c4,9ec0000 | 
					
						
							|  |  |  | 348c7c8,7e4db0ab | 
					
						
							|  |  |  | 348c7cc,bb05e8aa | 
					
						
							|  |  |  | 348c7d0,bc008ed6 | 
					
						
							|  |  |  | 348c7d4,7e936ed0 | 
					
						
							|  |  |  | 348c7d8,8ded9ea | 
					
						
							|  |  |  | 348c7f0,ca000 | 
					
						
							|  |  |  | 348c7f4,ca000 | 
					
						
							|  |  |  | 348c7f8,ca000 | 
					
						
							|  |  |  | 348c7fc,ca000 | 
					
						
							|  |  |  | 348c820,c900 | 
					
						
							|  |  |  | 348c824,7e200 | 
					
						
							|  |  |  | 348c828,cb000 | 
					
						
							|  |  |  | 348c82c,e8000 | 
					
						
							|  |  |  | 348c830,6f3000 | 
					
						
							|  |  |  | 348c834,8e0000 | 
					
						
							|  |  |  | 348c838,8e0000 | 
					
						
							|  |  |  | 348c83c,6f4000 | 
					
						
							|  |  |  | 348c840,e8000 | 
					
						
							|  |  |  | 348c844,cb000 | 
					
						
							|  |  |  | 348c848,7e200 | 
					
						
							|  |  |  | 348c84c,c900 | 
					
						
							|  |  |  | 348c858,bb0000 | 
					
						
							|  |  |  | 348c85c,5e4000 | 
					
						
							|  |  |  | 348c860,ca000 | 
					
						
							|  |  |  | 348c864,ad000 | 
					
						
							|  |  |  | 348c868,7e100 | 
					
						
							|  |  |  | 348c86c,6f400 | 
					
						
							|  |  |  | 348c870,6f400 | 
					
						
							|  |  |  | 348c874,7e100 | 
					
						
							|  |  |  | 348c878,ad000 | 
					
						
							|  |  |  | 348c87c,ca000 | 
					
						
							|  |  |  | 348c880,5e4000 | 
					
						
							|  |  |  | 348c884,bb0000 | 
					
						
							|  |  |  | 348c898,a8000 | 
					
						
							|  |  |  | 348c89c,c8a8ab0 | 
					
						
							|  |  |  | 348c8a0,3beda10 | 
					
						
							|  |  |  | 348c8a4,3beda10 | 
					
						
							|  |  |  | 348c8a8,c8a8ab0 | 
					
						
							|  |  |  | 348c8ac,a8000 | 
					
						
							|  |  |  | 348c8d4,ca000 | 
					
						
							|  |  |  | 348c8d8,ca000 | 
					
						
							|  |  |  | 348c8dc,ca000 | 
					
						
							|  |  |  | 348c8e0,affffff8 | 
					
						
							|  |  |  | 348c8e4,ca000 | 
					
						
							|  |  |  | 348c8e8,ca000 | 
					
						
							|  |  |  | 348c8ec,ca000 | 
					
						
							|  |  |  | 348c924,dd000 | 
					
						
							|  |  |  | 348c928,ec000 | 
					
						
							|  |  |  | 348c92c,4f8000 | 
					
						
							|  |  |  | 348c930,9d0000 | 
					
						
							|  |  |  | 348c954,dffb00 | 
					
						
							|  |  |  | 348c994,ec000 | 
					
						
							|  |  |  | 348c998,ec000 | 
					
						
							|  |  |  | 348c9b0,bc0 | 
					
						
							|  |  |  | 348c9b4,4e60 | 
					
						
							|  |  |  | 348c9b8,bc00 | 
					
						
							|  |  |  | 348c9bc,3e800 | 
					
						
							|  |  |  | 348c9c0,ad000 | 
					
						
							|  |  |  | 348c9c4,1e9000 | 
					
						
							|  |  |  | 348c9c8,9e2000 | 
					
						
							|  |  |  | 348c9cc,da0000 | 
					
						
							|  |  |  | 348c9d0,7e30000 | 
					
						
							|  |  |  | 348c9d4,cb00000 | 
					
						
							|  |  |  | 348c9d8,6e500000 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348c9e8,3ceeb00 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348c9ec,bd57e90 | 
					
						
							|  |  |  | 348c9f0,e900bd0 | 
					
						
							|  |  |  | 348c9f4,5f7009e0 | 
					
						
							|  |  |  | 348c9f8,6f6cb9e0 | 
					
						
							|  |  |  | 348c9fc,5f7009e0 | 
					
						
							|  |  |  | 348ca00,e900bd0 | 
					
						
							|  |  |  | 348ca04,bd57e90 | 
					
						
							|  |  |  | 348ca08,3ceeb00 | 
					
						
							|  |  |  | 348ca20,affe000 | 
					
						
							|  |  |  | 348ca24,8e000 | 
					
						
							|  |  |  | 348ca28,8e000 | 
					
						
							|  |  |  | 348ca2c,8e000 | 
					
						
							|  |  |  | 348ca30,8e000 | 
					
						
							|  |  |  | 348ca34,8e000 | 
					
						
							|  |  |  | 348ca38,8e000 | 
					
						
							|  |  |  | 348ca3c,8e000 | 
					
						
							|  |  |  | 348ca40,8ffffe0 | 
					
						
							|  |  |  | 348ca58,8deea00 | 
					
						
							|  |  |  | 348ca5c,c837e90 | 
					
						
							|  |  |  | 348ca60,cc0 | 
					
						
							|  |  |  | 348ca64,2ea0 | 
					
						
							|  |  |  | 348ca68,bd20 | 
					
						
							|  |  |  | 348ca6c,bd400 | 
					
						
							|  |  |  | 348ca70,bd4000 | 
					
						
							|  |  |  | 348ca74,bd40000 | 
					
						
							|  |  |  | 348ca78,2fffffd0 | 
					
						
							|  |  |  | 348ca90,7ceea00 | 
					
						
							|  |  |  | 348ca94,c837e90 | 
					
						
							|  |  |  | 348ca98,cb0 | 
					
						
							|  |  |  | 348ca9c,27e90 | 
					
						
							|  |  |  | 348caa0,bffb00 | 
					
						
							|  |  |  | 348caa4,27da0 | 
					
						
							|  |  |  | 348caa8,ad0 | 
					
						
							|  |  |  | 348caac,5c627db0 | 
					
						
							|  |  |  | 348cab0,9deeb30 | 
					
						
							|  |  |  | 348cac8,2de00 | 
					
						
							|  |  |  | 348cacc,bde00 | 
					
						
							|  |  |  | 348cad0,7d9e00 | 
					
						
							|  |  |  | 348cad4,2d79e00 | 
					
						
							|  |  |  | 348cad8,bb09e00 | 
					
						
							|  |  |  | 348cadc,6e409e00 | 
					
						
							|  |  |  | 348cae0,9ffffff7 | 
					
						
							|  |  |  | 348cae4,9e00 | 
					
						
							|  |  |  | 348cae8,9e00 | 
					
						
							|  |  |  | 348cb00,cffff50 | 
					
						
							|  |  |  | 348cb04,ca00000 | 
					
						
							|  |  |  | 348cb08,ca00000 | 
					
						
							|  |  |  | 348cb0c,ceeea00 | 
					
						
							|  |  |  | 348cb10,38e90 | 
					
						
							|  |  |  | 348cb14,bc0 | 
					
						
							|  |  |  | 348cb18,bc0 | 
					
						
							|  |  |  | 348cb1c,5c638e90 | 
					
						
							|  |  |  | 348cb20,9deda00 | 
					
						
							|  |  |  | 348cb38,aeec30 | 
					
						
							|  |  |  | 348cb3c,ae83980 | 
					
						
							|  |  |  | 348cb40,e900000 | 
					
						
							|  |  |  | 348cb44,4faeec40 | 
					
						
							|  |  |  | 348cb48,6fd55dc0 | 
					
						
							|  |  |  | 348cb4c,5f9009e0 | 
					
						
							|  |  |  | 348cb50,e9009e0 | 
					
						
							|  |  |  | 348cb54,cd55dc0 | 
					
						
							|  |  |  | 348cb58,3ceec40 | 
					
						
							|  |  |  | 348cb70,5fffffd0 | 
					
						
							|  |  |  | 348cb74,da0 | 
					
						
							|  |  |  | 348cb78,7e40 | 
					
						
							|  |  |  | 348cb7c,cc00 | 
					
						
							|  |  |  | 348cb80,4e800 | 
					
						
							|  |  |  | 348cb84,ad000 | 
					
						
							|  |  |  | 348cb88,da000 | 
					
						
							|  |  |  | 348cb8c,8e4000 | 
					
						
							|  |  |  | 348cb90,cc0000 | 
					
						
							|  |  |  | 348cba8,5ceec30 | 
					
						
							|  |  |  | 348cbac,dc45db0 | 
					
						
							|  |  |  | 348cbb0,e900bd0 | 
					
						
							|  |  |  | 348cbb4,bc45d90 | 
					
						
							|  |  |  | 348cbb8,4dffc20 | 
					
						
							|  |  |  | 348cbbc,1db45cc0 | 
					
						
							|  |  |  | 348cbc0,5f6009e0 | 
					
						
							|  |  |  | 348cbc4,2eb35cd0 | 
					
						
							|  |  |  | 348cbc8,7deec50 | 
					
						
							|  |  |  | 348cbe0,6deeb00 | 
					
						
							|  |  |  | 348cbe4,db37e90 | 
					
						
							|  |  |  | 348cbe8,5f500bd0 | 
					
						
							|  |  |  | 348cbec,5f500be0 | 
					
						
							|  |  |  | 348cbf0,db37ee0 | 
					
						
							|  |  |  | 348cbf4,6dedbe0 | 
					
						
							|  |  |  | 348cbf8,bc0 | 
					
						
							|  |  |  | 348cbfc,9749e70 | 
					
						
							|  |  |  | 348cc00,5ded800 | 
					
						
							|  |  |  | 348cc20,ec000 | 
					
						
							|  |  |  | 348cc24,ec000 | 
					
						
							|  |  |  | 348cc34,ec000 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348cc38,ec000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348cc58,ec000 | 
					
						
							|  |  |  | 348cc5c,ec000 | 
					
						
							|  |  |  | 348cc6c,dd000 | 
					
						
							|  |  |  | 348cc70,ec000 | 
					
						
							|  |  |  | 348cc74,4f8000 | 
					
						
							|  |  |  | 348cc78,9d0000 | 
					
						
							|  |  |  | 348cc90,29c8 | 
					
						
							|  |  |  | 348cc94,7bed93 | 
					
						
							|  |  |  | 348cc98,8dda4000 | 
					
						
							|  |  |  | 348cc9c,8dda4000 | 
					
						
							|  |  |  | 348cca0,7bec93 | 
					
						
							|  |  |  | 348cca4,29c8 | 
					
						
							|  |  |  | 348cccc,affffff8 | 
					
						
							|  |  |  | 348ccd8,affffff8 | 
					
						
							|  |  |  | 348cd00,ac810000 | 
					
						
							|  |  |  | 348cd04,4adeb600 | 
					
						
							|  |  |  | 348cd08,6add6 | 
					
						
							|  |  |  | 348cd0c,6add6 | 
					
						
							|  |  |  | 348cd10,4adeb600 | 
					
						
							|  |  |  | 348cd14,ac810000 | 
					
						
							|  |  |  | 348cd30,4beec30 | 
					
						
							|  |  |  | 348cd34,9a46ea0 | 
					
						
							|  |  |  | 348cd38,1da0 | 
					
						
							|  |  |  | 348cd3c,2cd30 | 
					
						
							|  |  |  | 348cd40,cc100 | 
					
						
							|  |  |  | 348cd44,e9000 | 
					
						
							|  |  |  | 348cd4c,e9000 | 
					
						
							|  |  |  | 348cd50,e9000 | 
					
						
							|  |  |  | 348cd68,1aeed70 | 
					
						
							|  |  |  | 348cd6c,cd739e4 | 
					
						
							|  |  |  | 348cd70,7e2000c9 | 
					
						
							|  |  |  | 348cd74,ba0aeeca | 
					
						
							|  |  |  | 348cd78,d76e64da | 
					
						
							|  |  |  | 348cd7c,d69c00aa | 
					
						
							|  |  |  | 348cd80,d76e64da | 
					
						
							|  |  |  | 348cd84,ba0aeeca | 
					
						
							|  |  |  | 348cd88,6e400000 | 
					
						
							|  |  |  | 348cd8c,ad83000 | 
					
						
							|  |  |  | 348cd90,8dee90 | 
					
						
							|  |  |  | 348cda0,3ed000 | 
					
						
							|  |  |  | 348cda4,9de600 | 
					
						
							|  |  |  | 348cda8,cbcb00 | 
					
						
							|  |  |  | 348cdac,3e8ad00 | 
					
						
							|  |  |  | 348cdb0,8e26f60 | 
					
						
							|  |  |  | 348cdb4,cc00ea0 | 
					
						
							|  |  |  | 348cdb8,2effffd0 | 
					
						
							|  |  |  | 348cdbc,8e5008f5 | 
					
						
							|  |  |  | 348cdc0,cd0001ea | 
					
						
							|  |  |  | 348cdd8,effec40 | 
					
						
							|  |  |  | 348cddc,e905dc0 | 
					
						
							|  |  |  | 348cde0,e900ae0 | 
					
						
							|  |  |  | 348cde4,e905dc0 | 
					
						
							|  |  |  | 348cde8,efffd50 | 
					
						
							|  |  |  | 348cdec,e904bd2 | 
					
						
							|  |  |  | 348cdf0,e9005f6 | 
					
						
							|  |  |  | 348cdf4,e904be3 | 
					
						
							|  |  |  | 348cdf8,effed80 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ce10,9ded80 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ce14,8e936b0 | 
					
						
							|  |  |  | 348ce18,db00000 | 
					
						
							|  |  |  | 348ce1c,3f900000 | 
					
						
							|  |  |  | 348ce20,5f700000 | 
					
						
							|  |  |  | 348ce24,1e900000 | 
					
						
							|  |  |  | 348ce28,db00000 | 
					
						
							|  |  |  | 348ce2c,8e947b0 | 
					
						
							|  |  |  | 348ce30,9ded80 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ce48,5ffed800 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ce4c,5f65ae80 | 
					
						
							|  |  |  | 348ce50,5f600cd0 | 
					
						
							|  |  |  | 348ce54,5f6009e0 | 
					
						
							|  |  |  | 348ce58,5f6009f0 | 
					
						
							|  |  |  | 348ce5c,5f6009e0 | 
					
						
							|  |  |  | 348ce60,5f600cd0 | 
					
						
							|  |  |  | 348ce64,5f65ae80 | 
					
						
							|  |  |  | 348ce68,5ffed800 | 
					
						
							|  |  |  | 348ce80,dffffe0 | 
					
						
							|  |  |  | 348ce84,db00000 | 
					
						
							|  |  |  | 348ce88,db00000 | 
					
						
							|  |  |  | 348ce8c,db00000 | 
					
						
							|  |  |  | 348ce90,dffffc0 | 
					
						
							|  |  |  | 348ce94,db00000 | 
					
						
							|  |  |  | 348ce98,db00000 | 
					
						
							|  |  |  | 348ce9c,db00000 | 
					
						
							|  |  |  | 348cea0,dfffff0 | 
					
						
							|  |  |  | 348ceb8,bfffff4 | 
					
						
							|  |  |  | 348cebc,bd00000 | 
					
						
							|  |  |  | 348cec0,bd00000 | 
					
						
							|  |  |  | 348cec4,bd00000 | 
					
						
							|  |  |  | 348cec8,bffffc0 | 
					
						
							|  |  |  | 348cecc,bd00000 | 
					
						
							|  |  |  | 348ced0,bd00000 | 
					
						
							|  |  |  | 348ced4,bd00000 | 
					
						
							|  |  |  | 348ced8,bd00000 | 
					
						
							|  |  |  | 348cef0,1aeed60 | 
					
						
							|  |  |  | 348cef4,be738a0 | 
					
						
							|  |  |  | 348cef8,4e900000 | 
					
						
							|  |  |  | 348cefc,8f400000 | 
					
						
							|  |  |  | 348cf00,9f10bff2 | 
					
						
							|  |  |  | 348cf04,7f4007f2 | 
					
						
							|  |  |  | 348cf08,4e9007f2 | 
					
						
							|  |  |  | 348cf0c,be739f2 | 
					
						
							|  |  |  | 348cf10,1beed90 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348cf28,5f6009e0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348cf2c,5f6009e0 | 
					
						
							|  |  |  | 348cf30,5f6009e0 | 
					
						
							|  |  |  | 348cf34,5f6009e0 | 
					
						
							|  |  |  | 348cf38,5fffffe0 | 
					
						
							|  |  |  | 348cf3c,5f6009e0 | 
					
						
							|  |  |  | 348cf40,5f6009e0 | 
					
						
							|  |  |  | 348cf44,5f6009e0 | 
					
						
							|  |  |  | 348cf48,5f6009e0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348cf60,dffffb0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348cf64,db000 | 
					
						
							|  |  |  | 348cf68,db000 | 
					
						
							|  |  |  | 348cf6c,db000 | 
					
						
							|  |  |  | 348cf70,db000 | 
					
						
							|  |  |  | 348cf74,db000 | 
					
						
							|  |  |  | 348cf78,db000 | 
					
						
							|  |  |  | 348cf7c,db000 | 
					
						
							|  |  |  | 348cf80,dffffb0 | 
					
						
							|  |  |  | 348cf98,cfff40 | 
					
						
							|  |  |  | 348cf9c,7f40 | 
					
						
							|  |  |  | 348cfa0,7f40 | 
					
						
							|  |  |  | 348cfa4,7f40 | 
					
						
							|  |  |  | 348cfa8,7f40 | 
					
						
							|  |  |  | 348cfac,7f30 | 
					
						
							|  |  |  | 348cfb0,75009e00 | 
					
						
							|  |  |  | 348cfb4,8d64dc00 | 
					
						
							|  |  |  | 348cfb8,2beec500 | 
					
						
							|  |  |  | 348cfd0,5f6009e7 | 
					
						
							|  |  |  | 348cfd4,5f609e70 | 
					
						
							|  |  |  | 348cfd8,5f69e700 | 
					
						
							|  |  |  | 348cfdc,5fbe8000 | 
					
						
							|  |  |  | 348cfe0,5fedb000 | 
					
						
							|  |  |  | 348cfe4,5f87e800 | 
					
						
							|  |  |  | 348cfe8,5f60ae40 | 
					
						
							|  |  |  | 348cfec,5f601dc0 | 
					
						
							|  |  |  | 348cff0,5f6006ea | 
					
						
							|  |  |  | 348d008,cc00000 | 
					
						
							|  |  |  | 348d00c,cc00000 | 
					
						
							|  |  |  | 348d010,cc00000 | 
					
						
							|  |  |  | 348d014,cc00000 | 
					
						
							|  |  |  | 348d018,cc00000 | 
					
						
							|  |  |  | 348d01c,cc00000 | 
					
						
							|  |  |  | 348d020,cc00000 | 
					
						
							|  |  |  | 348d024,cc00000 | 
					
						
							|  |  |  | 348d028,cfffff7 | 
					
						
							|  |  |  | 348d040,afa00cf8 | 
					
						
							|  |  |  | 348d044,aed02ee8 | 
					
						
							|  |  |  | 348d048,add59be8 | 
					
						
							|  |  |  | 348d04c,adaac8e8 | 
					
						
							|  |  |  | 348d050,ad5de1e8 | 
					
						
							|  |  |  | 348d054,ad0db0e8 | 
					
						
							|  |  |  | 348d058,ad0000e8 | 
					
						
							|  |  |  | 348d05c,ad0000e8 | 
					
						
							|  |  |  | 348d060,ad0000e8 | 
					
						
							|  |  |  | 348d078,5fc008e0 | 
					
						
							|  |  |  | 348d07c,5fe608e0 | 
					
						
							|  |  |  | 348d080,5fcb08e0 | 
					
						
							|  |  |  | 348d084,5f7e48e0 | 
					
						
							|  |  |  | 348d088,5f5ca8e0 | 
					
						
							|  |  |  | 348d08c,5f57e8e0 | 
					
						
							|  |  |  | 348d090,5f50dce0 | 
					
						
							|  |  |  | 348d094,5f509ee0 | 
					
						
							|  |  |  | 348d098,5f502ee0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348d0b0,4ceeb20 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348d0b4,cd56ea0 | 
					
						
							|  |  |  | 348d0b8,3e800ae0 | 
					
						
							|  |  |  | 348d0bc,7f5008f2 | 
					
						
							|  |  |  | 348d0c0,7f4008f4 | 
					
						
							|  |  |  | 348d0c4,7f5008f2 | 
					
						
							|  |  |  | 348d0c8,3e800ae0 | 
					
						
							|  |  |  | 348d0cc,cd56eb0 | 
					
						
							|  |  |  | 348d0d0,4ceeb20 | 
					
						
							|  |  |  | 348d0e8,dffed60 | 
					
						
							|  |  |  | 348d0ec,db05ce2 | 
					
						
							|  |  |  | 348d0f0,db006f6 | 
					
						
							|  |  |  | 348d0f4,db006f6 | 
					
						
							|  |  |  | 348d0f8,db05ce2 | 
					
						
							|  |  |  | 348d0fc,dffed60 | 
					
						
							|  |  |  | 348d100,db00000 | 
					
						
							|  |  |  | 348d104,db00000 | 
					
						
							|  |  |  | 348d108,db00000 | 
					
						
							|  |  |  | 348d120,4ceeb20 | 
					
						
							|  |  |  | 348d124,cd56ea0 | 
					
						
							|  |  |  | 348d128,3e800ae0 | 
					
						
							|  |  |  | 348d12c,7f5008f2 | 
					
						
							|  |  |  | 348d130,7f4008f4 | 
					
						
							|  |  |  | 348d134,7f5008f1 | 
					
						
							|  |  |  | 348d138,3e800ad0 | 
					
						
							|  |  |  | 348d13c,cd56ea0 | 
					
						
							|  |  |  | 348d140,4cefc20 | 
					
						
							|  |  |  | 348d144,ae50 | 
					
						
							|  |  |  | 348d148,c80 | 
					
						
							|  |  |  | 348d158,5ffeeb20 | 
					
						
							|  |  |  | 348d15c,5f717eb0 | 
					
						
							|  |  |  | 348d160,5f700cd0 | 
					
						
							|  |  |  | 348d164,5f716ea0 | 
					
						
							|  |  |  | 348d168,5fffea00 | 
					
						
							|  |  |  | 348d16c,5f72ae40 | 
					
						
							|  |  |  | 348d170,5f700db0 | 
					
						
							|  |  |  | 348d174,5f7008e5 | 
					
						
							|  |  |  | 348d178,5f7000db | 
					
						
							|  |  |  | 348d190,6ceeb30 | 
					
						
							|  |  |  | 348d194,dc45a90 | 
					
						
							|  |  |  | 348d198,4f600000 | 
					
						
							|  |  |  | 348d19c,ec60000 | 
					
						
							|  |  |  | 348d1a0,5ceeb40 | 
					
						
							|  |  |  | 348d1a4,6cc0 | 
					
						
							|  |  |  | 348d1a8,8e0 | 
					
						
							|  |  |  | 348d1ac,c735cd0 | 
					
						
							|  |  |  | 348d1b0,8deec50 | 
					
						
							|  |  |  | 348d1c8,cffffffb | 
					
						
							|  |  |  | 348d1cc,db000 | 
					
						
							|  |  |  | 348d1d0,db000 | 
					
						
							|  |  |  | 348d1d4,db000 | 
					
						
							|  |  |  | 348d1d8,db000 | 
					
						
							|  |  |  | 348d1dc,db000 | 
					
						
							|  |  |  | 348d1e0,db000 | 
					
						
							|  |  |  | 348d1e4,db000 | 
					
						
							|  |  |  | 348d1e8,db000 | 
					
						
							|  |  |  | 348d200,4f7009e0 | 
					
						
							|  |  |  | 348d204,4f7009e0 | 
					
						
							|  |  |  | 348d208,4f7009e0 | 
					
						
							|  |  |  | 348d20c,4f7009e0 | 
					
						
							|  |  |  | 348d210,4f7009e0 | 
					
						
							|  |  |  | 348d214,3f7009e0 | 
					
						
							|  |  |  | 348d218,2e700ad0 | 
					
						
							|  |  |  | 348d21c,dc45dc0 | 
					
						
							|  |  |  | 348d220,5ceec40 | 
					
						
							|  |  |  | 348d238,ad0003e8 | 
					
						
							|  |  |  | 348d23c,6f5008e3 | 
					
						
							|  |  |  | 348d240,e900bc0 | 
					
						
							|  |  |  | 348d244,bc00d90 | 
					
						
							|  |  |  | 348d248,8e15e40 | 
					
						
							|  |  |  | 348d24c,2e7ad00 | 
					
						
							|  |  |  | 348d250,cbca00 | 
					
						
							|  |  |  | 348d254,9de600 | 
					
						
							|  |  |  | 348d258,3ed000 | 
					
						
							|  |  |  | 348d270,e80000ad | 
					
						
							|  |  |  | 348d274,da0000cb | 
					
						
							|  |  |  | 348d278,cb0000da | 
					
						
							|  |  |  | 348d27c,ac0ec0e8 | 
					
						
							|  |  |  | 348d280,8d6de1e5 | 
					
						
							|  |  |  | 348d284,6e9bd8e0 | 
					
						
							|  |  |  | 348d288,1ec8acd0 | 
					
						
							|  |  |  | 348d28c,de37ec0 | 
					
						
							|  |  |  | 348d290,cd00ea0 | 
					
						
							|  |  |  | 348d2a8,6e7007e7 | 
					
						
							|  |  |  | 348d2ac,ad21db0 | 
					
						
							|  |  |  | 348d2b0,2daad20 | 
					
						
							|  |  |  | 348d2b4,7ee700 | 
					
						
							|  |  |  | 348d2b8,3ee200 | 
					
						
							|  |  |  | 348d2bc,bdda00 | 
					
						
							|  |  |  | 348d2c0,7e67e60 | 
					
						
							|  |  |  | 348d2c4,3ea00bd0 | 
					
						
							|  |  |  | 348d2c8,bd2004e9 | 
					
						
							|  |  |  | 348d2e0,ae2005e8 | 
					
						
							|  |  |  | 348d2e4,2da00cc0 | 
					
						
							|  |  |  | 348d2e8,7e57e50 | 
					
						
							|  |  |  | 348d2ec,ccda00 | 
					
						
							|  |  |  | 348d2f0,4ed200 | 
					
						
							|  |  |  | 348d2f4,db000 | 
					
						
							|  |  |  | 348d2f8,db000 | 
					
						
							|  |  |  | 348d2fc,db000 | 
					
						
							|  |  |  | 348d300,db000 | 
					
						
							|  |  |  | 348d318,efffff8 | 
					
						
							|  |  |  | 348d31c,bd3 | 
					
						
							|  |  |  | 348d320,7e70 | 
					
						
							|  |  |  | 348d324,3ea00 | 
					
						
							|  |  |  | 348d328,bd100 | 
					
						
							|  |  |  | 348d32c,8e5000 | 
					
						
							|  |  |  | 348d330,4e90000 | 
					
						
							|  |  |  | 348d334,cc00000 | 
					
						
							|  |  |  | 348d338,1ffffffa | 
					
						
							|  |  |  | 348d348,4ffc00 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348d34c,4f5000 | 
					
						
							|  |  |  | 348d350,4f5000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348d354,4f5000 | 
					
						
							|  |  |  | 348d358,4f5000 | 
					
						
							|  |  |  | 348d35c,4f5000 | 
					
						
							|  |  |  | 348d360,4f5000 | 
					
						
							|  |  |  | 348d364,4f5000 | 
					
						
							|  |  |  | 348d368,4f5000 | 
					
						
							|  |  |  | 348d36c,4f5000 | 
					
						
							|  |  |  | 348d370,4f5000 | 
					
						
							|  |  |  | 348d374,4ffc00 | 
					
						
							|  |  |  | 348d388,6e500000 | 
					
						
							|  |  |  | 348d38c,cb00000 | 
					
						
							|  |  |  | 348d390,7e30000 | 
					
						
							|  |  |  | 348d394,da0000 | 
					
						
							|  |  |  | 348d398,9e2000 | 
					
						
							|  |  |  | 348d39c,1e9000 | 
					
						
							|  |  |  | 348d3a0,ad000 | 
					
						
							|  |  |  | 348d3a4,3e800 | 
					
						
							|  |  |  | 348d3a8,bc00 | 
					
						
							|  |  |  | 348d3ac,4e60 | 
					
						
							|  |  |  | 348d3b0,bc0 | 
					
						
							|  |  |  | 348d3b8,dfe000 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348d3bc,8e000 | 
					
						
							|  |  |  | 348d3c0,8e000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348d3c4,8e000 | 
					
						
							|  |  |  | 348d3c8,8e000 | 
					
						
							|  |  |  | 348d3cc,8e000 | 
					
						
							|  |  |  | 348d3d0,8e000 | 
					
						
							|  |  |  | 348d3d4,8e000 | 
					
						
							|  |  |  | 348d3d8,8e000 | 
					
						
							|  |  |  | 348d3dc,8e000 | 
					
						
							|  |  |  | 348d3e0,8e000 | 
					
						
							|  |  |  | 348d3e4,dfe000 | 
					
						
							|  |  |  | 348d3f8,5ed200 | 
					
						
							|  |  |  | 348d3fc,dcdb00 | 
					
						
							|  |  |  | 348d400,ad25e80 | 
					
						
							|  |  |  | 348d404,7e5007e5 | 
					
						
							|  |  |  | 348d45c,fffffffd | 
					
						
							|  |  |  | 348d464,2ca0000 | 
					
						
							|  |  |  | 348d468,2c9000 | 
					
						
							|  |  |  | 348d4a8,5ceeb10 | 
					
						
							|  |  |  | 348d4ac,b936da0 | 
					
						
							|  |  |  | 348d4b0,bc0 | 
					
						
							|  |  |  | 348d4b4,8deffc0 | 
					
						
							|  |  |  | 348d4b8,3e930bd0 | 
					
						
							|  |  |  | 348d4bc,4f827ed0 | 
					
						
							|  |  |  | 348d4c0,aeedbd0 | 
					
						
							|  |  |  | 348d4d0,d900000 | 
					
						
							|  |  |  | 348d4d4,d900000 | 
					
						
							|  |  |  | 348d4d8,d900000 | 
					
						
							|  |  |  | 348d4dc,d900000 | 
					
						
							|  |  |  | 348d4e0,dbdec40 | 
					
						
							|  |  |  | 348d4e4,de65dc0 | 
					
						
							|  |  |  | 348d4e8,db008e0 | 
					
						
							|  |  |  | 348d4ec,da007f2 | 
					
						
							|  |  |  | 348d4f0,db008e0 | 
					
						
							|  |  |  | 348d4f4,de64db0 | 
					
						
							|  |  |  | 348d4f8,dbdec40 | 
					
						
							|  |  |  | 348d518,8ded70 | 
					
						
							|  |  |  | 348d51c,7e936a0 | 
					
						
							|  |  |  | 348d520,cc00000 | 
					
						
							|  |  |  | 348d524,db00000 | 
					
						
							|  |  |  | 348d528,cc00000 | 
					
						
							|  |  |  | 348d52c,7e936a0 | 
					
						
							|  |  |  | 348d530,8ded70 | 
					
						
							|  |  |  | 348d540,bc0 | 
					
						
							|  |  |  | 348d544,bc0 | 
					
						
							|  |  |  | 348d548,bc0 | 
					
						
							|  |  |  | 348d54c,bc0 | 
					
						
							|  |  |  | 348d550,5dedcc0 | 
					
						
							|  |  |  | 348d554,dc48ec0 | 
					
						
							|  |  |  | 348d558,5f600cc0 | 
					
						
							|  |  |  | 348d55c,7f300bc0 | 
					
						
							|  |  |  | 348d560,5f600cc0 | 
					
						
							|  |  |  | 348d564,dc48ec0 | 
					
						
							|  |  |  | 348d568,5dedcc0 | 
					
						
							|  |  |  | 348d588,3beec30 | 
					
						
							|  |  |  | 348d58c,cd54cc0 | 
					
						
							|  |  |  | 348d590,4f6007e0 | 
					
						
							|  |  |  | 348d594,6ffffff3 | 
					
						
							|  |  |  | 348d598,4f500000 | 
					
						
							|  |  |  | 348d59c,cc538c0 | 
					
						
							|  |  |  | 348d5a0,3beec60 | 
					
						
							|  |  |  | 348d5b0,5ded0 | 
					
						
							|  |  |  | 348d5b4,cb200 | 
					
						
							|  |  |  | 348d5b8,d9000 | 
					
						
							|  |  |  | 348d5bc,e8000 | 
					
						
							|  |  |  | 348d5c0,dffffd0 | 
					
						
							|  |  |  | 348d5c4,e8000 | 
					
						
							|  |  |  | 348d5c8,e8000 | 
					
						
							|  |  |  | 348d5cc,e8000 | 
					
						
							|  |  |  | 348d5d0,e8000 | 
					
						
							|  |  |  | 348d5d4,e8000 | 
					
						
							|  |  |  | 348d5d8,e8000 | 
					
						
							|  |  |  | 348d5f8,5dedcc0 | 
					
						
							|  |  |  | 348d5fc,dc48ec0 | 
					
						
							|  |  |  | 348d600,5f600cc0 | 
					
						
							|  |  |  | 348d604,7f300bc0 | 
					
						
							|  |  |  | 348d608,5f600cc0 | 
					
						
							|  |  |  | 348d60c,dc48ec0 | 
					
						
							|  |  |  | 348d610,5dedcb0 | 
					
						
							|  |  |  | 348d614,ca0 | 
					
						
							|  |  |  | 348d618,9947e60 | 
					
						
							|  |  |  | 348d61c,4cee900 | 
					
						
							|  |  |  | 348d620,da00000 | 
					
						
							|  |  |  | 348d624,da00000 | 
					
						
							|  |  |  | 348d628,da00000 | 
					
						
							|  |  |  | 348d62c,da00000 | 
					
						
							|  |  |  | 348d630,dbded40 | 
					
						
							|  |  |  | 348d634,de65da0 | 
					
						
							|  |  |  | 348d638,db00bc0 | 
					
						
							|  |  |  | 348d63c,da00bc0 | 
					
						
							|  |  |  | 348d640,da00bc0 | 
					
						
							|  |  |  | 348d644,da00bc0 | 
					
						
							|  |  |  | 348d648,da00bc0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348d658,bc000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348d668,9ffc000 | 
					
						
							|  |  |  | 348d66c,bc000 | 
					
						
							|  |  |  | 348d670,bc000 | 
					
						
							|  |  |  | 348d674,bc000 | 
					
						
							|  |  |  | 348d678,bc000 | 
					
						
							|  |  |  | 348d67c,bc000 | 
					
						
							|  |  |  | 348d680,effffe0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348d690,7e000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348d6a0,7ffe000 | 
					
						
							|  |  |  | 348d6a4,7e000 | 
					
						
							|  |  |  | 348d6a8,7e000 | 
					
						
							|  |  |  | 348d6ac,7e000 | 
					
						
							|  |  |  | 348d6b0,7e000 | 
					
						
							|  |  |  | 348d6b4,7e000 | 
					
						
							|  |  |  | 348d6b8,7e000 | 
					
						
							|  |  |  | 348d6bc,7e000 | 
					
						
							|  |  |  | 348d6c0,1bd000 | 
					
						
							|  |  |  | 348d6c4,dfe7000 | 
					
						
							|  |  |  | 348d6c8,bc00000 | 
					
						
							|  |  |  | 348d6cc,bc00000 | 
					
						
							|  |  |  | 348d6d0,bc00000 | 
					
						
							|  |  |  | 348d6d4,bc00000 | 
					
						
							|  |  |  | 348d6d8,bc03dc2 | 
					
						
							|  |  |  | 348d6dc,bc3db00 | 
					
						
							|  |  |  | 348d6e0,bddc000 | 
					
						
							|  |  |  | 348d6e4,bfce500 | 
					
						
							|  |  |  | 348d6e8,bd0cd10 | 
					
						
							|  |  |  | 348d6ec,bc03db0 | 
					
						
							|  |  |  | 348d6f0,bc007e8 | 
					
						
							|  |  |  | 348d700,eff4000 | 
					
						
							|  |  |  | 348d704,5f4000 | 
					
						
							|  |  |  | 348d708,5f4000 | 
					
						
							|  |  |  | 348d70c,5f4000 | 
					
						
							|  |  |  | 348d710,5f4000 | 
					
						
							|  |  |  | 348d714,5f4000 | 
					
						
							|  |  |  | 348d718,5f4000 | 
					
						
							|  |  |  | 348d71c,5f4000 | 
					
						
							|  |  |  | 348d720,4f5000 | 
					
						
							|  |  |  | 348d724,ea000 | 
					
						
							|  |  |  | 348d728,8efb0 | 
					
						
							|  |  |  | 348d748,8dddaec0 | 
					
						
							|  |  |  | 348d74c,8e4dc5e4 | 
					
						
							|  |  |  | 348d750,8d0cb0e6 | 
					
						
							|  |  |  | 348d754,8d0ba0e7 | 
					
						
							|  |  |  | 348d758,8d0ba0e7 | 
					
						
							|  |  |  | 348d75c,8d0ba0e7 | 
					
						
							|  |  |  | 348d760,8d0ba0e7 | 
					
						
							|  |  |  | 348d780,dbded40 | 
					
						
							|  |  |  | 348d784,de65da0 | 
					
						
							|  |  |  | 348d788,db00bc0 | 
					
						
							|  |  |  | 348d78c,da00bc0 | 
					
						
							|  |  |  | 348d790,da00bc0 | 
					
						
							|  |  |  | 348d794,da00bc0 | 
					
						
							|  |  |  | 348d798,da00bc0 | 
					
						
							|  |  |  | 348d7b8,4ceeb20 | 
					
						
							|  |  |  | 348d7bc,cd56da0 | 
					
						
							|  |  |  | 348d7c0,1e700ad0 | 
					
						
							|  |  |  | 348d7c4,5f6008e0 | 
					
						
							|  |  |  | 348d7c8,1e700ad0 | 
					
						
							|  |  |  | 348d7cc,cd46db0 | 
					
						
							|  |  |  | 348d7d0,4ceeb20 | 
					
						
							|  |  |  | 348d7f0,dbdec30 | 
					
						
							|  |  |  | 348d7f4,de65db0 | 
					
						
							|  |  |  | 348d7f8,db009e0 | 
					
						
							|  |  |  | 348d7fc,da007e0 | 
					
						
							|  |  |  | 348d800,db008e0 | 
					
						
							|  |  |  | 348d804,de65db0 | 
					
						
							|  |  |  | 348d808,dbeec40 | 
					
						
							|  |  |  | 348d80c,d900000 | 
					
						
							|  |  |  | 348d810,d900000 | 
					
						
							|  |  |  | 348d814,d900000 | 
					
						
							|  |  |  | 348d828,4cedcc0 | 
					
						
							|  |  |  | 348d82c,cc47ec0 | 
					
						
							|  |  |  | 348d830,1e700cc0 | 
					
						
							|  |  |  | 348d834,5f600bc0 | 
					
						
							|  |  |  | 348d838,2e700cc0 | 
					
						
							|  |  |  | 348d83c,cc47ec0 | 
					
						
							|  |  |  | 348d840,5cedbc0 | 
					
						
							|  |  |  | 348d844,ac0 | 
					
						
							|  |  |  | 348d848,ac0 | 
					
						
							|  |  |  | 348d84c,ac0 | 
					
						
							|  |  |  | 348d860,ccdef9 | 
					
						
							|  |  |  | 348d864,ce8300 | 
					
						
							|  |  |  | 348d868,cb0000 | 
					
						
							|  |  |  | 348d86c,ca0000 | 
					
						
							|  |  |  | 348d870,ca0000 | 
					
						
							|  |  |  | 348d874,ca0000 | 
					
						
							|  |  |  | 348d878,ca0000 | 
					
						
							|  |  |  | 348d898,4ceea10 | 
					
						
							|  |  |  | 348d89c,bd45b60 | 
					
						
							|  |  |  | 348d8a0,bd40000 | 
					
						
							|  |  |  | 348d8a4,3bddb20 | 
					
						
							|  |  |  | 348d8a8,4da0 | 
					
						
							|  |  |  | 348d8ac,b945ea0 | 
					
						
							|  |  |  | 348d8b0,5ceeb20 | 
					
						
							|  |  |  | 348d8c8,8e0000 | 
					
						
							|  |  |  | 348d8cc,8e0000 | 
					
						
							|  |  |  | 348d8d0,6fffffb0 | 
					
						
							|  |  |  | 348d8d4,8e0000 | 
					
						
							|  |  |  | 348d8d8,8e0000 | 
					
						
							|  |  |  | 348d8dc,8e0000 | 
					
						
							|  |  |  | 348d8e0,8e0000 | 
					
						
							|  |  |  | 348d8e4,6e7000 | 
					
						
							|  |  |  | 348d8e8,befb0 | 
					
						
							|  |  |  | 348d908,da00bc0 | 
					
						
							|  |  |  | 348d90c,da00bc0 | 
					
						
							|  |  |  | 348d910,da00bc0 | 
					
						
							|  |  |  | 348d914,da00bc0 | 
					
						
							|  |  |  | 348d918,da00bc0 | 
					
						
							|  |  |  | 348d91c,bd47ec0 | 
					
						
							|  |  |  | 348d920,5dedbc0 | 
					
						
							|  |  |  | 348d940,6e3007e3 | 
					
						
							|  |  |  | 348d944,d900bc0 | 
					
						
							|  |  |  | 348d948,ad01e80 | 
					
						
							|  |  |  | 348d94c,5e48e20 | 
					
						
							|  |  |  | 348d950,dacb00 | 
					
						
							|  |  |  | 348d954,9de700 | 
					
						
							|  |  |  | 348d958,3ee000 | 
					
						
							|  |  |  | 348d978,e80000ac | 
					
						
							|  |  |  | 348d97c,ca0000ca | 
					
						
							|  |  |  | 348d980,ac0db0e7 | 
					
						
							|  |  |  | 348d984,6e3dd5e2 | 
					
						
							|  |  |  | 348d988,eabcad0 | 
					
						
							|  |  |  | 348d98c,ce79eb0 | 
					
						
							|  |  |  | 348d990,ae15f80 | 
					
						
							|  |  |  | 348d9b0,3da00bc0 | 
					
						
							|  |  |  | 348d9b4,6e69e40 | 
					
						
							|  |  |  | 348d9b8,9ee700 | 
					
						
							|  |  |  | 348d9bc,2ed000 | 
					
						
							|  |  |  | 348d9c0,ccda00 | 
					
						
							|  |  |  | 348d9c4,9e46e70 | 
					
						
							|  |  |  | 348d9c8,6e7009e4 | 
					
						
							|  |  |  | 348d9e8,6e5005e5 | 
					
						
							|  |  |  | 348d9ec,da00bd0 | 
					
						
							|  |  |  | 348d9f0,9e00e90 | 
					
						
							|  |  |  | 348d9f4,3e78e30 | 
					
						
							|  |  |  | 348d9f8,cccc00 | 
					
						
							|  |  |  | 348d9fc,7ee700 | 
					
						
							|  |  |  | 348da00,de000 | 
					
						
							|  |  |  | 348da04,da000 | 
					
						
							|  |  |  | 348da08,8e5000 | 
					
						
							|  |  |  | 348da0c,dea0000 | 
					
						
							|  |  |  | 348da20,bffffc0 | 
					
						
							|  |  |  | 348da24,5e70 | 
					
						
							|  |  |  | 348da28,3d900 | 
					
						
							|  |  |  | 348da2c,cb000 | 
					
						
							|  |  |  | 348da30,bd2000 | 
					
						
							|  |  |  | 348da34,9e40000 | 
					
						
							|  |  |  | 348da38,dffffc0 | 
					
						
							|  |  |  | 348da48,6dea0 | 
					
						
							|  |  |  | 348da4c,bd300 | 
					
						
							|  |  |  | 348da50,cb000 | 
					
						
							|  |  |  | 348da54,cb000 | 
					
						
							|  |  |  | 348da58,5ea000 | 
					
						
							|  |  |  | 348da5c,bfd2000 | 
					
						
							|  |  |  | 348da60,7e9000 | 
					
						
							|  |  |  | 348da64,db000 | 
					
						
							|  |  |  | 348da68,cb000 | 
					
						
							|  |  |  | 348da6c,cb000 | 
					
						
							|  |  |  | 348da70,bd400 | 
					
						
							|  |  |  | 348da74,5dea0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348da80,ca000 | 
					
						
							|  |  |  | 348da84,ca000 | 
					
						
							|  |  |  | 348da88,ca000 | 
					
						
							|  |  |  | 348da8c,ca000 | 
					
						
							|  |  |  | 348da90,ca000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348da94,ca000 | 
					
						
							|  |  |  | 348da98,ca000 | 
					
						
							|  |  |  | 348da9c,ca000 | 
					
						
							|  |  |  | 348daa0,ca000 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348daa4,ca000 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348daa8,ca000 | 
					
						
							|  |  |  | 348daac,ca000 | 
					
						
							|  |  |  | 348dab0,ca000 | 
					
						
							|  |  |  | 348dab8,bed3000 | 
					
						
							|  |  |  | 348dabc,4e9000 | 
					
						
							|  |  |  | 348dac0,da000 | 
					
						
							|  |  |  | 348dac4,ca000 | 
					
						
							|  |  |  | 348dac8,bc400 | 
					
						
							|  |  |  | 348dacc,5efa0 | 
					
						
							|  |  |  | 348dad0,bd500 | 
					
						
							|  |  |  | 348dad4,cb000 | 
					
						
							|  |  |  | 348dad8,da000 | 
					
						
							|  |  |  | 348dadc,da000 | 
					
						
							|  |  |  | 348dae0,5e8000 | 
					
						
							|  |  |  | 348dae4,bec2000 | 
					
						
							|  |  |  | 348db08,5ded83a7 | 
					
						
							|  |  |  | 348db0c,9838dec3 | 
					
						
							|  |  |  | 348db80,7f024429 | 
					
						
							|  |  |  | 348db84,3c334133 | 
					
						
							|  |  |  | 348db88,41334633 | 
					
						
							|  |  |  | 348db8c,44297f02 | 
					
						
							|  |  |  | 348dbbc,5409 | 
					
						
							|  |  |  | 348dbc0,4dc548ff | 
					
						
							|  |  |  | 348dbc4,41ff43ff | 
					
						
							|  |  |  | 348dbc8,47ff49ff | 
					
						
							|  |  |  | 348dbcc,43ff20c5 | 
					
						
							|  |  |  | 348dbd0,c0000 | 
					
						
							|  |  |  | 348dbfc,3f75 | 
					
						
							|  |  |  | 348dc00,49ff33ff | 
					
						
							|  |  |  | 348dc04,28ff2dff | 
					
						
							|  |  |  | 348dc08,33ff39ff | 
					
						
							|  |  |  | 348dc0c,3cff00ff | 
					
						
							|  |  |  | 348dc10,770000 | 
					
						
							|  |  |  | 348dc3c,329d | 
					
						
							|  |  |  | 348dc40,37ff1bff | 
					
						
							|  |  |  | 348dc44,21ff28ff | 
					
						
							|  |  |  | 348dc48,2fff35ff | 
					
						
							|  |  |  | 348dc4c,3cff00ff | 
					
						
							|  |  |  | 348dc50,9d0000 | 
					
						
							|  |  |  | 348dc7c,329e | 
					
						
							|  |  |  | 348dc80,35ff21ff | 
					
						
							|  |  |  | 348dc84,28ff06ff | 
					
						
							|  |  |  | 348dc88,9ff3cff | 
					
						
							|  |  |  | 348dc8c,42ff00ff | 
					
						
							|  |  |  | 348dc90,9e0000 | 
					
						
							|  |  |  | 348dcbc,359e | 
					
						
							|  |  |  | 348dcc0,39ff27ff | 
					
						
							|  |  |  | 348dcc4,2eff00ff | 
					
						
							|  |  |  | 348dcc8,2ff42ff | 
					
						
							|  |  |  | 348dccc,48ff00ff | 
					
						
							|  |  |  | 348dcd0,9e0000 | 
					
						
							|  |  |  | 348dcfc,3a9e | 
					
						
							|  |  |  | 348dd00,3eff2eff | 
					
						
							|  |  |  | 348dd04,35ff00ff | 
					
						
							|  |  |  | 348dd08,dff48ff | 
					
						
							|  |  |  | 348dd0c,4dff00ff | 
					
						
							|  |  |  | 348dd10,9e0000 | 
					
						
							|  |  |  | 348dd3c,3e9e | 
					
						
							|  |  |  | 348dd40,42ff35ff | 
					
						
							|  |  |  | 348dd44,3bff1bff | 
					
						
							|  |  |  | 348dd48,27ff4dff | 
					
						
							|  |  |  | 348dd4c,53ff00ff | 
					
						
							|  |  |  | 348dd50,9e0000 | 
					
						
							|  |  |  | 348dd7c,439e | 
					
						
							|  |  |  | 348dd80,47ff3bff | 
					
						
							|  |  |  | 348dd84,41ff47ff | 
					
						
							|  |  |  | 348dd88,4dff52ff | 
					
						
							|  |  |  | 348dd8c,58ff00ff | 
					
						
							|  |  |  | 348dd90,9e0000 | 
					
						
							|  |  |  | 348ddbc,4d9e | 
					
						
							|  |  |  | 348ddc0,4dff41ff | 
					
						
							|  |  |  | 348ddc4,47ff4dff | 
					
						
							|  |  |  | 348ddc8,52ff57ff | 
					
						
							|  |  |  | 348ddcc,5cff00ff | 
					
						
							|  |  |  | 348ddd0,9e0000 | 
					
						
							|  |  |  | 348ddec,3f04474f | 
					
						
							|  |  |  | 348ddf0,3e663e66 | 
					
						
							|  |  |  | 348ddf4,43664666 | 
					
						
							|  |  |  | 348ddf8,48664d66 | 
					
						
							|  |  |  | 348ddfc,57665bc5 | 
					
						
							|  |  |  | 348de00,53ff47ff | 
					
						
							|  |  |  | 348de04,4dff52ff | 
					
						
							|  |  |  | 348de08,57ff5cff | 
					
						
							|  |  |  | 348de0c,60ff0eff | 
					
						
							|  |  |  | 348de10,19c56666 | 
					
						
							|  |  |  | 348de14,66666466 | 
					
						
							|  |  |  | 348de18,61665f66 | 
					
						
							|  |  |  | 348de1c,5c665a66 | 
					
						
							|  |  |  | 348de20,504f3f04 | 
					
						
							|  |  |  | 348de28,6605 | 
					
						
							|  |  |  | 348de2c,4ec34bff | 
					
						
							|  |  |  | 348de30,41ff41ff | 
					
						
							|  |  |  | 348de34,45ff48ff | 
					
						
							|  |  |  | 348de38,4cff4fff | 
					
						
							|  |  |  | 348de3c,55ff59ff | 
					
						
							|  |  |  | 348de40,4fff4dff | 
					
						
							|  |  |  | 348de44,52ff57ff | 
					
						
							|  |  |  | 348de48,5cff60ff | 
					
						
							|  |  |  | 348de4c,64ff61ff | 
					
						
							|  |  |  | 348de50,67ff66ff | 
					
						
							|  |  |  | 348de54,64ff62ff | 
					
						
							|  |  |  | 348de58,60ff5dff | 
					
						
							|  |  |  | 348de5c,5bff57ff | 
					
						
							|  |  |  | 348de60,49ff0ec3 | 
					
						
							|  |  |  | 348de64,50000 | 
					
						
							|  |  |  | 348de68,3958 | 
					
						
							|  |  |  | 348de6c,44ff31ff | 
					
						
							|  |  |  | 348de70,20ff25ff | 
					
						
							|  |  |  | 348de74,2bff31ff | 
					
						
							|  |  |  | 348de78,38ff3eff | 
					
						
							|  |  |  | 348de7c,44ff49ff | 
					
						
							|  |  |  | 348de80,4dff52ff | 
					
						
							|  |  |  | 348de84,57ff5cff | 
					
						
							|  |  |  | 348de88,60ff64ff | 
					
						
							|  |  |  | 348de8c,68ff67ff | 
					
						
							|  |  |  | 348de90,64ff60ff | 
					
						
							|  |  |  | 348de94,5cff58ff | 
					
						
							|  |  |  | 348de98,53ff4eff | 
					
						
							|  |  |  | 348de9c,48ff43ff | 
					
						
							|  |  |  | 348dea0,32ff00ff | 
					
						
							|  |  |  | 348dea4,580000 | 
					
						
							|  |  |  | 348dea8,2f71 | 
					
						
							|  |  |  | 348deac,36ff1dff | 
					
						
							|  |  |  | 348deb0,1fff26ff | 
					
						
							|  |  |  | 348deb4,2dff34ff | 
					
						
							|  |  |  | 348deb8,3aff41ff | 
					
						
							|  |  |  | 348debc,47ff4cff | 
					
						
							|  |  |  | 348dec0,52ff57ff | 
					
						
							|  |  |  | 348dec4,5cff60ff | 
					
						
							|  |  |  | 348dec8,64ff68ff | 
					
						
							|  |  |  | 348decc,67ff64ff | 
					
						
							|  |  |  | 348ded0,60ff5bff | 
					
						
							|  |  |  | 348ded4,57ff51ff | 
					
						
							|  |  |  | 348ded8,4cff46ff | 
					
						
							|  |  |  | 348dedc,40ff3aff | 
					
						
							|  |  |  | 348dee0,27ff00ff | 
					
						
							|  |  |  | 348dee4,710000 | 
					
						
							|  |  |  | 348dee8,2f71 | 
					
						
							|  |  |  | 348deec,36ff21ff | 
					
						
							|  |  |  | 348def0,16ff00ff | 
					
						
							|  |  |  | 348def4,ff00ff | 
					
						
							|  |  |  | 348def8,2cff47ff | 
					
						
							|  |  |  | 348defc,4cff52ff | 
					
						
							|  |  |  | 348df00,57ff5cff | 
					
						
							|  |  |  | 348df04,60ff64ff | 
					
						
							|  |  |  | 348df08,67ff67ff | 
					
						
							|  |  |  | 348df0c,64ff60ff | 
					
						
							|  |  |  | 348df10,5bff57ff | 
					
						
							|  |  |  | 348df14,52ff0dff | 
					
						
							|  |  |  | 348df18,ff00ff | 
					
						
							|  |  |  | 348df1c,aff33ff | 
					
						
							|  |  |  | 348df20,21ff00ff | 
					
						
							|  |  |  | 348df24,710000 | 
					
						
							|  |  |  | 348df28,3371 | 
					
						
							|  |  |  | 348df2c,3aff28ff | 
					
						
							|  |  |  | 348df30,22ff0fff | 
					
						
							|  |  |  | 348df34,13ff19ff | 
					
						
							|  |  |  | 348df38,39ff4cff | 
					
						
							|  |  |  | 348df3c,52ff57ff | 
					
						
							|  |  |  | 348df40,5bff60ff | 
					
						
							|  |  |  | 348df44,64ff67ff | 
					
						
							|  |  |  | 348df48,67ff64ff | 
					
						
							|  |  |  | 348df4c,60ff5cff | 
					
						
							|  |  |  | 348df50,57ff52ff | 
					
						
							|  |  |  | 348df54,4cff1dff | 
					
						
							|  |  |  | 348df58,12ff14ff | 
					
						
							|  |  |  | 348df5c,19ff2dff | 
					
						
							|  |  |  | 348df60,1bff00ff | 
					
						
							|  |  |  | 348df64,710000 | 
					
						
							|  |  |  | 348df68,3871 | 
					
						
							|  |  |  | 348df6c,3dff2fff | 
					
						
							|  |  |  | 348df70,33ff3aff | 
					
						
							|  |  |  | 348df74,40ff46ff | 
					
						
							|  |  |  | 348df78,4cff51ff | 
					
						
							|  |  |  | 348df7c,57ff5bff | 
					
						
							|  |  |  | 348df80,60ff64ff | 
					
						
							|  |  |  | 348df84,67ff68ff | 
					
						
							|  |  |  | 348df88,64ff60ff | 
					
						
							|  |  |  | 348df8c,5cff57ff | 
					
						
							|  |  |  | 348df90,52ff4cff | 
					
						
							|  |  |  | 348df94,47ff41ff | 
					
						
							|  |  |  | 348df98,3aff34ff | 
					
						
							|  |  |  | 348df9c,2dff26ff | 
					
						
							|  |  |  | 348dfa0,12ff00ff | 
					
						
							|  |  |  | 348dfa4,710000 | 
					
						
							|  |  |  | 348dfa8,3569 | 
					
						
							|  |  |  | 348dfac,37ff33ff | 
					
						
							|  |  |  | 348dfb0,3aff40ff | 
					
						
							|  |  |  | 348dfb4,46ff4cff | 
					
						
							|  |  |  | 348dfb8,51ff57ff | 
					
						
							|  |  |  | 348dfbc,5bff60ff | 
					
						
							|  |  |  | 348dfc0,64ff67ff | 
					
						
							|  |  |  | 348dfc4,68ff64ff | 
					
						
							|  |  |  | 348dfc8,60ff5cff | 
					
						
							|  |  |  | 348dfcc,57ff52ff | 
					
						
							|  |  |  | 348dfd0,4dff47ff | 
					
						
							|  |  |  | 348dfd4,41ff3aff | 
					
						
							|  |  |  | 348dfd8,34ff2dff | 
					
						
							|  |  |  | 348dfdc,26ff1fff | 
					
						
							|  |  |  | 348dfe0,6ff00ff | 
					
						
							|  |  |  | 348dfe4,690000 | 
					
						
							|  |  |  | 348dfe8,1e21 | 
					
						
							|  |  |  | 348dfec,2f600ff | 
					
						
							|  |  |  | 348dff0,ff00ff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348dff4,ff00ff | 
					
						
							|  |  |  | 348dff8,ff00ff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348dffc,2ff1eff | 
					
						
							|  |  |  | 348e000,60ff68ff | 
					
						
							|  |  |  | 348e004,64ff60ff | 
					
						
							|  |  |  | 348e008,5cff57ff | 
					
						
							|  |  |  | 348e00c,52ff2cff | 
					
						
							|  |  |  | 348e010,6ff00ff | 
					
						
							|  |  |  | 348e014,ff00ff | 
					
						
							|  |  |  | 348e018,ff00ff | 
					
						
							|  |  |  | 348e01c,ff00ff | 
					
						
							|  |  |  | 348e020,ff00f6 | 
					
						
							|  |  |  | 348e024,210000 | 
					
						
							|  |  |  | 348e02c,3b00ae | 
					
						
							|  |  |  | 348e030,cc00cc | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e034,cc00cc | 
					
						
							|  |  |  | 348e038,cc00cc | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e03c,cc03ec | 
					
						
							|  |  |  | 348e040,62ff64ff | 
					
						
							|  |  |  | 348e044,60ff5cff | 
					
						
							|  |  |  | 348e048,57ff52ff | 
					
						
							|  |  |  | 348e04c,4dff00ff | 
					
						
							|  |  |  | 348e050,ec00cc | 
					
						
							|  |  |  | 348e054,cc00cc | 
					
						
							|  |  |  | 348e058,cc00cc | 
					
						
							|  |  |  | 348e05c,cc00cc | 
					
						
							|  |  |  | 348e060,ae003b | 
					
						
							|  |  |  | 348e07c,5f9e | 
					
						
							|  |  |  | 348e080,65ff60ff | 
					
						
							|  |  |  | 348e084,5cff57ff | 
					
						
							|  |  |  | 348e088,52ff4dff | 
					
						
							|  |  |  | 348e08c,47ff00ff | 
					
						
							|  |  |  | 348e090,9e0000 | 
					
						
							|  |  |  | 348e0bc,659e | 
					
						
							|  |  |  | 348e0c0,63ff5cff | 
					
						
							|  |  |  | 348e0c4,57ff52ff | 
					
						
							|  |  |  | 348e0c8,4dff47ff | 
					
						
							|  |  |  | 348e0cc,41ff00ff | 
					
						
							|  |  |  | 348e0d0,9e0000 | 
					
						
							|  |  |  | 348e0fc,649e | 
					
						
							|  |  |  | 348e100,61ff58ff | 
					
						
							|  |  |  | 348e104,53ff35ff | 
					
						
							|  |  |  | 348e108,31ff41ff | 
					
						
							|  |  |  | 348e10c,3bff00ff | 
					
						
							|  |  |  | 348e110,9e0000 | 
					
						
							|  |  |  | 348e13c,609e | 
					
						
							|  |  |  | 348e140,5eff53ff | 
					
						
							|  |  |  | 348e144,4dff00ff | 
					
						
							|  |  |  | 348e148,ff3bff | 
					
						
							|  |  |  | 348e14c,35ff00ff | 
					
						
							|  |  |  | 348e150,9e0000 | 
					
						
							|  |  |  | 348e17c,5d9e | 
					
						
							|  |  |  | 348e180,5bff4dff | 
					
						
							|  |  |  | 348e184,48ff00ff | 
					
						
							|  |  |  | 348e188,6ff35ff | 
					
						
							|  |  |  | 348e18c,2eff00ff | 
					
						
							|  |  |  | 348e190,9e0000 | 
					
						
							|  |  |  | 348e1bc,5a9e | 
					
						
							|  |  |  | 348e1c0,57ff48ff | 
					
						
							|  |  |  | 348e1c4,42ff03ff | 
					
						
							|  |  |  | 348e1c8,cff2eff | 
					
						
							|  |  |  | 348e1cc,28ff00ff | 
					
						
							|  |  |  | 348e1d0,9e0000 | 
					
						
							|  |  |  | 348e1fc,559e | 
					
						
							|  |  |  | 348e200,53ff42ff | 
					
						
							|  |  |  | 348e204,3cff2dff | 
					
						
							|  |  |  | 348e208,28ff28ff | 
					
						
							|  |  |  | 348e20c,1fff00ff | 
					
						
							|  |  |  | 348e210,9e0000 | 
					
						
							|  |  |  | 348e23c,4b91 | 
					
						
							|  |  |  | 348e240,44ff33ff | 
					
						
							|  |  |  | 348e244,35ff2fff | 
					
						
							|  |  |  | 348e248,28ff1fff | 
					
						
							|  |  |  | 348e24c,7ff00ff | 
					
						
							|  |  |  | 348e250,900000 | 
					
						
							|  |  |  | 348e27c,1229 | 
					
						
							|  |  |  | 348e280,f700ff | 
					
						
							|  |  |  | 348e284,ff00ff | 
					
						
							|  |  |  | 348e288,ff00ff | 
					
						
							|  |  |  | 348e28c,ff00f8 | 
					
						
							|  |  |  | 348e290,2e0000 | 
					
						
							|  |  |  | 348e2c0,30008c | 
					
						
							|  |  |  | 348e2c4,990099 | 
					
						
							|  |  |  | 348e2c8,990099 | 
					
						
							|  |  |  | 348e2cc,8c0030 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e328,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e32c,f0f0f0f0 | 
					
						
							|  |  |  | 348e330,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e334,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348e338,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e33c,f0f0f0f0 | 
					
						
							|  |  |  | 348e340,dff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e344,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348e348,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e34c,f0f0f0df | 
					
						
							|  |  |  | 348e350,dff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e354,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348e358,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e35c,f0f0f0df | 
					
						
							|  |  |  | 348e360,dfcff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e364,f0f0f0f0 | 
					
						
							|  |  |  | 348e368,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e36c,f0f0cfcf | 
					
						
							|  |  |  | 348e370,cfcff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e374,f0f0f0f0 | 
					
						
							|  |  |  | 348e378,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e37c,f0f0cfcf | 
					
						
							|  |  |  | 348e380,cfcfcff0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e384,f0f0f0f0 | 
					
						
							|  |  |  | 348e388,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e38c,f0cfcfcf | 
					
						
							|  |  |  | 348e390,cfcfcff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e394,f0f0f0f0 | 
					
						
							|  |  |  | 348e398,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e39c,f0cfcfcf | 
					
						
							|  |  |  | 348e3a0,cfcfcfcf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e3a4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e3a8,f0f0f0f0 | 
					
						
							|  |  |  | 348e3ac,cfcfcfcf | 
					
						
							|  |  |  | 348e3b0,cfbfbfbf | 
					
						
							|  |  |  | 348e3b4,f0f0f0f0 | 
					
						
							|  |  |  | 348e3b8,f0f0f0f0 | 
					
						
							|  |  |  | 348e3bc,bfbfbfbf | 
					
						
							|  |  |  | 348e3c0,bfbfbfbf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e3c4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e3c8,f0f0f0bf | 
					
						
							|  |  |  | 348e3cc,bfbfbfbf | 
					
						
							|  |  |  | 348e3d0,bfbfbfbf | 
					
						
							|  |  |  | 348e3d4,bff0f0f0 | 
					
						
							|  |  |  | 348e3d8,f0f0f0bf | 
					
						
							|  |  |  | 348e3dc,bfbff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e3e0,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e3e4,f0f0f0f0 | 
					
						
							|  |  |  | 348e3e8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e3ec,f0f0f0f0 | 
					
						
							|  |  |  | 348e3f0,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e3f4,f0f0f0f0 | 
					
						
							|  |  |  | 348e3f8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e3fc,f0f0f0f0 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | 348e400,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e404,f0f0f0f0 | 
					
						
							|  |  |  | 348e408,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e40c,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e410,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e414,f0f0f0f0 | 
					
						
							|  |  |  | 348e418,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e41c,f0f0f0f0 | 
					
						
							|  |  |  | 348e420,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e424,f0f0f0f0 | 
					
						
							|  |  |  | 348e428,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e42c,f0f0f0f0 | 
					
						
							|  |  |  | 348e430,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e434,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348e438,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e43c,f0f0f0cf | 
					
						
							|  |  |  | 348e440,cff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e444,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348e448,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e44c,f0f0f0cf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e450,cfcff0f0 | 
					
						
							|  |  |  | 348e454,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348e458,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e45c,f0f0bfcf | 
					
						
							|  |  |  | 348e460,cfcff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e464,f0f0f0f0 | 
					
						
							|  |  |  | 348e468,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e46c,f0f0bfcf | 
					
						
							|  |  |  | 348e470,cfcff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e474,f0f0f0f0 | 
					
						
							|  |  |  | 348e478,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e47c,f0bfcfbf | 
					
						
							|  |  |  | 348e480,bfbfbff0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e484,f0f0f0f0 | 
					
						
							|  |  |  | 348e488,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e48c,f0bfbfbf | 
					
						
							|  |  |  | 348e490,bfbfbff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e494,f0f0f0f0 | 
					
						
							|  |  |  | 348e498,f0f0f0f0 | 
					
						
							|  |  |  | 348e49c,bfbfbfbf | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e4a0,bfbfbfbf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e4a4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e4a8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e4ac,bfbfbfbf | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e4b0,bfbfbfbf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e4b4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e4b8,f0f0f0f0 | 
					
						
							|  |  |  | 348e4bc,bfbfbfbf | 
					
						
							|  |  |  | 348e4c0,bfbfbfaf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e4c4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e4c8,f0f0f0af | 
					
						
							|  |  |  | 348e4cc,bfbfbfbf | 
					
						
							|  |  |  | 348e4d0,afafaff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e4d4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e4d8,f0f0f0bf | 
					
						
							|  |  |  | 348e4dc,bfbfaff0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e4e0,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e4e4,f0f0f0f0 | 
					
						
							|  |  |  | 348e4e8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e4ec,f0f0f0f0 | 
					
						
							|  |  |  | 348e4f0,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e4f4,f0f0f0f0 | 
					
						
							|  |  |  | 348e4f8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e4fc,f0f0f0f0 | 
					
						
							|  |  |  | 348e500,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e504,f0f0f0f0 | 
					
						
							|  |  |  | 348e508,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e50c,f0f0f0f0 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | 348e510,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e514,f0f0f0f0 | 
					
						
							|  |  |  | 348e518,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e51c,f0f0f0f0 | 
					
						
							|  |  |  | 348e520,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e524,f0f0f0f0 | 
					
						
							|  |  |  | 348e528,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e52c,f0f0f0f0 | 
					
						
							|  |  |  | 348e530,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e534,f0f0f0f0 | 
					
						
							|  |  |  | 348e538,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e53c,f0f0f0ef | 
					
						
							|  |  |  | 348e540,eff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e544,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348e548,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e54c,f0f0f0ef | 
					
						
							|  |  |  | 348e550,bfbff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e554,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348e558,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e55c,f0f0dfdf | 
					
						
							|  |  |  | 348e560,bfbff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e564,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e568,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e56c,f0f0dfbf | 
					
						
							|  |  |  | 348e570,afaff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e574,f0f0f0f0 | 
					
						
							|  |  |  | 348e578,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e57c,f0dfdfaf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e580,afafaff0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e584,f0f0f0f0 | 
					
						
							|  |  |  | 348e588,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e58c,f0dfafaf | 
					
						
							|  |  |  | 348e590,afafaff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e594,f0f0f0f0 | 
					
						
							|  |  |  | 348e598,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e59c,dfdfafaf | 
					
						
							|  |  |  | 348e5a0,afafaff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e5a4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e5a8,f0f0f0f0 | 
					
						
							|  |  |  | 348e5ac,dfdfafaf | 
					
						
							|  |  |  | 348e5b0,afafaf9f | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e5b4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e5b8,f0f0f0f0 | 
					
						
							|  |  |  | 348e5bc,cfafafaf | 
					
						
							|  |  |  | 348e5c0,afaf9f9f | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e5c4,f0f0f0f0 | 
					
						
							|  |  |  | 348e5c8,f0f0f0cf | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e5cc,cfafafaf | 
					
						
							|  |  |  | 348e5d0,9f9ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e5d4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e5d8,f0f0f0cf | 
					
						
							|  |  |  | 348e5dc,afafaf9f | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e5e0,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e5e4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e5e8,f0f0f0cf | 
					
						
							|  |  |  | 348e5ec,aff0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e5f0,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e5f4,f0f0f0f0 | 
					
						
							|  |  |  | 348e5f8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e5fc,f0f0f0f0 | 
					
						
							|  |  |  | 348e600,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e604,f0f0f0f0 | 
					
						
							|  |  |  | 348e608,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e60c,f0f0f0f0 | 
					
						
							|  |  |  | 348e610,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e614,f0f0f0f0 | 
					
						
							|  |  |  | 348e618,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e61c,f0f0f0f0 | 
					
						
							|  |  |  | 348e620,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e624,f0f0f0f0 | 
					
						
							|  |  |  | 348e628,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e62c,f0f0f0f0 | 
					
						
							|  |  |  | 348e630,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e634,f0f0f0f0 | 
					
						
							|  |  |  | 348e638,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e63c,f0f0f0ff | 
					
						
							|  |  |  | 348e640,ff9ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e644,f0f0f0f0 | 
					
						
							|  |  |  | 348e648,f0f0f0f0 | 
					
						
							|  |  |  | 348e64c,f0f0ffff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e650,ff9ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e654,f0f0f0f0 | 
					
						
							|  |  |  | 348e658,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e65c,f0f0ffff | 
					
						
							|  |  |  | 348e660,9f9ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e664,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e668,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e66c,f0f0ffff | 
					
						
							|  |  |  | 348e670,9f9ff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e674,f0f0f0f0 | 
					
						
							|  |  |  | 348e678,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e67c,f0efef9f | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e680,9f9f9ff0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e684,f0f0f0f0 | 
					
						
							|  |  |  | 348e688,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e68c,f0efef9f | 
					
						
							|  |  |  | 348e690,9f9f8ff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e694,f0f0f0f0 | 
					
						
							|  |  |  | 348e698,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e69c,f0efef9f | 
					
						
							|  |  |  | 348e6a0,9f8f8ff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e6a4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e6a8,f0f0f0f0 | 
					
						
							|  |  |  | 348e6ac,efef9f9f | 
					
						
							|  |  |  | 348e6b0,8f8f8ff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e6b4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e6b8,f0f0f0f0 | 
					
						
							|  |  |  | 348e6bc,efef9f8f | 
					
						
							|  |  |  | 348e6c0,8f8f8ff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e6c4,f0f0f0f0 | 
					
						
							|  |  |  | 348e6c8,f0f0f0ef | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e6cc,efef8f8f | 
					
						
							|  |  |  | 348e6d0,8f8ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e6d4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e6d8,f0f0f0ef | 
					
						
							|  |  |  | 348e6dc,ef8f8f8f | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e6e0,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e6e4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e6e8,f0f0f0ef | 
					
						
							|  |  |  | 348e6ec,ef8f8ff0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e6f0,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e6f4,f0f0f0f0 | 
					
						
							|  |  |  | 348e6f8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e6fc,8ff0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e700,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e704,f0f0f0f0 | 
					
						
							|  |  |  | 348e708,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e70c,f0f0f0f0 | 
					
						
							|  |  |  | 348e710,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e714,f0f0f0f0 | 
					
						
							|  |  |  | 348e718,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e71c,f0f0f0f0 | 
					
						
							|  |  |  | 348e720,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e724,f0f0f0f0 | 
					
						
							|  |  |  | 348e728,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e72c,f0f0f0f0 | 
					
						
							|  |  |  | 348e730,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e734,f0f0f0f0 | 
					
						
							|  |  |  | 348e738,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e73c,f0f0f0ff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e740,ff7ff0f0 | 
					
						
							|  |  |  | 348e744,f0f0f0f0 | 
					
						
							|  |  |  | 348e748,f0f0f0f0 | 
					
						
							|  |  |  | 348e74c,f0f0ffff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e750,ff7ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e754,f0f0f0f0 | 
					
						
							|  |  |  | 348e758,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e75c,f0f0ffff | 
					
						
							|  |  |  | 348e760,ff7ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e764,f0f0f0f0 | 
					
						
							|  |  |  | 348e768,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e76c,f0f0ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e770,7f7ff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e774,f0f0f0f0 | 
					
						
							|  |  |  | 348e778,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e77c,f0ffffff | 
					
						
							|  |  |  | 348e780,7f7ff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e784,f0f0f0f0 | 
					
						
							|  |  |  | 348e788,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e78c,f0ffffff | 
					
						
							|  |  |  | 348e790,7f7ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e794,f0f0f0f0 | 
					
						
							|  |  |  | 348e798,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e79c,f0ffff7f | 
					
						
							|  |  |  | 348e7a0,7f7f7ff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e7a4,f0f0f0f0 | 
					
						
							|  |  |  | 348e7a8,f0f0f0f0 | 
					
						
							|  |  |  | 348e7ac,ffffff7f | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e7b0,7f7f6ff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e7b4,f0f0f0f0 | 
					
						
							|  |  |  | 348e7b8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e7bc,ffffff7f | 
					
						
							|  |  |  | 348e7c0,7f6f6ff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e7c4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e7c8,f0f0f0f0 | 
					
						
							|  |  |  | 348e7cc,ffffff7f | 
					
						
							|  |  |  | 348e7d0,7f6ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e7d4,f0f0f0f0 | 
					
						
							|  |  |  | 348e7d8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e7dc,ffff7f7f | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e7e0,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e7e4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e7e8,f0f0f0ff | 
					
						
							|  |  |  | 348e7ec,ffff7ff0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e7f0,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e7f4,f0f0f0f0 | 
					
						
							|  |  |  | 348e7f8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e7fc,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e800,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e804,f0f0f0f0 | 
					
						
							|  |  |  | 348e808,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e80c,f0f0f0f0 | 
					
						
							|  |  |  | 348e810,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e814,f0f0f0f0 | 
					
						
							|  |  |  | 348e818,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e81c,f0f0f0f0 | 
					
						
							|  |  |  | 348e820,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e824,f0f0f0f0 | 
					
						
							|  |  |  | 348e828,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e82c,f0f0f0f0 | 
					
						
							|  |  |  | 348e830,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e834,f0f0f0f0 | 
					
						
							|  |  |  | 348e838,f0f0f0f0 | 
					
						
							|  |  |  | 348e83c,f0f0ffff | 
					
						
							|  |  |  | 348e840,ff5ff0f0 | 
					
						
							|  |  |  | 348e844,f0f0f0f0 | 
					
						
							|  |  |  | 348e848,f0f0f0f0 | 
					
						
							|  |  |  | 348e84c,f0f0ffff | 
					
						
							|  |  |  | 348e850,ff5ff0f0 | 
					
						
							|  |  |  | 348e854,f0f0f0f0 | 
					
						
							|  |  |  | 348e858,f0f0f0f0 | 
					
						
							|  |  |  | 348e85c,f0f0ffff | 
					
						
							|  |  |  | 348e860,ff5ff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e864,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e868,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e86c,f0f0ffff | 
					
						
							|  |  |  | 348e870,ff5ff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e874,f0f0f0f0 | 
					
						
							|  |  |  | 348e878,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e87c,f0f0ffff | 
					
						
							|  |  |  | 348e880,ff5ff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e884,f0f0f0f0 | 
					
						
							|  |  |  | 348e888,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e88c,f0ffffff | 
					
						
							|  |  |  | 348e890,5f5ff0f0 | 
					
						
							|  |  |  | 348e894,f0f0f0f0 | 
					
						
							|  |  |  | 348e898,f0f0f0f0 | 
					
						
							|  |  |  | 348e89c,f0ffffff | 
					
						
							|  |  |  | 348e8a0,5f5ff0f0 | 
					
						
							|  |  |  | 348e8a4,f0f0f0f0 | 
					
						
							|  |  |  | 348e8a8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e8ac,f0ffffff | 
					
						
							|  |  |  | 348e8b0,5f5ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e8b4,f0f0f0f0 | 
					
						
							|  |  |  | 348e8b8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e8bc,f0ffffff | 
					
						
							|  |  |  | 348e8c0,5f5ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e8c4,f0f0f0f0 | 
					
						
							|  |  |  | 348e8c8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e8cc,ffffffff | 
					
						
							|  |  |  | 348e8d0,5ff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e8d4,f0f0f0f0 | 
					
						
							|  |  |  | 348e8d8,f0f0f0f0 | 
					
						
							|  |  |  | 348e8dc,ffffff5f | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e8e0,5ff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e8e4,f0f0f0f0 | 
					
						
							|  |  |  | 348e8e8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e8ec,ffffff5f | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e8f0,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e8f4,f0f0f0f0 | 
					
						
							|  |  |  | 348e8f8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e8fc,ffffff5f | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e900,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e904,f0f0f0f0 | 
					
						
							|  |  |  | 348e908,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e90c,f0f0fff0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348e910,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e914,f0f0f0f0 | 
					
						
							|  |  |  | 348e918,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e91c,f0f0f0f0 | 
					
						
							|  |  |  | 348e920,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e924,f0f0f0f0 | 
					
						
							|  |  |  | 348e928,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e92c,f0f0f0f0 | 
					
						
							|  |  |  | 348e930,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e934,f0f0f0f0 | 
					
						
							|  |  |  | 348e938,f0f0f0f0 | 
					
						
							|  |  |  | 348e93c,f0f0ffff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e940,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348e944,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e948,f0f0f0f0 | 
					
						
							|  |  |  | 348e94c,f0f0ffff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e950,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348e954,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e958,f0f0f0f0 | 
					
						
							|  |  |  | 348e95c,f0f0ffff | 
					
						
							|  |  |  | 348e960,ff3ff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e964,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e968,f0f0f0f0 | 
					
						
							|  |  |  | 348e96c,f0f0ffff | 
					
						
							|  |  |  | 348e970,ff3ff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e974,f0f0f0f0 | 
					
						
							|  |  |  | 348e978,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e97c,f0f0ffff | 
					
						
							|  |  |  | 348e980,ff3ff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348e984,f0f0f0f0 | 
					
						
							|  |  |  | 348e988,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e98c,f0f0ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e990,ff3ff0f0 | 
					
						
							|  |  |  | 348e994,f0f0f0f0 | 
					
						
							|  |  |  | 348e998,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e99c,f0f0ffff | 
					
						
							|  |  |  | 348e9a0,ff3ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e9a4,f0f0f0f0 | 
					
						
							|  |  |  | 348e9a8,f0f0f0f0 | 
					
						
							|  |  |  | 348e9ac,f0ffffff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e9b0,ff3ff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e9b4,f0f0f0f0 | 
					
						
							|  |  |  | 348e9b8,f0f0f0f0 | 
					
						
							|  |  |  | 348e9bc,f0ffffff | 
					
						
							|  |  |  | 348e9c0,fff0f0f0 | 
					
						
							|  |  |  | 348e9c4,f0f0f0f0 | 
					
						
							|  |  |  | 348e9c8,f0f0f0f0 | 
					
						
							|  |  |  | 348e9cc,f0ffffff | 
					
						
							|  |  |  | 348e9d0,fff0f0f0 | 
					
						
							|  |  |  | 348e9d4,f0f0f0f0 | 
					
						
							|  |  |  | 348e9d8,f0f0f0f0 | 
					
						
							|  |  |  | 348e9dc,f0ffffff | 
					
						
							|  |  |  | 348e9e0,fff0f0f0 | 
					
						
							|  |  |  | 348e9e4,f0f0f0f0 | 
					
						
							|  |  |  | 348e9e8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e9ec,f0ffffff | 
					
						
							|  |  |  | 348e9f0,fff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348e9f4,f0f0f0f0 | 
					
						
							|  |  |  | 348e9f8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348e9fc,f0ffffff | 
					
						
							|  |  |  | 348ea00,fff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ea04,f0f0f0f0 | 
					
						
							|  |  |  | 348ea08,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ea0c,f0f0f0ff | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348ea10,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ea14,f0f0f0f0 | 
					
						
							|  |  |  | 348ea18,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ea1c,f0f0f0f0 | 
					
						
							|  |  |  | 348ea20,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ea24,f0f0f0f0 | 
					
						
							|  |  |  | 348ea28,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ea2c,f0f0f0f0 | 
					
						
							|  |  |  | 348ea30,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ea34,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ea38,f0f0f0f0 | 
					
						
							|  |  |  | 348ea3c,f0f0ffff | 
					
						
							|  |  |  | 348ea40,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ea44,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ea48,f0f0f0f0 | 
					
						
							|  |  |  | 348ea4c,f0f0ffff | 
					
						
							|  |  |  | 348ea50,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ea54,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ea58,f0f0f0f0 | 
					
						
							|  |  |  | 348ea5c,f0f0ffff | 
					
						
							|  |  |  | 348ea60,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ea64,f0f0f0f0 | 
					
						
							|  |  |  | 348ea68,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ea6c,f0f0ffff | 
					
						
							|  |  |  | 348ea70,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ea74,f0f0f0f0 | 
					
						
							|  |  |  | 348ea78,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ea7c,f0f0ffff | 
					
						
							|  |  |  | 348ea80,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ea84,f0f0f0f0 | 
					
						
							|  |  |  | 348ea88,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ea8c,f0f0ffff | 
					
						
							|  |  |  | 348ea90,fffff0f0 | 
					
						
							|  |  |  | 348ea94,f0f0f0f0 | 
					
						
							|  |  |  | 348ea98,f0f0f0f0 | 
					
						
							|  |  |  | 348ea9c,f0f0ffff | 
					
						
							|  |  |  | 348eaa0,fffff0f0 | 
					
						
							|  |  |  | 348eaa4,f0f0f0f0 | 
					
						
							|  |  |  | 348eaa8,f0f0f0f0 | 
					
						
							|  |  |  | 348eaac,f0f0ffff | 
					
						
							|  |  |  | 348eab0,fffff0f0 | 
					
						
							|  |  |  | 348eab4,f0f0f0f0 | 
					
						
							|  |  |  | 348eab8,f0f0f0f0 | 
					
						
							|  |  |  | 348eabc,f0f0ffff | 
					
						
							|  |  |  | 348eac0,fffff0f0 | 
					
						
							|  |  |  | 348eac4,f0f0f0f0 | 
					
						
							|  |  |  | 348eac8,f0f0f0f0 | 
					
						
							|  |  |  | 348eacc,f0f0ffff | 
					
						
							|  |  |  | 348ead0,fffff0f0 | 
					
						
							|  |  |  | 348ead4,f0f0f0f0 | 
					
						
							|  |  |  | 348ead8,f0f0f0f0 | 
					
						
							|  |  |  | 348eadc,f0f0ffff | 
					
						
							|  |  |  | 348eae0,fffff0f0 | 
					
						
							|  |  |  | 348eae4,f0f0f0f0 | 
					
						
							|  |  |  | 348eae8,f0f0f0f0 | 
					
						
							|  |  |  | 348eaec,f0f0ffff | 
					
						
							|  |  |  | 348eaf0,fffff0f0 | 
					
						
							|  |  |  | 348eaf4,f0f0f0f0 | 
					
						
							|  |  |  | 348eaf8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eafc,f0f0ffff | 
					
						
							|  |  |  | 348eb00,fffff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eb04,f0f0f0f0 | 
					
						
							|  |  |  | 348eb08,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eb0c,f0f0ffff | 
					
						
							|  |  |  | 348eb10,fffff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eb14,f0f0f0f0 | 
					
						
							|  |  |  | 348eb18,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eb1c,f0f0f0f0 | 
					
						
							|  |  |  | 348eb20,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eb24,f0f0f0f0 | 
					
						
							|  |  |  | 348eb28,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eb2c,f0f0f0f0 | 
					
						
							|  |  |  | 348eb30,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348eb34,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eb38,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eb3c,f0f0ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eb40,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348eb44,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eb48,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eb4c,f0f0ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eb50,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348eb54,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eb58,f0f0f0f0 | 
					
						
							|  |  |  | 348eb5c,f0f03fff | 
					
						
							|  |  |  | 348eb60,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348eb64,f0f0f0f0 | 
					
						
							|  |  |  | 348eb68,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eb6c,f0f03fff | 
					
						
							|  |  |  | 348eb70,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348eb74,f0f0f0f0 | 
					
						
							|  |  |  | 348eb78,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eb7c,f0f03fff | 
					
						
							|  |  |  | 348eb80,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348eb84,f0f0f0f0 | 
					
						
							|  |  |  | 348eb88,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eb8c,f0f03fff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eb90,fffff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eb94,f0f0f0f0 | 
					
						
							|  |  |  | 348eb98,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eb9c,f0f03fff | 
					
						
							|  |  |  | 348eba0,fffff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eba4,f0f0f0f0 | 
					
						
							|  |  |  | 348eba8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ebac,f0f03fff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ebb0,fffffff0 | 
					
						
							|  |  |  | 348ebb4,f0f0f0f0 | 
					
						
							|  |  |  | 348ebb8,f0f0f0f0 | 
					
						
							|  |  |  | 348ebbc,f0f0f0ff | 
					
						
							|  |  |  | 348ebc0,fffffff0 | 
					
						
							|  |  |  | 348ebc4,f0f0f0f0 | 
					
						
							|  |  |  | 348ebc8,f0f0f0f0 | 
					
						
							|  |  |  | 348ebcc,f0f0f0ff | 
					
						
							|  |  |  | 348ebd0,fffffff0 | 
					
						
							|  |  |  | 348ebd4,f0f0f0f0 | 
					
						
							|  |  |  | 348ebd8,f0f0f0f0 | 
					
						
							|  |  |  | 348ebdc,f0f0f0ff | 
					
						
							|  |  |  | 348ebe0,fffffff0 | 
					
						
							|  |  |  | 348ebe4,f0f0f0f0 | 
					
						
							|  |  |  | 348ebe8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ebec,f0f0f0ff | 
					
						
							|  |  |  | 348ebf0,fffffff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ebf4,f0f0f0f0 | 
					
						
							|  |  |  | 348ebf8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ebfc,f0f0f0ff | 
					
						
							|  |  |  | 348ec00,fffffff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ec04,f0f0f0f0 | 
					
						
							|  |  |  | 348ec08,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ec0c,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ec10,fff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ec14,f0f0f0f0 | 
					
						
							|  |  |  | 348ec18,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ec1c,f0f0f0f0 | 
					
						
							|  |  |  | 348ec20,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ec24,f0f0f0f0 | 
					
						
							|  |  |  | 348ec28,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ec2c,f0f0f0f0 | 
					
						
							|  |  |  | 348ec30,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ec34,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ec38,f0f0f0f0 | 
					
						
							|  |  |  | 348ec3c,f0f05fff | 
					
						
							|  |  |  | 348ec40,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ec44,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ec48,f0f0f0f0 | 
					
						
							|  |  |  | 348ec4c,f0f05fff | 
					
						
							|  |  |  | 348ec50,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ec54,f0f0f0f0 | 
					
						
							|  |  |  | 348ec58,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ec5c,f0f05fff | 
					
						
							|  |  |  | 348ec60,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ec64,f0f0f0f0 | 
					
						
							|  |  |  | 348ec68,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ec6c,f0f05fff | 
					
						
							|  |  |  | 348ec70,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ec74,f0f0f0f0 | 
					
						
							|  |  |  | 348ec78,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ec7c,f0f05fff | 
					
						
							|  |  |  | 348ec80,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ec84,f0f0f0f0 | 
					
						
							|  |  |  | 348ec88,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ec8c,f0f05f5f | 
					
						
							|  |  |  | 348ec90,fffffff0 | 
					
						
							|  |  |  | 348ec94,f0f0f0f0 | 
					
						
							|  |  |  | 348ec98,f0f0f0f0 | 
					
						
							|  |  |  | 348ec9c,f0f05f5f | 
					
						
							|  |  |  | 348eca0,fffffff0 | 
					
						
							|  |  |  | 348eca4,f0f0f0f0 | 
					
						
							|  |  |  | 348eca8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ecac,f0f05f5f | 
					
						
							|  |  |  | 348ecb0,fffffff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ecb4,f0f0f0f0 | 
					
						
							|  |  |  | 348ecb8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ecbc,f0f05f5f | 
					
						
							|  |  |  | 348ecc0,fffffff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ecc4,f0f0f0f0 | 
					
						
							|  |  |  | 348ecc8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eccc,f0f0f05f | 
					
						
							|  |  |  | 348ecd0,ffffffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ecd4,f0f0f0f0 | 
					
						
							|  |  |  | 348ecd8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ecdc,f0f0f05f | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ece0,5fffffff | 
					
						
							|  |  |  | 348ece4,f0f0f0f0 | 
					
						
							|  |  |  | 348ece8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348ecec,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ecf0,5fffffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ecf4,f0f0f0f0 | 
					
						
							|  |  |  | 348ecf8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ecfc,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ed00,5fffffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ed04,f0f0f0f0 | 
					
						
							|  |  |  | 348ed08,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ed0c,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ed10,f0fff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ed14,f0f0f0f0 | 
					
						
							|  |  |  | 348ed18,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ed1c,f0f0f0f0 | 
					
						
							|  |  |  | 348ed20,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ed24,f0f0f0f0 | 
					
						
							|  |  |  | 348ed28,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ed2c,f0f0f0f0 | 
					
						
							|  |  |  | 348ed30,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ed34,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ed38,f0f0f0f0 | 
					
						
							|  |  |  | 348ed3c,f0f07fff | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ed40,fff0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ed44,f0f0f0f0 | 
					
						
							|  |  |  | 348ed48,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ed4c,f0f07fff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ed50,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ed54,f0f0f0f0 | 
					
						
							|  |  |  | 348ed58,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ed5c,f0f07fff | 
					
						
							|  |  |  | 348ed60,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ed64,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ed68,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ed6c,f0f07f7f | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ed70,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ed74,f0f0f0f0 | 
					
						
							|  |  |  | 348ed78,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ed7c,f0f07f7f | 
					
						
							|  |  |  | 348ed80,fffffff0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ed84,f0f0f0f0 | 
					
						
							|  |  |  | 348ed88,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ed8c,f0f07f7f | 
					
						
							|  |  |  | 348ed90,fffffff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ed94,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ed98,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ed9c,f07f7f7f | 
					
						
							|  |  |  | 348eda0,7ffffff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eda4,f0f0f0f0 | 
					
						
							|  |  |  | 348eda8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348edac,f06f7f7f | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348edb0,7fffffff | 
					
						
							|  |  |  | 348edb4,f0f0f0f0 | 
					
						
							|  |  |  | 348edb8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348edbc,f06f6f7f | 
					
						
							|  |  |  | 348edc0,7fffffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348edc4,f0f0f0f0 | 
					
						
							|  |  |  | 348edc8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348edcc,f0f06f7f | 
					
						
							|  |  |  | 348edd0,7fffffff | 
					
						
							|  |  |  | 348edd4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348edd8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348eddc,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ede0,7f7fffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ede4,f0f0f0f0 | 
					
						
							|  |  |  | 348ede8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348edec,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348edf0,f07fffff | 
					
						
							|  |  |  | 348edf4,fff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348edf8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348edfc,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ee00,f0f0ffff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ee04,f0f0f0f0 | 
					
						
							|  |  |  | 348ee08,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ee0c,f0f0f0f0 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | 348ee10,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ee14,f0f0f0f0 | 
					
						
							|  |  |  | 348ee18,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ee1c,f0f0f0f0 | 
					
						
							|  |  |  | 348ee20,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ee24,f0f0f0f0 | 
					
						
							|  |  |  | 348ee28,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ee2c,f0f0f0f0 | 
					
						
							|  |  |  | 348ee30,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ee34,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ee38,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ee3c,f0f09fff | 
					
						
							|  |  |  | 348ee40,fff0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ee44,f0f0f0f0 | 
					
						
							|  |  |  | 348ee48,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ee4c,f0f09fff | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ee50,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ee54,f0f0f0f0 | 
					
						
							|  |  |  | 348ee58,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ee5c,f0f09f9f | 
					
						
							|  |  |  | 348ee60,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ee64,f0f0f0f0 | 
					
						
							|  |  |  | 348ee68,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ee6c,f0f09f9f | 
					
						
							|  |  |  | 348ee70,fffff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ee74,f0f0f0f0 | 
					
						
							|  |  |  | 348ee78,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ee7c,f09f9f9f | 
					
						
							|  |  |  | 348ee80,9fffeff0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ee84,f0f0f0f0 | 
					
						
							|  |  |  | 348ee88,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ee8c,f08f9f9f | 
					
						
							|  |  |  | 348ee90,9fefeff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ee94,f0f0f0f0 | 
					
						
							|  |  |  | 348ee98,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ee9c,f08f8f9f | 
					
						
							|  |  |  | 348eea0,9fefeff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eea4,f0f0f0f0 | 
					
						
							|  |  |  | 348eea8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eeac,f08f8f8f | 
					
						
							|  |  |  | 348eeb0,9f9fefef | 
					
						
							|  |  |  | 348eeb4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eeb8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eebc,f08f8f8f | 
					
						
							|  |  |  | 348eec0,8f9fefef | 
					
						
							|  |  |  | 348eec4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eec8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eecc,f0f08f8f | 
					
						
							|  |  |  | 348eed0,8f8fefef | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eed4,eff0f0f0 | 
					
						
							|  |  |  | 348eed8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348eedc,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eee0,8f8f8fef | 
					
						
							|  |  |  | 348eee4,eff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eee8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348eeec,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eef0,f08f8fef | 
					
						
							|  |  |  | 348eef4,eff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eef8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348eefc,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ef00,f0f0f08f | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ef04,f0f0f0f0 | 
					
						
							|  |  |  | 348ef08,f0f0f0f0 | 
					
						
							| 
									
										
											  
											
												Ocarina of Time (#64)
* first commit (not including OoT data files yet)
* added some basic options
* rule parser works now at least
* make sure to commit everything this time
* temporary change to BaseClasses for oot
* overworld location graph builds mostly correctly
* adding oot data files
* commenting out world options until later since they only existed to make the RuleParser work
* conversion functions between AP ids and OOT ids
* world graph outputs
* set scrub prices
* itempool generates, entrances connected, way too many options added
* fixed set_rules and set_shop_rules
* temp baseclasses changes
* Reaches the fill step now, old event-based system retained in case the new way breaks
* Song placements and misc fixes everywhere
* temporary changes to make oot work
* changed root exits for AP fill framework
* prevent infinite recursion due to OoT sharing usage of the address field
* age reachability works hopefully, songs are broken again
* working spoiler log generation on beatable-only
* Logic tricks implemented
* need this for logic tricks
* fixed map/compass being placed on Serenade location
* kill unreachable events before filling the world
* add a bunch of utility functions to prepare for rom patching
* move OptionList into generic options
* fixed some silly bugs with OptionList
* properly seed all random behavior (so far)
* ROM generation working
* fix hints trying to get alttp dungeon hint texts
* continue fixing hints
* add oot to network data package
* change item and location IDs to 66000 and 67000 range respectively
* push removed items to precollected items
* fixed various issues with cross-contamination with multiple world generation
* reenable glitched logic (hopefully)
* glitched world files age-check fix
* cleaned up some get_locations calls
* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work
* reenable MQ dungeons
* fix forest mq exception
* made targeting style an option for now, will be cosmetic later
* reminder to move targeting to cosmetics
* some oot option maintenance
* enabled starting time of day
* fixed issue breaking shop slots in multiworld generation
* added "off" option for text shuffle and hints
* shopsanity functionality restored
* change patch file extension
* remove unnecessary utility functions + imports
* update MIT license
* change option to "patch_uncompressed_rom" instead of "compress_rom"
* compliance with new AutoWorld systems
* Kill only internal events, remove non-internal big poe event in code
* re-add the big poe event and handle it correctly
* remove extra method in Range option
* fix typo
* Starting items, starting with consumables option
* do not remove nonexistent item
* move set_shop_rules to after shop items are placed
* some cleanup
* add retries for song placement
* flagged Skull Mask and Mask of Truth as advancement items
* update OoT to use LogicMixin
* Fixed trying to assign starting items from the wrong players
* fixed song retry step
* improved option handling, comments, and starting item replacements
* DefaultOnToggle writes Yes or No to spoiler
* enable compression of output if Compress executable is present
* clean up compression
* check whether (de)compressor exists before running the process
* allow specification of rom path in host.yaml
* check if decompressed file already exists before decompressing again
* fix triforce hunt generation
* rename all the oot state functions with prefix
* OoT: mark triforce pieces as completion goal for triforce hunt
* added overworld and any-dungeon shuffle for dungeon items
* Hide most unshuffled locations and events from the list of locations in spoiler
* build oot option ranges with a generic function instead of defining each separately
* move oot output-type control to host.yaml instead of individual yamls
* implement dungeon song shuffle
* minor improvements to overworld dungeon item shuffle
* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list
* always output patch file to folder, remove option to generate ROM in preparation for removal
* re-add the fix for infinite recursion due to not being light or dark world
* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently
* oot: remove item_names and location_names
* oot: minor fixes
* oot: comment out ROM patching
* oot: only add CollectionState objects on creation if actually needed
* main entrance shuffle method and entrances-based rules
* fix entrances based rules
* disable master quest and big poe count options for client compatibility
* use get_player_name instead of get_player_names
* fix OptionList
* fix oot options for new option system
* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES
* fill AP player name in oot rom with 0 instead of 0xDF
* encode player name with ASCII for fixed-width
* revert oot player name array to 8 bytes per name
* remove Pierre location if fast scarecrow is on
* check player name length
* "free_scarecrow" not "fast_scarecrow"
* OoT locations now properly store the AP ID instead of the oot internal ID
* oot __version__ updates in lockstep with AP version
* pull in unmodified oot cosmetic files
* also grab JSONDump since it's needed apparently
* gather extra needed methods, modify imports
* delete cosmetics log, replace all instances of SettingsList with OOTWorld
* cosmetic options working, except for sound effects (due to ear-safe issues)
* SFX, Music, and Fanfare randomization reenabled
* move OoT data files into the worlds folder
* move Compress and Decompress into oot data folder
* Replace get_all_state with custom method to avoid the cache
* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues
* set data_version to 0
* make Kokiri Sword shuffle off by default
* reenable "Random Choice" for various cosmetic options
* kill Ruto's Letter turnin if open fountain
also fix for shopsanity
* place Buy Goron/Zora Tunic first in shop shuffle
* make ice traps appear as other items instead of breaking generation
* managed to break ice traps on non-major-only
* only handle ice traps if they are on
* fix shopsanity for non-oot games, and write player name instead of player number
* light arrows hint uses player name instead of player number
* Reenable "skip child zelda" option
* fix entrances_based_rules
* fix ganondorf hint if starting with light arrows
* fix dungeonitem shuffle and shopsanity interaction
* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group
* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any
* keep bosses and bombchu bowling chus out of data package
* revert workaround for infinite recursion and fix it properly
* fix shared shop id caches during patching process
* fix shop text box overflows, as much as possible
* add default oot host.yaml option
* add .apz5, .n64, .z64 to gitignore
* Properly document and name all (functioning) OOT options
* clean up some imports
* remove unnecessary files from oot's data
* fix typo in gitignore
* readd the Compress and Decompress utilities, since they are needed for generation
* cleanup of imports and some minor optimizations
* increase shop offset for item IDs to 0xCB
* remove shop item AP ids entirely
* prevent triforce pieces for other players from being received by yourself
* add "excluded" property to Location
* Hint system adapted and reenabled; hints still unseeded
* make hints deterministic with lists instead of sets
* do not allow hints to point to Light Arrows on non-vanilla bridge
* foreign locations hint as their full name in OoT rather than their region
* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated
* consolidate versioning in Utils
* ice traps appear as major items rather than any progression item
* set prescription and claim check as defaults for adult trade item settings
* add oot options to playerSettings
* allow case-insensitive logic tricks in yaml
* fix oot shopsanity option formatting
* Write OoT override info even if local item, enabling local checks to show up immediately in the client
* implement CollectionState.can_live_dmg for oot glitched logic
* filter item names for invalid characters when patching shops
* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world
* set hidden-spoiler items and locations with Shop items to events
* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start
* Fix oot Glitched and No Logic generation
* fix indenting
* Greatly reduce displayed cosmetic options
* Change oot data version to 1
* add apz5 distribution to webhost
* print player name if an ALttP dungeon contains a good item for OoT world
* delete unneeded commented code
* remove OcarinaSongs import to satisfy lint
											
										 
											2021-09-02 08:35:05 -04:00
										 |  |  | 348ef0c,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ef10,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ef14,f0f0f0f0 | 
					
						
							|  |  |  | 348ef18,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ef1c,f0f0f0f0 | 
					
						
							|  |  |  | 348ef20,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ef24,f0f0f0f0 | 
					
						
							|  |  |  | 348ef28,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ef2c,f0f0f0f0 | 
					
						
							|  |  |  | 348ef30,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-10 10:04:56 -05:00
										 |  |  | 348ef34,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-17 10:00:59 -05:00
										 |  |  | 348ef38,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ef3c,f0f0f0ef | 
					
						
							|  |  |  | 348ef40,eff0f0f0 | 
					
						
							| 
									
										
										
										
											2021-09-17 10:00:59 -05:00
										 |  |  | 348ef44,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-07 08:09:21 -06:00
										 |  |  | 348ef48,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ef4c,f0f0bfbf | 
					
						
							|  |  |  | 348ef50,eff0f0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ef54,f0f0f0f0 | 
					
						
							|  |  |  | 348ef58,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ef5c,f0f0bfbf | 
					
						
							|  |  |  | 348ef60,dfdff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ef64,f0f0f0f0 | 
					
						
							|  |  |  | 348ef68,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ef6c,f0f0afbf | 
					
						
							|  |  |  | 348ef70,bfdff0f0 | 
					
						
							| 
									
										
										
										
											2021-11-13 14:07:17 -06:00
										 |  |  | 348ef74,f0f0f0f0 | 
					
						
							|  |  |  | 348ef78,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ef7c,f0afafaf | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ef80,afdfdff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ef84,f0f0f0f0 | 
					
						
							|  |  |  | 348ef88,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ef8c,f0afafaf | 
					
						
							|  |  |  | 348ef90,afafdff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348ef94,f0f0f0f0 | 
					
						
							|  |  |  | 348ef98,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348ef9c,f0afafaf | 
					
						
							|  |  |  | 348efa0,afafdfdf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348efa4,f0f0f0f0 | 
					
						
							|  |  |  | 348efa8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348efac,9fafafaf | 
					
						
							|  |  |  | 348efb0,afafdfdf | 
					
						
							|  |  |  | 348efb4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348efb8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348efbc,9f9fafaf | 
					
						
							|  |  |  | 348efc0,afafafcf | 
					
						
							|  |  |  | 348efc4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348efc8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348efcc,f0f09f9f | 
					
						
							|  |  |  | 348efd0,afafafcf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348efd4,cff0f0f0 | 
					
						
							|  |  |  | 348efd8,f0f0f0f0 | 
					
						
							|  |  |  | 348efdc,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348efe0,9fafafaf | 
					
						
							|  |  |  | 348efe4,cff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348efe8,f0f0f0f0 | 
					
						
							|  |  |  | 348efec,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348eff0,f0f0f0af | 
					
						
							|  |  |  | 348eff4,cff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348eff8,f0f0f0f0 | 
					
						
							|  |  |  | 348effc,f0f0f0f0 | 
					
						
							|  |  |  | 348f000,f0f0f0f0 | 
					
						
							|  |  |  | 348f004,f0f0f0f0 | 
					
						
							|  |  |  | 348f008,f0f0f0f0 | 
					
						
							|  |  |  | 348f00c,f0f0f0f0 | 
					
						
							|  |  |  | 348f010,f0f0f0f0 | 
					
						
							|  |  |  | 348f014,f0f0f0f0 | 
					
						
							|  |  |  | 348f018,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f01c,f0f0f0f0 | 
					
						
							|  |  |  | 348f020,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f024,f0f0f0f0 | 
					
						
							|  |  |  | 348f028,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f02c,f0f0f0f0 | 
					
						
							|  |  |  | 348f030,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f034,f0f0f0f0 | 
					
						
							|  |  |  | 348f038,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f03c,f0f0f0cf | 
					
						
							|  |  |  | 348f040,cff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f044,f0f0f0f0 | 
					
						
							|  |  |  | 348f048,f0f0f0f0 | 
					
						
							|  |  |  | 348f04c,f0f0cfcf | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f050,cff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f054,f0f0f0f0 | 
					
						
							|  |  |  | 348f058,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f05c,f0f0cfcf | 
					
						
							|  |  |  | 348f060,cfbff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f064,f0f0f0f0 | 
					
						
							|  |  |  | 348f068,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f06c,f0f0cfcf | 
					
						
							|  |  |  | 348f070,cfbff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f074,f0f0f0f0 | 
					
						
							|  |  |  | 348f078,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f07c,f0bfbfbf | 
					
						
							|  |  |  | 348f080,cfcfbff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f084,f0f0f0f0 | 
					
						
							|  |  |  | 348f088,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f08c,f0bfbfbf | 
					
						
							|  |  |  | 348f090,bfbfbff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f094,f0f0f0f0 | 
					
						
							|  |  |  | 348f098,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f09c,bfbfbfbf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f0a0,bfbfbfbf | 
					
						
							|  |  |  | 348f0a4,f0f0f0f0 | 
					
						
							|  |  |  | 348f0a8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f0ac,bfbfbfbf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f0b0,bfbfbfbf | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f0b4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f0b8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f0bc,afafbfbf | 
					
						
							|  |  |  | 348f0c0,bfbfbfbf | 
					
						
							|  |  |  | 348f0c4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f0c8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f0cc,f0afafaf | 
					
						
							|  |  |  | 348f0d0,bfbfbfbf | 
					
						
							|  |  |  | 348f0d4,aff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f0d8,f0f0f0f0 | 
					
						
							|  |  |  | 348f0dc,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f0e0,f0afbfbf | 
					
						
							|  |  |  | 348f0e4,bff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f0e8,f0f0f0f0 | 
					
						
							|  |  |  | 348f0ec,f0f0f0f0 | 
					
						
							|  |  |  | 348f0f0,f0f0f0f0 | 
					
						
							|  |  |  | 348f0f4,f0f0f0f0 | 
					
						
							|  |  |  | 348f0f8,f0f0f0f0 | 
					
						
							|  |  |  | 348f0fc,f0f0f0f0 | 
					
						
							|  |  |  | 348f100,f0f0f0f0 | 
					
						
							|  |  |  | 348f104,f0f0f0f0 | 
					
						
							|  |  |  | 348f108,f0f0f0f0 | 
					
						
							|  |  |  | 348f10c,f0f0f0f0 | 
					
						
							|  |  |  | 348f110,f0f0f0f0 | 
					
						
							|  |  |  | 348f114,f0f0f0f0 | 
					
						
							|  |  |  | 348f118,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f11c,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f120,f0f0f0f0 | 
					
						
							|  |  |  | 348f124,f0f0f0f0 | 
					
						
							|  |  |  | 348f128,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f12c,f0f0f0f0 | 
					
						
							|  |  |  | 348f130,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f134,f0f0f0f0 | 
					
						
							|  |  |  | 348f138,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f13c,f0f0f0df | 
					
						
							|  |  |  | 348f140,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f144,f0f0f0f0 | 
					
						
							|  |  |  | 348f148,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f14c,f0f0f0df | 
					
						
							|  |  |  | 348f150,dff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f154,f0f0f0f0 | 
					
						
							|  |  |  | 348f158,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f15c,f0f0cfdf | 
					
						
							|  |  |  | 348f160,dff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f164,f0f0f0f0 | 
					
						
							|  |  |  | 348f168,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f16c,f0f0cfcf | 
					
						
							|  |  |  | 348f170,cfcff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f174,f0f0f0f0 | 
					
						
							|  |  |  | 348f178,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f17c,f0cfcfcf | 
					
						
							|  |  |  | 348f180,cfcff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f184,f0f0f0f0 | 
					
						
							|  |  |  | 348f188,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f18c,f0cfcfcf | 
					
						
							|  |  |  | 348f190,cfcfcff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f194,f0f0f0f0 | 
					
						
							|  |  |  | 348f198,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f19c,cfcfcfcf | 
					
						
							|  |  |  | 348f1a0,cfcfcff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f1a4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f1a8,f0f0f0f0 | 
					
						
							|  |  |  | 348f1ac,bfbfcfcf | 
					
						
							|  |  |  | 348f1b0,cfcfcfcf | 
					
						
							|  |  |  | 348f1b4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f1b8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f1bc,bfbfbfbf | 
					
						
							|  |  |  | 348f1c0,bfbfbfbf | 
					
						
							|  |  |  | 348f1c4,f0f0f0f0 | 
					
						
							|  |  |  | 348f1c8,f0f0f0bf | 
					
						
							|  |  |  | 348f1cc,bfbfbfbf | 
					
						
							|  |  |  | 348f1d0,bfbfbfbf | 
					
						
							|  |  |  | 348f1d4,bff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f1d8,f0f0f0f0 | 
					
						
							|  |  |  | 348f1dc,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f1e0,f0f0bfbf | 
					
						
							|  |  |  | 348f1e4,bff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f1e8,f0f0f0f0 | 
					
						
							|  |  |  | 348f1ec,f0f0f0f0 | 
					
						
							|  |  |  | 348f1f0,f0f0f0f0 | 
					
						
							|  |  |  | 348f1f4,f0f0f0f0 | 
					
						
							|  |  |  | 348f1f8,f0f0f0f0 | 
					
						
							|  |  |  | 348f1fc,f0f0f0f0 | 
					
						
							|  |  |  | 348f200,f0f0f0f0 | 
					
						
							|  |  |  | 348f204,f0f0f0f0 | 
					
						
							|  |  |  | 348f208,f0f0f0f0 | 
					
						
							|  |  |  | 348f20c,f0f0f0f0 | 
					
						
							|  |  |  | 348f210,f0f0f0f0 | 
					
						
							|  |  |  | 348f214,f0f0f0f0 | 
					
						
							|  |  |  | 348f218,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f21c,f0f0f0f0 | 
					
						
							|  |  |  | 348f220,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f224,f0f0f0f0 | 
					
						
							|  |  |  | 348f228,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f22c,f0f0f0f0 | 
					
						
							|  |  |  | 348f230,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f234,f0f0f0f0 | 
					
						
							|  |  |  | 348f238,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f23c,f0f0f0df | 
					
						
							|  |  |  | 348f240,dff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f244,f0f0f0f0 | 
					
						
							|  |  |  | 348f248,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f24c,f0f0f0df | 
					
						
							|  |  |  | 348f250,dff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f254,f0f0f0f0 | 
					
						
							|  |  |  | 348f258,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f25c,f0f0dfdf | 
					
						
							|  |  |  | 348f260,dfdff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f264,f0f0f0f0 | 
					
						
							|  |  |  | 348f268,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f26c,f0f0dfdf | 
					
						
							|  |  |  | 348f270,dfdff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f274,f0f0f0f0 | 
					
						
							|  |  |  | 348f278,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f27c,f0f0cfcf | 
					
						
							|  |  |  | 348f280,cfcff0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f284,f0f0f0f0 | 
					
						
							|  |  |  | 348f288,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f28c,f0cfcfcf | 
					
						
							|  |  |  | 348f290,cfcfcff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f294,f0f0f0f0 | 
					
						
							|  |  |  | 348f298,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f29c,f0cfcfcf | 
					
						
							|  |  |  | 348f2a0,cfcfcff0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f2a4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f2a8,f0f0f0f0 | 
					
						
							|  |  |  | 348f2ac,cfcfcfcf | 
					
						
							|  |  |  | 348f2b0,cfcfcfcf | 
					
						
							|  |  |  | 348f2b4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f2b8,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f2bc,cfcfcfcf | 
					
						
							|  |  |  | 348f2c0,cfcfcfcf | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f2c4,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f2c8,f0f0f0bf | 
					
						
							|  |  |  | 348f2cc,bfbfbfbf | 
					
						
							|  |  |  | 348f2d0,bfbfbfbf | 
					
						
							|  |  |  | 348f2d4,bff0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-01 13:27:53 -05:00
										 |  |  | 348f2d8,f0f0f0f0 | 
					
						
							|  |  |  | 348f2dc,f0f0f0f0 | 
					
						
							|  |  |  | 348f2e0,f0f0f0f0 | 
					
						
							|  |  |  | 348f2e4,f0f0f0f0 | 
					
						
							|  |  |  | 348f2e8,f0f0f0f0 | 
					
						
							|  |  |  | 348f2ec,f0f0f0f0 | 
					
						
							|  |  |  | 348f2f0,f0f0f0f0 | 
					
						
							|  |  |  | 348f2f4,f0f0f0f0 | 
					
						
							|  |  |  | 348f2f8,f0f0f0f0 | 
					
						
							|  |  |  | 348f2fc,f0f0f0f0 | 
					
						
							|  |  |  | 348f300,f0f0f0f0 | 
					
						
							|  |  |  | 348f304,f0f0f0f0 | 
					
						
							| 
									
										
										
										
											2022-05-25 22:39:54 -05:00
										 |  |  | 348f308,f0f0f0f0 | 
					
						
							|  |  |  | 348f30c,f0f0f0f0 | 
					
						
							|  |  |  | 348f310,f0f0f0f0 | 
					
						
							|  |  |  | 348f314,f0f0f0f0 | 
					
						
							|  |  |  | 348f318,f0f0f0f0 | 
					
						
							|  |  |  | 348f31c,f0f0f0f0 | 
					
						
							|  |  |  | 348f320,f0f0f0f0 | 
					
						
							|  |  |  | 348f324,f0f0f0f0 |