From cdf3d5b7768644045c1a79026ed4adf07eff1566 Mon Sep 17 00:00:00 2001 From: Cody Date: Wed, 15 Feb 2023 20:22:47 -0500 Subject: [PATCH 1/9] Update BaseClasses.py Fix --jsonout --- BaseClasses.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseClasses.py b/BaseClasses.py index edef87bd..3aa08442 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -2985,7 +2985,7 @@ class Spoiler(object): if self.shops: out['Shops'] = self.shops out['playthrough'] = self.playthrough - out['paths'] = {l:p for (l, p) in self.paths if l not in self.suppress_spoiler_locations} + out['paths'] = {l:p for (l, p) in self.paths.items() if l not in self.suppress_spoiler_locations} out['Bosses'] = self.bosses out['meta'] = self.metadata From cad2d632d36999eac62a13a41555e0fbe01e6bc4 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Thu, 29 Jun 2023 19:33:36 -0500 Subject: [PATCH 2/9] Fixed issue with Aga Door preventing TF Cutscene --- Rom.py | 2 +- data/base2current.bps | Bin 107581 -> 107658 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index b2621829..87d40d07 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'a5c37eecbe3e52b49639c0d0ad91a7c3' +RANDOMIZERBASEHASH = '32562fbd414b74de7ee7aa9b1063c487' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 82728c51fce85028ec9f2b5452c58a3c2a6ddfba..71872ae5513c8e0450e40c04ff8153010d83874f 100644 GIT binary patch delta 2960 zcmW+&dsGw09^T(Bd5{E107-Z!iy$aZDH@eZcvwL}1$MXED(F>F3z?0k@>)Vz zlL4ZFB?wUwHPu{?$AXV@6g{@|ww`)xeO#;7cTumEtM|%XJ9FmyW_ITH`_6p7`D4#q z64nh0o3yaNJSA67{k`XL&@Psa_@<`-v2=yG?Vj72cWG{%0j|MSu7Dhd3NDKZf*0K9 z6a!D34=F8K7_=4brK|4Q-#&ia6ohKodv*dbf`(I|{;|O!;(>m0&;IyvkA;5!fm_V< zL7tP5Gh^c}HtZMrC)2URwaS|J0 zzi-dJcwTK_>7VY~J6QV4eS0Cp(knQLQYW7A%r4$xrf+h2%B(RVuk2&%xw%W4wI-JS z^g)LkzZ1?KRr*i9_sagTujA6`=hy$ZS-6ueYly=IQUox3sSl zJ>#g=)2S^4c4n;ZBm;1`_p`IVIEW{8vt}LaFP^72wG33(b!TpU%8izON5(MR_iHAG zbP2SN#704v^bui{b_rFbzDA)V(kO~7dY_xw>I^N@%6Zv>?T3J`j9b;haBll&&-S}J zfW7HexU>)Z>hG|H%ld@v{@N>?`ft}5t#$ky#;LEWltC0XQo910orQJ9;s9$^>V1<6 z;pGfgBfOt^*m=9Vh_RNB|JixH`H2wHofldyDjKgBjWkB>WTz8!5UvjI#oD4lwyCJS z2)E+3$U0S2$9;Kxz`r|3)@Xi1Sc)xe`kWSPBspl@TimxWXvDd|DUtfNZJpoOr9&M9 zLw7!OFXUHoiQD+?G-`4D5$CaQZ)Aho#Y%yJF|B2H&@ibgYZHqNwSQ{Mn)MfR5cczc zP=9s{<$$shezfX5-kxdl7$T9xN~SV6#{=ShA|zsDSyWp%R43pTAx4D#5jJ_i=gPMG zJv-yo4Ll~4{leEsO&shX)O)bZ6Otqi_f@Oz8t;~=+wg2p$b^@8wfd_P2GTYf)6s_*2-3{%;^VXYS|A73Oi;5N%piQ{7wWph~0qZbaZ zOgtgk>=>p>&`%}E*(-B1RU*6wpZ9{T`RjgnygMh~L!{ZZZ&jcZBYSk3UY%xW#KEvc z8ZO_YKxcJb@-B;Y~Q{B!C);7YNVH$;jz?>8k~#NvxM#TybK18?+(DtL-t zc*6o%iD&viFuz*m12dFTcL{P32uvKfmn^^Ts*FlxugFalt@YmE9;%UxI<0c zRrh=2-+bX~qdsdG#-CoWcP)H0+%>l zQ_HmapeR>w67-M?>_*niWK`+z5|L16=nhPT;T<(CAltvDWg%4ri{w8?~0Oewqep8eZe4Mn4QSmJu21jDd`!*~FYX za|oh*&VbIe8JTweGqY>yptwmiC_PG*Xv<2BBD&>x$5FL2iD);TQ{!3H`y2wtj*}?N z!MRX~GrxLYcLCAv`0WIu9APe__zdELEsrD;$trv{1>(UUzf6JH1nCwNE9sp)V5&2- zlLrP)beBZ!+nYL|eIzH?RA&>Df(?$80Y}n+QG8duQiP>ASI3t>16S$*iAp!CkQ7DY zQ5}p8o;m+UcSPO|PLuR*uNNX6p{z7bbRc@>&B@9gD_y!&pvAJO<&EY{6ddJ+H!EH1 zvS2AGz?)|HApHGo7$cmXBSY=0@T1ufL`^BJ!QyPVJdTt4y=mUG%E|^oAk}EL1XDo- z0k$N>kYB47SevJLGyOv48$6N? zi4%8oVS&D=J0!ptaY;eGsFn;PIb50p(UiEN54Yq19qo~{`%E04A&KA{O!^DkLS#K> zA>qTCw{Id${_CqP7eB~>M(G0WZu2aDFBLDs`Z=KYX(K*r?h+DOC;&B)3D%Xlhp}QV zjHgsZFL26SSWR22@{e@sBpuQs7?#AuShH8uc9qMTWNHG*Vq@|8={2s)bD@NiVC5=b z)E>YC*5*SZrSm(1*X2XwRGbj&i}n)p+-lsk#9EuT&KK=>BZ>qa0v&;D&AkGm#*GkE z5*OTjd~EJbt%4pwIZ-aavF)y;`7n(XHYQF&CV#wXA)FCf<0=kzH{j$&FkfJdjCAdE z;YHvHq_>Z&y8trAc;)6FVslp#qUKLKnS7hK>+KiNu1M<(&Kj{*Pe?!U__}BK1OjcbZH2opqL6TG4C2aVJFtgn zkJT@;*Qin3;&S*G6_wkF$%s_`-)I*%mly7y!^6*En=V}Cr3nR<7)B@*a^Q{PnP^|U z?Lw^vCUWn(G*qHDe-*g`r!X*`3QN9>5d+1N_RnJYEQQet2tQRxCrW{|}_7b)x_P delta 2861 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 Date: Mon, 3 Jul 2023 15:55:35 -0500 Subject: [PATCH 3/9] Fixed issue with Kakariko music playing when killing Aggro Guards in enemizer --- Rom.py | 2 +- data/base2current.bps | Bin 107658 -> 107664 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 87d40d07..216c8c9f 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '32562fbd414b74de7ee7aa9b1063c487' +RANDOMIZERBASEHASH = '497c4ca85d803687a8de846211824bd7' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 71872ae5513c8e0450e40c04ff8153010d83874f..386d328769d8bd4a00008ef00f264b209e7d9c4f 100644 GIT binary patch delta 74 zcmV-Q0JZ;$$p(C;X|FM@}u6_m~$^ZZW delta 92 zcmV-i0Hgnq$p(ta2C#ks1HJn~vw;E92m(N=lUfQy18iG^v!M#jyepSaG3Mz4r5kI> yK=2I7LhuO5Q1ArFQP2pldh>qCfAE%LnTczn|Empimb042?%W8g2WJ~`UV!zYfGn&4 From 2bd6f6ec711755cd544105a352707562559d3a3a Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 4 Jul 2023 16:59:24 -0500 Subject: [PATCH 4/9] Fixed issue with Mixed OWR where Ice Cave/Shopping Mall water transitions were not flipping --- OWEdges.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OWEdges.py b/OWEdges.py index 2657c682..f4da280e 100644 --- a/OWEdges.py +++ b/OWEdges.py @@ -1153,6 +1153,7 @@ OWTileRegions = bidict({ 'Lake Hylia Water D': 0x35, 'Ice Cave Area': 0x37, + 'Ice Cave Water': 0x37, 'Desert Pass Area': 0x3a, 'Middle Aged Man': 0x3a, @@ -1292,6 +1293,7 @@ OWTileRegions = bidict({ 'Ice Palace Area': 0x75, 'Shopping Mall Area': 0x77, + 'Shopping Mall Water': 0x77, 'Swamp Nook Area': 0x7a, From 581597234cb871e3fa763e6f63f1a906b931a0f9 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 7 Jul 2023 01:33:39 -0500 Subject: [PATCH 5/9] Changing retro so bottle vendor fish prize gives a key instead of arrows --- Rom.py | 5 +++-- data/base2current.bps | Bin 107664 -> 107720 bytes 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index 216c8c9f..c21832e0 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '497c4ca85d803687a8de846211824bd7' +RANDOMIZERBASEHASH = '614fa2fcbb4644beddadcf356e121d5a' class JsonRom(object): @@ -1582,7 +1582,8 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): rom.write_byte(0x301FC, 0xDA if world.bow_mode[player].startswith('retro') else 0xE1) # rupees replace arrows under pots if enemized: rom.write_byte(0x1B152e, 0xDA if world.bow_mode[player].startswith('retro') else 0xE1) - rom.write_byte(0x30052, 0xDB if world.bow_mode[player].startswith('retro') else 0xE2) # replace arrows in fish prize from bottle merchant + if world.bow_mode[player].startswith('retro'): + rom.write_byte(0x30052, 0xE4 if world.keyshuffle[player] == 'universal' else 0xDB) # replace arrows in fish prize from bottle merchant rom.write_bytes(0xECB4E, [0xA9, 0x00, 0xEA, 0xEA] if world.bow_mode[player].startswith('retro') else [0xAF, 0x77, 0xF3, 0x7E]) # Thief steals rupees instead of arrows rom.write_bytes(0xF0D96, [0xA9, 0x00, 0xEA, 0xEA] if world.bow_mode[player].startswith('retro') else [0xAF, 0x77, 0xF3, 0x7E]) # Pikit steals rupees instead of arrows rom.write_bytes(0xEDA5, [0x35, 0x41] if world.bow_mode[player].startswith('retro') else [0x43, 0x44]) # Chest game gives rupees instead of arrows diff --git a/data/base2current.bps b/data/base2current.bps index 386d328769d8bd4a00008ef00f264b209e7d9c4f..99b8b7507ad96bcc7ec31a11eb97881f656b9117 100644 GIT binary patch delta 559 zcmV+~0?_@C$p*;D29SygHMpqi9EXh}N|BSB0g#g~0Z#;%-Do1Sf&mr>4QPd(B5bm# z>gww1XpXa*2n9$1&+Jpnc#xgZY7_tHNcHGze zAP$!q8jYdw9;KkkAOY|fmPZb+mtS2BfCYfimmNR>B3Vdf`;7{%H^7gIk&QRNz_q7L zDxRG|z&Pm;0F6Pjkbys!f~h~isWrfb2;v}Q2bXUHpObptn-P_f=91=;XqQM)nU;J) zz=;R|P?}%4mvd0si3k8vnOc$XhR0V5tORokZuQ`?gTHv63q xfC8x>jSE5trYuL@Zxw?`bGKkY0i+5CB2El|pGiZv3rqohSO^ov%%FgAXUP delta 495 zcmV0(6zLr3eK` z0l$;0P|^X1vwl%v907;3-))Nx2#2z$k5+)Czq4|Cs{sMOvmSjdkO7CcObr1pFab%I zdp!X*m(o1}LIER}6+Qth7$CICppYWTu&^GaUBDTT2EZGz0)P^$2A5er0UrU!mw7$` zIU5TbpUn=*M?a;ssDK2&wX~>> z79kjE00Bs%evTAFsQ}Et0GB9x0)Ul>(D{u5Lzia{jh1j)sk2c95`dX#jTRw{3qqG_ z7MG+y0X8f(0H1}zAeTyho~Z??gSLPpsgt*W9PP+fE&Fa4wo4kjUj;W5T&5WAOY}~RX_nE6AO2bjS8(d zz>kWNjW@u+wWnw)mx@3E9VrU~pObptn-P_f=91=;XqQM)nU+E`kckKYP?}%4mvd0s zi3k8vn?yO6&_Dry2x)d0fD3>qcb8W|0V5tqRNJQ}QrnXuHT#_pfC8x>jSE5trYuL@ lHy49sa<`a40i+5CK1~dOpJhU~LrejESP1z;hX1jbU#<|5!rA}; From d30642c0c76daea3777e6c26e7f5739ed58ed337 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 7 Jul 2023 03:41:33 -0500 Subject: [PATCH 6/9] Including OW Tile Flips in Printed Customizer File --- Main.py | 2 ++ OverworldShuffle.py | 16 ++++++++-------- source/classes/CustomSettings.py | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/Main.py b/Main.py index 6f0bad59..c426cef7 100644 --- a/Main.py +++ b/Main.py @@ -227,6 +227,8 @@ def main(args, seed=None, fish=None): update_world_regions(world, player) mark_light_dark_world_regions(world, player) create_dynamic_exits(world, player) + if args.print_custom_yaml: + world.settings.record_overworld(world) init_districts(world) diff --git a/OverworldShuffle.py b/OverworldShuffle.py index c5acb597..cf18f4c6 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -639,17 +639,17 @@ def shuffle_tiles(world, groups, result_list, do_grouped, player): if world.customizer: if not do_grouped: custom_flips = world.customizer.get_owtileflips() - if custom_flips: + if custom_flips and player in custom_flips: + custom_flips = custom_flips[player] nonflipped_groups = list() forced_flips = list() forced_nonflips = list() - player_key = player - if 'undefined_chance' in custom_flips[player_key]: - undefined_chance = custom_flips[player_key]['undefined_chance'] - if 'force_flip' in custom_flips[player_key]: - forced_flips = custom_flips[player_key]['force_flip'] - if 'force_no_flip' in custom_flips[player_key]: - forced_nonflips = custom_flips[player_key]['force_no_flip'] + if 'undefined_chance' in custom_flips: + undefined_chance = custom_flips['undefined_chance'] + if 'force_flip' in custom_flips: + forced_flips = custom_flips['force_flip'] + if 'force_no_flip' in custom_flips: + forced_nonflips = custom_flips['force_no_flip'] for group in groups: if any(owid in group[0] for owid in forced_nonflips): diff --git a/source/classes/CustomSettings.py b/source/classes/CustomSettings.py index c5ff7e78..3e90e5b3 100644 --- a/source/classes/CustomSettings.py +++ b/source/classes/CustomSettings.py @@ -232,6 +232,14 @@ class CustomSettings(object): self.world_rep['settings'] = settings_dict for p in self.player_range: settings_dict[p] = {} + settings_dict[p]['ow_shuffle'] = world.owShuffle[p] + settings_dict[p]['ow_terrain'] = world.owTerrain[p] + settings_dict[p]['ow_crossed'] = world.owCrossed[p] + settings_dict[p]['ow_keepsimilar'] = world.owKeepSimilar[p] + settings_dict[p]['ow_mixed'] = world.owMixed[p] + settings_dict[p]['ow_whirlpool'] = world.owWhirlpoolShuffle[p] + settings_dict[p]['ow_fluteshuffle'] = world.owFluteShuffle[p] + settings_dict[p]['bonk_drops'] = world.shuffle_bonk_drops[p] settings_dict[p]['shuffle'] = world.shuffle[p] settings_dict[p]['door_shuffle'] = world.doorShuffle[p] settings_dict[p]['intensity'] = world.intensity[p] @@ -329,6 +337,15 @@ class CustomSettings(object): else: placements[location.player][location.name] = location.item.name + def record_overworld(self, world): + self.world_rep['ow-tileflips'] = flips = {} + for p in self.player_range: + if p in world.owswaps and len(world.owswaps[p][0]) > 0: + flips[p] = {} + flips[p]['force_flip'] = list(f for f in world.owswaps[p][0] if f < 0x40 or f >= 0x80) + flips[p]['force_flip'].sort() + flips[p]['undefined_chance'] = 0 + def record_entrances(self, world): self.world_rep['entrances'] = entrances = {} world.custom_entrances = {} From 63c9b986f3feb7e26be000f30edab1bfacc58f3d Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 7 Jul 2023 03:42:23 -0500 Subject: [PATCH 7/9] Removing Bat Cave Screen Wrap from logic per v31 logic --- OverworldGlitchRules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OverworldGlitchRules.py b/OverworldGlitchRules.py index 715bbc41..0e05246d 100644 --- a/OverworldGlitchRules.py +++ b/OverworldGlitchRules.py @@ -383,7 +383,7 @@ boots_clips_local = [ # (name, from_region, to_region) ('Hyrule Castle To Water Clip', 'Hyrule Castle Area', 'Hyrule Castle Water'), #fake flipper - ('Bat Cave River Clip Spot', 'Blacksmith Area', 'Blacksmith Ledge'), #cannot guarantee camera correction + #('Bat Cave River Clip Spot', 'Blacksmith Area', 'Blacksmith Ledge'), #TODO: This should be added in MG (screenwrap transition) ('Maze Race Item Get Ledge Clip', 'Maze Race Area', 'Maze Race Prize'), From f3fd86e10e28fda9c4d73dab23a6b57322288823 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 7 Jul 2023 04:02:59 -0500 Subject: [PATCH 8/9] Add seed number to spoiler metadata --- BaseClasses.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BaseClasses.py b/BaseClasses.py index 8b25f61c..57472ad9 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -2898,7 +2898,8 @@ class Spoiler(object): 'triforcegoal': self.world.treasure_hunt_count, 'triforcepool': self.world.treasure_hunt_total, 'race': self.world.settings.world_rep['meta']['race'], - 'code': {p: Settings.make_code(self.world, p) for p in range(1, self.world.players + 1)} + 'code': {p: Settings.make_code(self.world, p) for p in range(1, self.world.players + 1)}, + 'seed': self.world.seed } for p in range(1, self.world.players + 1): From 5ca25223866e14dd89b59a846ef314ad90453722 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 7 Jul 2023 04:15:05 -0500 Subject: [PATCH 9/9] Version bump 0.3.1.2 --- CHANGELOG.md | 6 ++++++ OverworldShuffle.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d9a8e76..25fa22be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.3.1.2 +- Retro now gives a universal key from bottle vendor fish prize +- Fixed issue with Aga Door preventing Murahduhla Cutscene +- Fixed issue with Ice Cave/Shopping Mall water transitions not flipping in Mixed OWR +- Minor improvements to item GFX draw routine + ## 0.3.1.1 - \~Merged in DR v1.2.0.17~ - Various renames/reorganizations of region/rule definition to match upcoming DR world remodel diff --git a/OverworldShuffle.py b/OverworldShuffle.py index cf18f4c6..4a1f38a4 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -7,7 +7,7 @@ from OWEdges import OWTileRegions, OWEdgeGroups, OWEdgeGroupsTerrain, OWExitType from OverworldGlitchRules import create_owg_connections from Utils import bidict -version_number = '0.3.1.1' +version_number = '0.3.1.2' # branch indicator is intentionally different across branches version_branch = '-u'