From 86a19249ab29c80f6264ffc9987faf027976276a Mon Sep 17 00:00:00 2001 From: Catobat <69204835+Catobat@users.noreply.github.com> Date: Thu, 8 Jul 2021 00:58:58 +0200 Subject: [PATCH 1/9] Fix Swamp Portal check --- DoorShuffle.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index ee38f00c..94670e21 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -467,8 +467,8 @@ def choose_portals(world, player): world.get_room(0xd5, player).change(0, DoorKind.DungeonEntrance) if not world.swamp_patch_required[player]: - swamp_region = world.get_entrance('Swamp Palace', player).connected_region - if swamp_region.name != 'Swamp Lobby': + swamp_portal = world.get_portal('Swamp', player) + if swamp_portal.door.name != 'Swamp Lobby S': world.swamp_patch_required[player] = True From 2dd89197f3f2e29d262a23919ee38b555f9608fb Mon Sep 17 00:00:00 2001 From: Catobat <69204835+Catobat@users.noreply.github.com> Date: Thu, 8 Jul 2021 01:09:30 +0200 Subject: [PATCH 2/9] Reset variable between attempts --- DoorShuffle.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DoorShuffle.py b/DoorShuffle.py index 94670e21..588c2857 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -20,6 +20,7 @@ from KeyDoorShuffle import analyze_dungeon, validate_vanilla_key_logic, build_ke def link_doors(world, player): + orig_swamp_patch = world.swamp_patch_required[player] attempt, valid = 1, False while not valid: try: @@ -43,6 +44,7 @@ def link_doors(world, player): reset_portals(world, player) reset_rooms(world, player) world.get_door("Skull Pinball WS", player).no_exit() + world.swamp_patch_required[player] = orig_swamp_patch def link_doors_main(world, player): From c6e0f4fc14b8284b9140568b9be54cc5fe564de9 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Thu, 8 Jul 2021 14:09:17 -0500 Subject: [PATCH 3/9] Added Rain state guards for Dark Bonk Rocks --- asm/owrando.asm | 4 ++++ data/base2current.bps | Bin 141147 -> 141151 bytes 2 files changed, 4 insertions(+) diff --git a/asm/owrando.asm b/asm/owrando.asm index f290ba0e..426c512a 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -33,6 +33,10 @@ db #$b0 ; BCS to replace BEQ org $06907f ; < 3107f - sprite_prep.asm:2170 (LDA $7EF3CA) lda $8a : and.b #$40 +; Dark Bonk Rocks Rain Sequence Guards (allowing Tile Swap on Dark Bonk Rocks) +org $09c957 ; <- 4c957 +dw #$cb5f ; matches value on Central Bonk Rocks screen + ;(replacing -> LDA $8A : AND.b #$40) org $00d8c4 ; < ? - Bank00.asm:4068 () jsl.l OWWorldCheck diff --git a/data/base2current.bps b/data/base2current.bps index 71df5da83d715a42b8d781c60773d0c9e9855ab7..42f2a4938db88c84363bbad760b1d960106227bf 100644 GIT binary patch delta 47 zcmV+~0MP&2&IsSm2(U>314!<-vrGZK3I_OvU(0lcg9{9Y3k(6b3k(8C8wd==81QoT F7;M+75%>TA delta 43 zcmcbAj^p+@jt!oS%$DztZT4Z@%f(dD-ptR_&d Date: Thu, 8 Jul 2021 20:28:18 -0500 Subject: [PATCH 4/9] Removing Central Bonk Rocks from Tile Swap pool in Standard --- OverworldShuffle.py | 4 ++-- Rom.py | 2 +- data/base2current.bps | Bin 141151 -> 141165 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 08ae7dd9..e2017622 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -20,14 +20,14 @@ def link_overworld(world, player): if world.owSwap[player] != 'vanilla': tile_groups = {} for (name, groupType) in OWTileGroups.keys(): - if world.mode[player] != 'standard' or name not in ['Castle', 'Links']: + if world.mode[player] != 'standard' or name not in ['Castle', 'Links', 'Central Bonk Rocks']: if world.shuffle[player] in ['vanilla', 'simple', 'dungeonssimple']: tile_groups[(name,)] = ([], [], []) else: tile_groups[(name, groupType)] = ([], [], []) for (name, groupType) in OWTileGroups.keys(): - if world.mode[player] != 'standard' or name not in ['Castle', 'Links']: + if world.mode[player] != 'standard' or name not in ['Castle', 'Links', 'Central Bonk Rocks']: (owids, lw_regions, dw_regions) = OWTileGroups[(name, groupType,)] if world.shuffle[player] in ['vanilla', 'simple', 'dungeonssimple']: (exist_owids, exist_lw_regions, exist_dw_regions) = tile_groups[(name,)] diff --git a/Rom.py b/Rom.py index bfddd7cf..2f484faf 100644 --- a/Rom.py +++ b/Rom.py @@ -31,7 +31,7 @@ from OverworldShuffle import default_flute_connections, flute_data JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'f0a6138148c13414ff4dc89dc0101de6' +RANDOMIZERBASEHASH = 'e081da80a32d9341010895b8fcb5ec77' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 42f2a4938db88c84363bbad760b1d960106227bf..3600f761902be8b96505b2002300498f13bd4da4 100644 GIT binary patch delta 133 zcmV;00DAx5&Is+!2(U>31Q_w>4zo=GcB3q>pp$4@ps5_952cF9K=2Tv4YyZYpsgY< zh^iPWDk{%PfH0mIRFj3G1e4#B>!f50znYSHM1X-hl0Jx&SEVlovj%~qOMtV8r4%_5 nGy(^Jkp;31W4|;5wlGJcB3f6potu!50d~nfQb;I4Z3oGsmk+y7%D0% z&q{zWo(NKtg`xzLJ2`-p@1$f1)0%-gk}*4glU}7S0@t#$lcf|n4^n`U1<7#G2$n%5 ZmZJ~=gSp Date: Fri, 9 Jul 2021 10:55:37 -0700 Subject: [PATCH 5/9] Fix for stats and p/c indicator --- Main.py | 2 +- RELEASENOTES.md | 3 +++ Rom.py | 2 +- data/base2current.bps | Bin 136204 -> 136227 bytes 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Main.py b/Main.py index 505c6d23..9e8f1e7c 100644 --- a/Main.py +++ b/Main.py @@ -27,7 +27,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops from Utils import output_path, parse_player_names -__version__ = '0.4.0.8-u' +__version__ = '0.4.0.9-u' class EnemizerError(RuntimeError): diff --git a/RELEASENOTES.md b/RELEASENOTES.md index dd2ce1fc..b9d1cdad 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -14,6 +14,9 @@ Thanks to qadan, cheuer, & compiling # Bug Fixes and Notes. +* 0.4.0.9 + * Fixes for stats and P/C indicator (thanks Kara) + * Swamp lobby fixes (thanks Catobat) * 0.4.0.8 * Ganon jokes added for when silvers aren't available * Some text updated (Blind jokes, uncle text) diff --git a/Rom.py b/Rom.py index 72be78d0..64a32986 100644 --- a/Rom.py +++ b/Rom.py @@ -30,7 +30,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '736978dd2b3a2bb109ac80ed7c048e67' +RANDOMIZERBASEHASH = 'df3386b7a48d79950a1432b8bbaafde1' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 22b25506e15289afe5741a94f8aeebbfcc14272c..2ef0bf7d96739707083688cc6cdd7ae30569487b 100644 GIT binary patch delta 2309 zcmW+%Yg7~07M>Fl2mwrZh=@EUgF+CHSRYvADuPc$MZtSpN|jb@LnHXOw)Giif{_MH zCUFa+jYukk8Z}0pTi+T)yFw5&*y1C7pw?Q&w#GuQid}lg`(uCSTW9aJ_jmT%=bUW^ z#LWl9rlhbT4=LwEip?SoC3)mmJ9m}LGrv7&#P$oUOsi`-Co~#}@*du6CNwnLCq6?J zm>X+|bQc>%8i?fvmNgK&k60UKr#@C5vnd5ZA`D@hmQ;TQGf@hPgf%D?9fu|qAMnj> zR#B^Of^Se7x&r;E968{9L2{hM!(OhJ`ZON@zUh=+tz*|V*45~z8joC1r>Jr(_{o386ugP%GpGl_V;<*-d%_ z(P_8l^ED>5ziFaaY?&oAt)i%uqq~UjwzC8dok6ka5%dMc@y7`a=J-CH4^BkQa6fn! ziiXsXf1*=R9WoxB;!cHJK}g4Kk#0g!m%G?}*Ckxbi@(ZR4TS6}TS6I#0}vIOE&fLj zE3P&Z1Xmh58lf1jE^Mp!*~7VlKE@8!|i+ zIDk_6M8uUVteOp;q{gFm5NEj;xrY(@54UfINgOid3QJ0ec{~bZu>oe9M+=#N|)I?<)Mhw~*ejsy$uL?2b&5t>r(h<%DS9Nvy5?GlHo zUo*AlJnM_BWh&wZPbX(%9+7QDGAXewO(sQ5#5<)^=v{|Ydoiq5-7xm*=>#V`*~u0=+4ox6)vfHw@|>Ua9affEr~6us zZ@5_2UgjpMTUk#KR8aMpY*mNs#X;;VTi?Z&|0c_Pe)z;o%=$^ky7647zLt=k6Z>nU z&==m~jw%nl)J%zKyJcy`@( z`%j)sga_9$gb&;BMv!}EMvT4KAsg5;bM2W=Nl!slM~Cb=AF^!OJacoSk74;43J)ZsZsrgECG zzVJ=zLPrpFy5bGvL8box6>FNkr9S7)R*qv^-6<;5p{GKav@#==$!N_gHSxhIOX)JB zIexa+kz`3JG}fJ|J6m_;Vy!f3KtuC3s8Xrvihhly44&Q?ipRfYg31h&J)%wCf+fGk zR(`@y&>t{MP3!2&W`P{VvlQRSop!&9cSZ~*XElRwb$FXW}ZB#jq9kgQjT}bdwkaTxN zEx)I`r^b8XL+@;q0f)R*qxN;P_Eh8+`$8SjTBS$qI8;#Oe&zAYcV0Up!0!~M`TX)j zV8QqA2`~j5{=PnL=QZ2QHrZ}0r)fcSD0ysmw%ndA_q?=G1}ukJ2TOm5jC*fPAh~}L zX%@LxdBhFVMm03cFtVZWm99K^I)eXuF(ttWa_rkcsG xk3vO~xryey<&LFAyN7)J8DfTr)Zqu8%&!TPqLX1#!Jk60YjxAQqxQw7{{i1v2|@q> delta 2365 zcmW+%YgAKL7QQDB5(1b6Q4vHh7lp(K#z)msMiGHppo&6U%V3L&8jNVi=|ejj?u|wo zXcFQUt~64j+=zif#JlPn!^5r+1PxZIf-SAu)?!;?#c8E8Wv=t%d}puo?REA(d+q(5 zx|8CMPl_wzLeWFY{g7gkNK<|WdF)7aezNt&S0W9U8JXVTxFj%}i2QzzwGuiDGc3M9 zt+3XV5`>2dCr!j=6T_H@qs{iJm2)1cTbycMkPt(dOPhTd(vb=U!Y(uiIiMEJ5S_cj zD9Vh7;0qLwF2fU4gpR{{o^ra`$6TqD`gOj5;Z(|~H8Ahil$RP)&2feMO~f!Tyj(O0 z&v-E?2BP?x=xi7>34?Yrng1l^u@Lhzq!jXVh>D@a_ zYAH2h%jQwI#n=jkq9fv=E+(H#Js1Sy)ucNvgbmsBD9-5Al-|?&-OA|o=#lPC4Y^vn+X0jCZ949HVBs|i`D&% zc)yjH#1_bBBP3 z1(ez^BracNv`p|4EgpWDXl9?S_zax$JHhUo9>s@?4ZEff+q<$OJF< zWS}lM)RV(i`-h&Gl0M58kIoY7(cQzj5VMItuVb{iv8dHp`Y4{|ci``9PM7j=>gy}xmW5}saPEEw#-D?sf_51ZNEEgStb{oM=i zk-qGb?rzy1oJW~&5n2H4zG`Xe&lJz1r)0HhOD*kAAr$pRg(^Cj@S+0+k1RYn=J3*{ zrj>A{uM#Cf!i||o1UWY{!Xgy?R3hjd8|ttHNWzm~Jcxvr8*7mQ1YgeLZ5?A(Uvi_6 z1+U+H!h0_qGW%ytUZOTr@w8H0;aD-M^98!%M|FvGHjw>M=tcOnKWTzmUGYWcs4l|7 z0YSjS{yB;@o6O&pV!kj%o_!|K)?;^Jq{7F?PkTNjk)nR>CbLB^B(?ZyNct)v^dE1V zJ6VT!rY|7x4b9-nl%aYa*DN3;XudTb}h*Z&IfT8qK5 zqfWC8mfTu2nefnS4^m=LCE4uS~yw@XD~X%*C4um-HRV*}obA=i-Wp!N3Q)MZ;lWPg6IUs#^m z=oHmtOYy-T;>XeHcw}#F(t=-HIa7wHp36H_en@|5@Pu65N&QimC9iRGCu2Oj{08h9Sczss$3V%f z>OQ7v4)Tiqa#w_2?Gw8ivrD{x`S@9aLKHL(MWc1lJ2aKk$sdO<&3@d^_yf9Szn76+PSO+|-Jz!Wt3>3p28pBy zt1^YI$g|^|Y`Fj1553uO1mh&-Dr5s`GHwC=2M>dAIzp>wxy zpCfEpNmAa9jaT0vdxU}gy9Ay#l=Xe*jU7K#~ z;lr*ja`>Wq72LQ#SG6X)f>O}yUL%2rS*SNXdP>8sB36G$y8UB_TVu8E%lqs$4+iQ| zV9tYmGSSliP?`^RAB@O*929Tdy_G%xAWRZCDf1(vl-OzuVZZwIi4d)V?$PHTVCd6% zQwn#H?Tkm)s`lf%Xv+zYuCd^+ae6VE_w)~xu*<^?&{3CLf-)N1r?^h7OotV;Zg3<$vs*>HlS{mY6?c)Ff)@ xEtPXouB0T^s^08UB+C{Jqktm+r?-`yZ~_9NGW? From 3bf96a156cf1b8380464af278136a7c186659447 Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 9 Jul 2021 15:00:14 -0700 Subject: [PATCH 6/9] Fix --hints flag on CLI --- resources/app/cli/args.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json index 584593b4..874bc2f5 100644 --- a/resources/app/cli/args.json +++ b/resources/app/cli/args.json @@ -247,7 +247,7 @@ ] }, "hints": { - "action": "store_false", + "action": "store_true", "type": "bool" }, "no_hints": { From c52a8e33903d9601bfc7dae81869a669f023f314 Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 9 Jul 2021 15:00:49 -0700 Subject: [PATCH 7/9] Fix --hints flag on CLI --- RELEASENOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index b9d1cdad..a4c5eace 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -17,6 +17,7 @@ Thanks to qadan, cheuer, & compiling * 0.4.0.9 * Fixes for stats and P/C indicator (thanks Kara) * Swamp lobby fixes (thanks Catobat) + * Fix for --hints flag on CLI * 0.4.0.8 * Ganon jokes added for when silvers aren't available * Some text updated (Blind jokes, uncle text) From e89442a3a09316544f7b59e3a8d5de2d009dd402 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sat, 10 Jul 2021 13:51:04 -0500 Subject: [PATCH 8/9] Merged in DR v0.4.0.9 --- DoorShuffle.py | 6 ++++-- Main.py | 2 +- RELEASENOTES.md | 4 ++++ Rom.py | 2 +- data/base2current.bps | Bin 141165 -> 141183 bytes resources/app/cli/args.json | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 5634efce..7a6f21d9 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -20,6 +20,7 @@ from KeyDoorShuffle import analyze_dungeon, validate_vanilla_key_logic, build_ke def link_doors(world, player): + orig_swamp_patch = world.swamp_patch_required[player] attempt, valid = 1, False while not valid: try: @@ -43,6 +44,7 @@ def link_doors(world, player): reset_portals(world, player) reset_rooms(world, player) world.get_door("Skull Pinball WS", player).no_exit() + world.swamp_patch_required[player] = orig_swamp_patch def link_doors_main(world, player): @@ -467,8 +469,8 @@ def choose_portals(world, player): world.get_room(0xd5, player).change(0, DoorKind.DungeonEntrance) if not world.swamp_patch_required[player]: - swamp_region = world.get_entrance('Swamp Palace', player).connected_region - if swamp_region.name != 'Swamp Lobby': + swamp_portal = world.get_portal('Swamp', player) + if swamp_portal.door.name != 'Swamp Lobby S': world.swamp_patch_required[player] = True diff --git a/Main.py b/Main.py index b185c128..74484b68 100644 --- a/Main.py +++ b/Main.py @@ -28,7 +28,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops from Utils import output_path, parse_player_names -__version__ = '0.4.0.8-u' +__version__ = '0.4.0.9-u' class EnemizerError(RuntimeError): diff --git a/RELEASENOTES.md b/RELEASENOTES.md index dd2ce1fc..a4c5eace 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -14,6 +14,10 @@ Thanks to qadan, cheuer, & compiling # Bug Fixes and Notes. +* 0.4.0.9 + * Fixes for stats and P/C indicator (thanks Kara) + * Swamp lobby fixes (thanks Catobat) + * Fix for --hints flag on CLI * 0.4.0.8 * Ganon jokes added for when silvers aren't available * Some text updated (Blind jokes, uncle text) diff --git a/Rom.py b/Rom.py index 2f484faf..7d56fa35 100644 --- a/Rom.py +++ b/Rom.py @@ -31,7 +31,7 @@ from OverworldShuffle import default_flute_connections, flute_data JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'e081da80a32d9341010895b8fcb5ec77' +RANDOMIZERBASEHASH = '1dc1961e57d4e588a262fa706de6c753' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 3600f761902be8b96505b2002300498f13bd4da4..3b42822351ebc6065e2e1c932dd27ffee9e7ea7b 100644 GIT binary patch delta 2527 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 diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json index 782d37af..43dabb31 100644 --- a/resources/app/cli/args.json +++ b/resources/app/cli/args.json @@ -291,7 +291,7 @@ ] }, "hints": { - "action": "store_false", + "action": "store_true", "type": "bool" }, "no_hints": { From 0224aeb4a4c38e1821ec0d5030c1c236de45f385 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sat, 10 Jul 2021 13:53:38 -0500 Subject: [PATCH 9/9] Version bump 0.1.6.6 --- CHANGELOG.md | 3 +++ OverworldShuffle.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 025fd156..073c97bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +### 0.1.6.6 +- ~~Merged DR v0.4.0.9 - P/C Indicator / Credits fix / CLI Hints Fix~~ + ### 0.1.6.5 - Reduced chance of diagonal flute spot in Balanced - ~~Merged DR v0.4.0.8 - Boss Indicator / Fake Boots / Quickswap Update / Credits Updates~~ diff --git a/OverworldShuffle.py b/OverworldShuffle.py index e2017622..f1199212 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -6,7 +6,7 @@ try: except ImportError: raise Exception('Could not load sortedcontainers module') -__version__ = '0.1.6.5-u' +__version__ = '0.1.6.6-u' def link_overworld(world, player): # setup mandatory connections