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/5] 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/5] 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 3f0f15650a5b8b3167415206887793afe8b7f3b0 Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 9 Jul 2021 10:55:37 -0700 Subject: [PATCH 3/5] 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 4/5] 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 5/5] 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)