From 6ff0e7330fda9a4486495852b4af1e8b6a4b413e Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 17 Sep 2018 00:53:52 +0200 Subject: [PATCH] update to version 2.1.1.1 (#15) - fixed Spirit Temple GS98 - fixed keysanity layouts --- index.md | 3 + ootrando_overworldmap_hamsda.zip | Bin 10079746 -> 10080103 bytes ootrando_overworldmap_hamsda/changelog.md | 5 + .../locations/dungeons.json | 5 +- ootrando_overworldmap_hamsda/manifest.json | 2 +- .../var_keysanity/layouts/capture.json | 77 +++++++++++++ .../var_keysanity/layouts/tracker.json | 102 +++--------------- .../var_keysanity/locations/dungeons.json | 5 +- repository.json | 2 +- 9 files changed, 108 insertions(+), 93 deletions(-) create mode 100644 index.md create mode 100644 ootrando_overworldmap_hamsda/var_keysanity/layouts/capture.json diff --git a/index.md b/index.md new file mode 100644 index 00000000..9c1456ca --- /dev/null +++ b/index.md @@ -0,0 +1,3 @@ +# OoTRMapTracker + +You are probably looking for [the link to the zip.](https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip) \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index fd013dda76ee2ddc65a4ca75c2517dec18e5f7ed..9f3251fca45c664dc2e49de422b3ca6f8301928c 100644 GIT binary patch delta 19884 zcmYJ(Q*dQnw+7(YwrzFnbZpzUZS2@~(m^Nb*tTuk>DcMm|NhR+saem>T(xf2oK>sF zJ4SHM3B*a>2?Rh%790Wt1Ox;Iz(Fg?ugq;xt1Od2fYGv$TX>R9e$z*R< zt)uHm&w&ykc_4^`LWUWZmu~AF0(L~Fq#HB@&)unD($HyO=Q#N9;?=@$`_B>C9FNV0 zzAyjtt3}T0(6j=Q?sC@E4%F%GMue#GjApYk<>Tb^2>b`(|w93SvG=hnreK zj2)O#3F~4_6U(WctJvPU-xQo9aO(=Wy;dF_w(x1)*|`Kw`Qp@;Y~HQhx8mG&qz-j! zxQPpKxH($h{F{8v)Q`j|T!On32FRPMOoCqDZ?P?>0ZqrKzICfNRDRhSJoU{oZw_CZ zR}J>{t$+;O?a1cj5HB@RTRU&_Qf1nL?(<<8M+hx!XdbV!K&(B;&tp#+c9(|~bxd_Z zE+{f1|5e%_8mp_TO){Kw1MPt`Bfn8g46fLU@P<}hepK(^e;hUAh7#z^K!nmV0+7K&&gczYh+%_aAnK#c%jpc z0m=X5%Ci9=<}rRfAuQqN5N8?oA!72mm1%w33)7zFk8V0)G2w7j5ovG=Y;9r-2 zM>K$3NBW1_l8h}5Ectq9W$(x8m_k}^>x2ShtVsb3AN)Uwrxk1yr3&}CF32JSZR$Q7 zwsJtrQyVem4hHe}p1;ZwUbb?typ2_=mM&yW72gM^Wj^+~XDt-;yINE5cg*{2Z}-cw z5==hnC+q{PS!_b1G% zBenRHXUD36k35kTryVNs#{mP|WO_QI!ZaWm;Pu*d7y+*;X2=nlZde-Nmg~k>Utfak zTo*##_J*KDIbVexa+&s*pk4&$ob5Ima*sLBTHUlI40r%B z6YRZMF}_%@1g~q+j;NQd6Pbw2dRe)gvQUBJ3;FV|Zalc79~8k+-OJv~L4;D;I{}od z=-*BU=wqyZk9;*9yPqBG;k>k>Q)i7);UN#WZ~93OL$d2?uGHS=Cx5`AHVSX-9S7L+ zF3|Gpa7E&*=)yAGBJt98MT+opA2R_syM4s`-UzG3T&Uz7Qz@Nw$%c9CT&VvP0K`Of z>&5B+#cxJzo+97GbS> zp}Lei`^S^u8mWAk7vzT1D0C=Y>mH$}(o#0E6YXXB8$usgj48&C~TX!y?Xys?cDyDl1VAY6@u%1I~ zoLrV4yC$*BfEf^o-7U7^j?<;rRYy%xS;-8Ys zOMLNe``guM_&ZhrSs5s;yTp2!bd#H3#{I@*v@40rG5uW7H_Y<-|nUlzLv)wvWe5M>^sjp-zEXJCEt^*#h9b2^v zwZLHE{KLb=UwT(E(v^ye&VwaX7QY12)Io+htWrjyUv2HA^1hYT4kLxc0-w6c3{Z_Y zqY>aNlu|>-F+og}*2#ZZ58}>Ck-m!!jhOfUmD!3zt1#?Gh!w*rhMZf%OR-8u=wDUu z3?El_L`t(^3EA5J0h>Qe`r`V7QgGxoK`5ak+y6_?m^3^=g$~#ztO~ zAw^hEEj5E?O0y#Rib2#XwAvV#&%*Maq|`0HX>Z_Q498{cQR5XZ;sahoEC1-ZcpVVp z{(2zTGN{tws7Q>R5}K0WgB*>0E6tAo=+ox$nnW(~728fSp}Z5)Q8}4{g|woq?tpia^EVeRK=cz=6{keq zjhala&BPMz0QU_jaqgON2FKsfZ&?^uSy$T<0$^7pRR$VUywBk}k5o|9%fI@aQZAK_MF3JL1^j>!AaB6C(6d0uD z$iW=JVx`@u5M5n(>#Y18T8Tqcq#H|nbv%`~rR3S)6)h*PkcDZ>fC?CKfNYxT@lvx3 z5lSAW=j*}nMW#9{$)duZAph(@R4h@-e!RhtG*5rR@UA67$`oSva`D<1W@c$O zKyS;_d{8ueOMPCU@6etfu>&-nad(sY$o*;Z>sM~@O*-HI4c$b;YRi}q#YUMOwlxoH4hU$)iDEW`HjK5IfnCp& z6rX#uwu2R~gG^DxAjmGI*22^Aw=)vaQq#$jkLXH#)mo}8i;`U#iV#LGD&C<;;FgNa zTo>usjT6Vvz!Z?C_x3bjaxs(uz=j1xZOiO2vr5B;cX=#0c!oZWdC@|6Ar15OX7V9A zc4=Zc_Xu0Zq)d*RzI3fI$)b<`k+JTD`Mpoj?DQA4wqt!1ES#)7z;S8pEUDUkBw4q6 zyEyGsxs_c33H%HEWGk0rk#po`s}4t4Seym2(s_lBNKNNi35RbYtdiRpz>~Qj$6P32 znYwjJg`I+YqIT<#5nS9gq>@lvmXzrg`tNa?%agS0v?uoN>|~cIXFr6FK_mso5=+sR zg;-L4ykQhT2i7wWJ`FHgmn{s$aDdx@fu1IflPMU;Miu(v*XK~em>QK}ni zWNH6bt!@MVnlYfS ziJsCI^>d=6kF-UWZqJqJ6ic2rTZr703$?&z0x&{LXMd;zs-&QdMK8`}lM+&~LJ;cF-o_)%=*&KeN&UeZ@Fx;Zx_d~F1Ci;8 z)ZU+1D#nKn3R4hgp)mg?{3OOlOQ)D9SD!&C0j-iae@=h|N43*U5M`u=_SrQ|RybPhP_ zzdr1UdW!n;e)*OmfIbB=G2gVxi0DlJNf6U>n|&KxSZkGu=y8KJRE`ZQi`H9O)?~%V zo*oy=QgW$kZ?OoL>7{j*gWfA-SS6hiSF`1{S?r5o@?Vw-K&j^SgTb`&oxM_y}jHz+2^qnAPw1Sfah4?G-@1Q9DkfKsL;TdHHw?~_3AFrESB zQTm950*MD7wHk6KMWwG(-k(&ArjnxIO4sCWjeVNX-haMVxLeAx(jf{!*OzW*H0Ra1!O!<$lul^bVW1Te%sA>s~&hsf$jqHpi9QsVzH z`SxppbN+wMV@?o5oFP* zIbRTHlhfQ+dOA0YoWM7Rvv(aGlD{i2f3+|J=HNYh>Wrw*ML zWq|nKEOsG~Q~er!Uq&5q&h_5VDWoA~)kHMhk; z*uzp|86QUm`t*V(@ct=X6 zXzK^E-j=t@8c+XxX_nP6#AoiTlHBK2Jn8c;nFMZp{?Yq|i8z>0{IZm}G9AeHwh$eA z__mXTZO4zVG5yGOSe@t;1kC^y%EAi?MTrPS0R;jB0tbQsf&_vBf(C*Cf(3#Df(JqX zLIgqrLI(QpeN-ScAao!MAWR@EAZ#EUAY33kAbcPKAVMG_AYvdAAW|SQAaWoIAW9%A zAZj2QAX*?gAbKDMAVwf2pdUcYKrBG4Kx{zlKpa4vKwLoFKs-RaKzu;_KmtHNfdqks zfP{fWfJA}BfW(0$fFyyWfTV$BfMkK>faHM`fE0n0fRuq$fK-9hfYgCBfHZ-$fV6>h zfOLWMfb@Y3fDD0*fQ*4mfJ}kRfXsm`fGmNmfUJRRfNX*6fb4-BfEkP>dw&6pjN81mrtI20Duy z5LQfkiIA%x;hZ`&R3H2UF>Jrrm16gbJKgL=$7@X=O`3;G`oxb{(&z1iE%Yl$aIY5~ zes+Ak_4H66%lmYm>hKS$Ut=F`u$ndA-f>U}vxllUg|@B0%c=7`f8fN=GY5UM*Z+|3=BzT#)nUq{4@DQMnD?qZ#n z;odlR@<;i>Y;M)_LTH(jeW$P-al;baJvofz1q|||>>2DeXFrh&q?JLWEcD8bz<@iL z`Z;LcTvO*Wejd51**G*>`SQQX^MOgj0X7gG8E=TWj{=ub~`l$6g{ifW^%V zN30by@%P}BkSKWrZEVyevrCtFZ19xxwlVHOiCat*`<$9V0VNn4eZhyk%Ofo1#D@HXgGuQW%WKGIBQjp;N{j#_v7YW`l1=6VXxl)kbL?KwFDsh07~B4ijA24n=-2Xqw<9 z%ZS>Ka8m@tMJGf0>OYV!A2FyqXDyAWx{cmgoBen`cVle&JU*X~fI>Lo3R1I;rziSE zyLzeQX()bn*temTb!byo_j$$-*C<2TF4Y~*OMu?BPt0(-f6MCWUZX2EfwFCiaLHN^ zHJVFw9ELdf1bHB_a)IYYtqKv96GTbsOeV3CJAsoO5-Tqn`vqshAne{qPh%eKyU%_p8CC~xB&Ve$B^$36RKx}CgFwj#zoXg??$!?H{R|mrbL-H zSwv93GQMVty$Ww1bccLK88So0n%a`qP99jh3Qm9BEw2D!2vkcjr*-Z1dD?7;Q685+FcMEF|~o5Q_e;7%j{MLU~`{z0~&G9HC~GJ`-KlJSyNlMPqvbU{ftULDW}I=+>o|RlR~Pg-d%moIjHOpg5M<}sN8i) z0!)!!W$2Me@xD*N=|rCDl4vLaw79r1FUb7-2RYdeT=0=C+1nL?R_yN2@Nfc_L2uLu z#ysag5H<6o31+D`C)<5GqisWTAQPd)(g~1}x}Z!&0PY#-Qsh=)?B1UHb*kuMVH-M> zY7fI}joY+qs8Bpy#S*Q)rHg0T-OO1;5t?`pH4GY9~x1QLxkz;T;h017^b^#fMIG^XZOET;*~n{?dqHkxE_S zF^iG^HU5FG7%pGU{7U^@U1XZV-e@?CE7}|mGxTQ?N3=F(xO(oZ`v`|TI2{EfX7Q8B z{IxX5vYw$gg??xj2#R@O}JY&SBWO;#(s5B!oc%ULCk!+<>?=`Wv%#}@&265Sci0BQOZkF`(Mca@s^-2kqJ3ZiiL+kF>u zV6HXRvZH+{erh1~ZTs&`_{AU4c3T@C*Gbyy60>Ryr9!e8L7bVcj(Fi-oIKr$4&n{3#o?Yye*mF8rIY6wmlW73KW`@MqD?l;F+!q z#V8h0<@^!!K>iv_+_y$Lqd`q1qU7#~cG?4hDDldvHA;ds+B|RweVpwqp(7B!y(8s> zGxu2e2(@mApqrIbq+X*3C3qw8ZX^EjO|npUuch*HD+U-5|M=;YO@t6rLSyNE>rb?M`Fj2~XAWST^>j0Id7u3fHH zvMl42vnM05$EZfuL(W?3&Fs>q(X-*bqwEV~t!5|FB>Sy?w=(B2W!swztGi{dU?{(a z7=>9cASQU-6t`{`cxO~WdhWC7J#oz`V8X*8BM+tJ_N`MFUi$} zUiB)`X6f*Vu!Pv|$%euTS}Ih_qu~t^BAn^0EUwIM)i|O0(eITcJu{L0ITHl7?ANM9 zuN`-+duYF^c{!uqTl!=|7nBHr5OuuAu-@a{)HagkkvGiIq~UHB!iVn*Yp>Vj6?oO4 z#}vQEHCMeKzHImjnS*A~&csyhtcX;wM|5(mVzJLJMXk+@)oyh1?nlxuu4!sPJaXXUa4|%kc5U)#fI%_OLs%a2sZ4x$Sg z;TvlsRwt6Wn+ss0UfDI?^b_|VH0zlSX(bUGpxi-__8f`zoBm3i!ig+LRb*I~6WKs~ zTHXEvYjc_-)SnRhccY^E%+46k3zDDayEx-RL1)N!-X1U5WbZ*t>HDf53d1drYd36h_c7oU)lrl_%UILlG?t7Z8uh zANtnq@l{ba@#x$0@r=d~ETx;R2GL;Q21n@5xNTcMs9Tzd{e^bSIh<){rD-q}pOiY% z0J*2TVu%{8m`4R+DN16uXGCd``44;Xc;J^Ue;)`K(o;q2Wx6+cu`laxuCdbC7435+ zYJK6VsiU5jHB(Y0of8Xp;0#um05iPwKY|y|`!2A;?J@KqFjL=y)A>sYs^NdIA@P=x zSrRl0t?rRY>n)&moN&G_vW@Y-woP_;T*787aDo~Ni%g`G5`st`7T+-yFD<5ut#Wj6 z*>U@C2&0^rrujd7eQlpMLNC*3PL0OT4x53mnkbrlfbt98HxoeyDXFKsP`#qpi-Q971lHK)Epo4g$phH*i9V8tJ3r+Yv-h}Iw1<7| z4*X)EWi_92WcDPFEb`ce0AK8Kl?vJ9ID%eD%ICKt!4EGGUXx#h7#YiTA=H`l+x@M* zER`0A6Ug(RKC^9OAEvJ#!Q**drHw}kt%S~@iWn#roKTfy1`0XuwNfOTWs-(G0^*7&cY z#fsUKIu&~c;s$HNg$BVOe~%z#Pas-Ahfq>ko2uj|m{)!!x^Uee3_f#Ww0&B6zfDp6 zd@nQ1JGk^jdZW#qmxjO#C`%SQtBA`$(lZ;;M{nznTCA4UKqMqVE5MZBX9(5TCslgw zf2XC=Eu|Y}wSkrR3D^n&6~42zyd=^Se7cWA0h_JAkjxifn1!x@yH6WrShri9iwWOf zX-MC%VUs)nOhmX{b~S%XP94U)liC}bp)!nNQY zV)nZOQd%>f2tbj`>hB#sKXNrg57=oGYOqa5aN@&fXt&N+j6H`+y43XNs3&;E&Qk{# zWbWt-^k~7UF%f3|uE5i+XQWSk1F0TmS4fzvI>Ub$sWutITT`=XsPwjmA$rI=F0E+j zwi%Z6vZgHj})&HyWXkRgO)vmuphYdx7uL4C;l z`!~~-zE>;~j4HnQ-YolR)6Qr~-+ru4S27&BU086R_9;(%@0C!Rq&^dKuhg?m4F@F$ z`ToF)dbgL6NPDBkhVR)MR@jjWy!03E@h_tWCUcNH*j}-=4#(1AfLsEjg1+Ltn5ZnS7NEG%57{_+%X@^p1!ihBH|xO7oR0F z%>FgunwBO`NNI$YaLMtvHxfZ2-P3Ejz&TT$!OQaSS|=g&ed=J_lSXP)>7Hc87k17^ z-@88v00mC6DimkTt+f>geGBrMW9_5D$)%@WK|n%yuC)U z`d^{IWkc5oU+urH#W$-#@`k-+D5X-dI&^tWPG?DXYeU;RvtKH`&Ibx;ublsU*9Zxb z43DrYjbHD%tszwMSjR5eMwgOU#0s1Rm2ouoH=yRl)+!#hEtecE9*%oT3D;>L?8g-INuknXo=#c;?M)a|M(kzm_gRC$e$mwYi(h-tD3E#^0u z>oahx(W9Cw@0`j$-|Ff<>*S#f^Ku*~+~Lf4ioy&a-zFy{f!0!82qZ4@{?V)H{I&eQ zp!;!CCIsG-EL3=|=T()*u?sygUqoPF3nXv#%m)(#i0kQqpWk?Sl&H0pl?5zGx^45SriE3gAz6ul0_cxs&0Kg z16weQ8X)q%_QQ%+JkcLH1b20hs!^_Cf-WEnIUu=r&up253{7e**B99};eGJw5%M?O zY57~Y%>aiSi`J8aDA>(y0^uof0J?V>q@`@~x&0J-HVY-Us55BLi4vb8q{>#VL_KLE zSya5}jGw>Xv8&~2?zHGJMV7G^x^4Q3&*c=Dzi5+}v{615!}^CSeXSch0`0jGL#c{f zv`D?CHAZ!eevD{2b8(5IvdhuJgWXQt9@_?kbtH}+Uf#f0O^qbC|G#EF&{kl;8UhB^ z(9s$$lGO>0)C>&2Tq|MeJU~G}3L!HTC9((rrp8Wg?k?s`Hm;5iX{pl+hs+40H}qG0 zY67#6Pc5~@+?p$umoJDV%-LXWAfY`dxnB)UZj=90Up&akSVVc?I+n^o=UpR1X?ff=72+E?gj%m;j?30(Iqqa}s2 zS}4;tc*Y)bV!YPV@gDnaNCgF`uFgAK(6Fh@nJ2(FFI${_Vs$J3B|U+-v{K?BOT^dU0_K{SYGYOjpLB?7 z9shr5ZxeV#X7K&jLC_!|OKJZd5iKBRvgQ{vO89eDb1X5bW+(mix?~x~j4^9+7Z`ZgRFIzUGZA}KLVLd-fW9#C- z_d>JQ{aa@&8tcqNz1iakG~x;|og-F;iF^hFjBli3UxAEL^5uBU3L}3Eg?&Jg#xDko zf(?;^d7j$niXuOr04@Qd+XdkSz zCvfoq0vLLiI`4@%eYGL%TzTcxiCnQ<^l5(L>DeHr+X`YYjcI5 z){rhRqGkQ^2&z@tEm>rtUym6NExqSn)Cn8^}HZN$K{0XT|_)z?FdHssDU zihZ^{t?$#Dq9LU_EHj{FXTVHXY9PWJ+pyxrHmJ8?8IyK+u%p$pUe(X>v$taizYC@0 zY^twooZW`$H`K`*81Nuz_t{a0&B+XenK5XBp3R%?<#xcsGIq>{Y z!O~tpgzDU9F1Ptb2e9iEBBS)Y64pAAHu)E-&w~ICD`q zw;?X^XRBr+cEOsq)5S`KbU(V)vriLtb)sgn?Kn9slGOT30Gq!Vz8FrfhVmd0e>#Q# zur+eAB6B{@y?TjmjdhbF)jkyKs`}DVe1oshd-CBxe$G&E3eZ{g+jjEhr>yss%a?LQ zhv&H>Va)!$qSd>|YBrZ~Z6$tP4Y)Tu&P5;?6`*c$%k4EM+x_f5~cX| zXB!d$%gadIhFyG_65KA)kA2E12!3Jp*f8zv!U^OgSV3TvR!{Lav*Z1t4?RX6_v<8+ z_f&8B{?SBP6JT2Vx0mpRA#8cfW!iJ4@ktTYZ(pg@t1uYxtpJX{l?Kl{q+I0~wz}ru z!$@Zg|0~^OG<(7M(<~ZO^tW1eJXk3%R*DJh_ZbEz$g?XxmZjO}U}$daZf6KX(p5;d z9YC+eaK|O(1{uSXHQ=@aG^*bpG@R}Su z1t{xFdG+;7qGkmsrMxCgeiQ}90wRB>ocVtH#gE+z`?C!`Q_VaQ9Y0i3jk>7Gp0gU!P^EDS?zK){^Q*+TS9a53IqN69}BA~hdOA+yB6FmDjH)M|di>v;8h8_9- z;*RyFt0`QxuqBN|uB7vh!Z5729NO7fmDf z@B!ubwLLoya32(Z4)-65;3ig40NHSr<*>{e!@V<$#mAtLoCkAqDMfXgC;pY|P;AAV zbGq@VHB7a}MrCK=kjH)a7w7i3yMH}PXOZvml&a51$1-go>m-Xmq1EoYw7jDa%(3z$cum;KgIc4%w^w$6;62~~P?SA2ROvCOThdWg=JFEr#-V3D> zGKQq>GX8f-z=I)+G@2sHdX%WwPOdw%!?J{YUni(a4`@1)=j}H5ov*)ep``|rV~Btz z=djkdD69S7WyeQ)I%m4+y}Fq>1GI7zLhs&hQDtr!8B_m#z9x}1d;d+fNt|(oF6S`T zmU8F&oJi#opp5g#bviQ{@&d=hMpx@HvS=L@dc5B&wgw6wWEI+HATE+_Vt$) z5Il~E?#AkWlRt}!`?GBPcGUc3CXYJ|KvvsJyrgVGAkaV!G zhR?+hzH=@Rajb`g-Y%h}iibV^r~B$qR+F2jgNZF*ffxQKARfxKem`qS0TDwrqu>@? z$C~Tj=0@p~+j(5p*0)I z<9A{vk2URQi>(AQwzld1d)1AZlKYGJWowSQ>KC*#%xQ|k>!D=*9cA6Ay4e4Q*3WIZ zev_|gU7~YxR_>F)ug9X=G%kH+Q<;_w@?p&2mF}>mpl1y~Q9fGXm71-wCBSA0y^00U z@d!VhN&51B@&001myr94E%<)d{K4@t7P`iEV8e9^$>$OE`iw;GSmXcugM9Ir1$l|bGZn!jj3exPwP=rP1bU-)6W&0j5w+aGxs zso$+nV&tk<8!XgpRU}`R{O7ODI@IHurYL0|@_I?jeUdjT%m0wGQGM@kI5`oT{`o;m zenp(TXr)aO3pqC@o>RRZx|IbRE6$htu;{zm>6El8Z%DU}-Tjd90?bYO+Fd;XybGcE zPQ}r8{|%iYKEY!Ko9T~LT@$90uNUM|=p$O$8DDXA%>K-5Y%ksJ&$n$VuT#+8Ec>?3 zx*$B)MLN?q4V<2lbBbG&=gsmvAxfAW=Tf;ulu7{c2o<@h(x()Vvx1p|)mGvYawlN6 zi(lY7P`hBdA7t4Z399eI;4|n4Ao3Qy@<`<$QZqW8KM5vdHd99gl~^Oc(BD4Ssghp1 z)$%^2R4u1e0on!3FRU&PGjIxy!w7hwsH^qteWY+fh;fj#ZAFdRMM@7w4&E>(()wUZ z;yk7oX{Y)O=1Meru?ytA8&eDkC+tidI=MLvU#(S0xhVyHj@B4a;>QaDu<8@7-;?;B zOI6_$INLb!U%~gB`bl5YMhb;Rv0OJhrjiZN_Ob8^@L4p(ng!0r{Uns_Pc|HNT7z6s zWCz&dh82V<{LNZ_*>}oTUc$>DpT>&3NSK%MUXI)D+6bB)GOPaJW@(+$TOhTjXYu#5 zbVou}<)eGz2E793rT4K11lV&&HWsed@YByWRncT$bGgTs9Ux6; z?|v%BIa3okJ83I?W2txlGF~M}dSIN=qPteSya*a+g{# zkAWBFJ_%u>#ARF?3l|8Smwku#F|LN&F0vi-@4veFvZ&rPf8a3zOhNyE=1~rYh*tLJ zpbnB_F2LwoGdjEOx2d9gg>BHHS3C_bd3N!fqJjZiiwd}{-x<#Bv7H;5c1IF4mR?Y5 zCcjvy=s=qZTg{$LdRjWMKUHjR8&s_k&vQn{3yh#v8LzN?g9)`RmT4SY>eomcBoj{5 z)k?6}iM{dvsF>3M2qT&2zfgZ@YG{*vq2MCrSs6DXM+!K1QT=7EA}4FeM|uhR zbebS0?anJ-KBJ>=%ll|M)qM0991}NkQcG!CWJWBk%Rq`~HV?mL+Pr9KTs`yt$8YHN z$1E(_+))1<0QqJ}^|L@j6r;TUP#)2Q2SO(-CL?tq)&p+<3}g6GBb8mHZs43xNDp0T zdR`DXz5In}uyP`0slN9{YYVhPef{98LaafQ*O{&NRF0NdFXmr?zN?&(W^1ENXsuKP z654Xy#ZKOU8L!~P1_T60ObuCu+NQSS_)VpANBlH+)1>U zcuxCB&)|-76QR6M5<7bI$R7eV3920&0}5I9yq*@wg>CL%TQ#5_VCZZ)aPj{HBSeDv z%N95H34XydUKa_1dL6yCSo2SUDchYG)$H?W{o-Fi&!?78)9+KtDxws+&=rt@FC!qu zuHrvf1bF9?O%7LN@YOBqbV~k^x?O=g7y6SMqeIwAdS_c0-Mc59H)DICi?RF__=V-n z;rhqpf%-UaS!Wx1kzRgpa|tX!^{`2SmC|Sx?);(4t1~F3id~{sAx|6AludP!VPDio z2fyc15A)T*D=yk}6Y~M<-+&<@UaFiJ-M@C-IKZ3x%p^Gk5_@a z+3Q3}P%Qksvm5OAuEuOCKWf6;gRCE zn!oNEPL+b`^{R|ur$opxQaA_qhg_jqTW^}vxhZfJvLip|2eoCdD6b{xwB^={4c*WLiXBnvJ^XLgTy-nOJ9TB3Pky7x7 zeJo7m&q|*CaOyC}W}gkU-`ZGCJ(mXfRjBP;LisUqAyL( zTiuD9KN@$$gsxS_&8ab^%iYkrSYgd?G*Pc#ym|bRysLHL%y`YJa%cD#vz~WGENG2c z409_9@2xu4CaXE&a)YRBIbI18b52#3151JO==<{wwo@v89@=D{PiF6XB=`bwmf!{* zwKP-s0BOH6p={#%3fOX>ckslerZ}!1J=a~ObMD;FNpEq0z77zAU*p6Mg>H%Q(E5e5 z7q!OSIxInFYRuPB!t$4?Jg!K?Qv+3aKfdpovj{Mir0 zOPkwo`}qtIZ)-+W_fmy7@b4^_f)ODNr1#~2FgI#{Ns@**32%-G$37bXw3-;TGl#ZC z&8rUs@>e>y&Z!K$QPC87qudTr7(SqhhBt{xo_$gH(4skXP6!-B+Xoze6C6YR1cVe$ z{J-5B?}R7*9!tcTH!OJM?J7Qa@pwlX3thOdVG&}tC0>(09*i^11JK-mhbZL4<1&g6 z^;`PV!2h%t&vWB8o0D$vn!DGR3e(FdeI2_)pJ9&ebbTrIa|#?rc^ z7Vg0BtvTdA%R27ZE`xH{$c=8f+#7fygH9#iXbi^9U)>o)Yo8_vGi)HP$%C~biMRBI zd_Tx{$@P{rR}%WORW`_vX=XAvTYkVM5;$9TP0OACN)>a@@K31*M6YWB^^7t|8%Qu{*8;q9W3i~ow%Lq&`iIG z(t2;exmEf8kSrWXLN}1OSM%P&8Pgh_iSoyQoCCep4HEn<@ zd~UBKI;hz3zCMpE8Hi65A+dS%#13*L2RrJh*np*P7@2VNB}KuDz-GCUkWL5(>C|l{ zK12i0g-ERD!$gzzC#=Wa2?$B`Cuji8dZ;>V`#{gw@E>g?K*};9>zbC;EvgF?;XkrO z>U?sJVFxK&4B~Rm6_}iV^-zkuyU+iEkKe&IK`xzSaCKIw%yBMK6917rU(R_V zVGMm4y^jnG06^b2>N=1}P6?h;;4J8P`GfG&B-k##h?E5;F1_v6x%wSd# z1Yi3Jb%Sb# z#`v^AIe2aG09s^0!1&qPkKLFUBczYcfbyx~5sts^7ebkbXo>1#$t_xfZ>?r+35lvS zP2PqX4B!N>Vj4MtYM#%sLTG$XC0So4uhrkGB+ro7S)=?KxIO_6eeE;uE4T00LLI?51_;vU_iTfh}ReN2k?DW{DU^}0CS#Gs@bg(s7{Y%cfE8KLlAl?biaAqrGr4sr5 zK)^!0+si?!DVgkgf)N*7m}z+jmoTdrb7mQ72c>oKzm~q_RZOxi-|3pci1F%Yv`K`F zy*rpK5-tB2{jFdY)OG~lO47hC(b((`f-?LM#|7_nHNT9lCcFvJAmNUQ`;jc$nNTkZfF<%XQ5iX5N??uvLJC! zRuVFx*jqvHtE3l-ar`(bk?cHy?!{O4+VIkY>Hf>$U9UZs(^dijag;cw&AaJyEcbn} zJWLW_?^n?%vuRC+g|=)~s|B^!egY17VT<)biaEOaX32Jm-6El9vFD`y;*&Sx9U$R( z?T%WkGtApbh)1Ss(bgii-!{HZufV8mgUNi|i`JHDW^&Rmvuf&uO**Vsc!myShq%u6 z$8lS;bZCp8h>G^9qD zF3w#>e5Em=uk+PtyzOf?({jMVxk=MMQ0x0X`*&&TdnwmFntyb6vMpY{ z);DFY*~d3EF3;V4?#6gkd>VW)Eo8n+tHY#j>&}F=KAxTD=M_FG4tUgc^w(d1NXV!? zkos3s+eL?BM#s0ka4^~U;ZIwd4?Jz#XOm@(> zQ^WM*Z>@KnQ#Y%`Cc9szf!_UIy;H6=jPY3G9%v9caYrg+^;CkJJuJPA(&(F>~>y)CK z_h9iXt61B&x@T-1GhbO~-*G1;w7M+9GkIs>#n@?M7ne?n$(%jQ$}Cn>TQyOyxO&|E zlp`L_Gv+Qya5Z0Uc-eaA!$(U!hDF(Kv-)@UPdqJu3mc%y{rja3yQHa4 z&TqId$GTue* zTr;b4w%=Lp^}&@pMGk-Tndc(O(^RkCc+vm0S6-lfsj$&mbSOJVaVrQAQ>8381PCvw z20ZeStnix_9N@l;P>WhESYcowVG|;>@E9#xh=5g)@RueaD@gds@gs6$M+`^*VBscB zg?F$Bl>Bj23uiDYL@bqBu|7ojNn>y~gtHFAHB|V^y0cIdN^2wrh0)r8&%#82oZ*w3 z>SKgo!szQHriSy3KemO_i5sK{5h{Ix@CXqsoy8?B)L=@a2$9yIBvJ&+C7Rsr8e>>S z2{(B`W$xTc6XfuJ>37_W65+DJ;avU0Ly=S<1|TL{ILX6Lp)OhkNi8sqArv893k%R4 zLtZIxjupQ0kSExaj&d!yqF;iDQXX4NxNj#JV`iclgyIC@q&%|gF`1#)=fX|dJw-zG6lplD z6G%4oa}IdwA>pxyWQN&^G~J_#oa_@tkSvEmB$8AZo+eT#5BRKLs1O`kL1P9iRx+uB zSVxfcvT%PTIgW>S5|bMw(2&F_b6~zogerRrCDay5LtaMRwTdAu@L&}SSp(12Jwi3E z7R#ht7@5r3gHK>ha!;l|CyM}SFXp8Pe`Vw~3B#{RCTL4xA|*E@Xl_VG2yG(k>8U*~ z*QAPNO6na6tM5<)IgRBq_yz81WPJ~HX$+JK({z$A!m4x;s62X3ZJyKR^K@48HeA<; zAZ4$vj9OjU7;S54bil9-CK8R54A$ja{4;~S;(&!;kl$uBeZlVNGYX^ElD7G1WD=QL z*IKbeSvFRN|5(`wzU#=tcp_@ni4fV@L5oJP%@p3!24rQ5CDKpm&SZ>uxULsV<$f-x zT~EfT_)C^ps`PS`A-U1bhAh%a!i_9){K-Q`r-wWk-r3Zm$Wun4r)&zZcxrJmn_2{8 z@RuS~mb{VrB_r6O^Gim!3a1S`vV~>?b$yK9IbxaIdnLk&QVA~Ph-j%E(>GG6O(@^U zp?`zUCaxZ%VuWvEP60b)`0bDl@xvyP>4NQM5hXQa+h&%s8@;~bqSb9c&{rZ*Hg7~5 zkvWdfrT1#6bD2%vRT-PF%0u9_QRrbro^VurJ7s*@N%pCE^cjTnc`T38Xqt zPni6!e4aatXZh^076cbCnHIDZP$mo5fUpHQ1bOHvJOt_2z)Q`xG#iVfYBu1A$qLLT zD<+sJsMimU3T`?oLs82k=^XwLB)A;QzNXjra7GJd7_)^&fsI?Z0JHFT3sczvpF*BX z$I(Kb^MmD91}?+8tvot{pSM!I&++Ltw!rr|yp35@!mNmpf@CeYp|eN?C`J1e6z)@u z;j^95AE0Wx2vefE3J~5^V1jWP8gC;_!>}&s*09ZX!@Zd0D!~3?8b`o{Uw~M0qplBDPZb9E_su76@f^4EeM>QAC;0nB7!?Opmt%ii>qF*iP zk3x7Y>lTNOS`zic#NC8(DAIy8boLN_ME3|MLHwbbs8%*CvQGil{GH9Y2dK1+_}(+1M|7km$M?hYK+LOLuP2~Egs6n@IXd^PUnlPh=9 z0nl&ath;b;qEg@CKof<(SggkRVztT3nm8R{O>|1|#Sv0Fj5|jtzcXBp64s-JAe%P8 z@EFCcK+-Xexq+L<*wdHKs?l*)Jp_|hF-+ufhM9`m~o%O-G}d`tGb`MtGd_v z`z-$qA|&?=0-!7h4uK8=0s;dPV#=)Whd~2Z7#Rd)m>vWK0XS-AZQ^KUVee$c=wM!} ztLKEzfgUJzD1=QrA{llHhCYN>!Vak$oDwD56XZ44ZRcspzn)LOWHjfM;KbIA#|YLs zMalMj*I96be}m@Io4ljTVfpo!@22nJIJ(2%HyCgRcw8I*b(q=eT&4$akUbk6KHgl5 z)~?!5(DQa8+18~e)cN|ku>$L`;NUa^{%l;ohw#eY>T2qc{y6j6zGY!x=0vyFg(^qE zcURc8xqd%|)T=7$w-OU>7`=dCO2x<2Qv~TP(*G8Zntt_Vyb@MLLJKFHgGELbSC5ESRT+isCj#@ zVE4DSrfq5w_YQ=1e+}b)Zp9PXE1e)?-$c6>mtuSVW$eA_l#wlSx75t#oJvUucD(M9 zD0(NoaY{tezb@V?{8QHSOEtUbp&za@qs#9d@L0)A?9WQ($wP6vvT8VcoAz6d??V4_{zTs1Rr94cH8PibQa4d6p`u9@bU3LX2r`>p&?hk}^EtH0m zz~A^0JeT^-z9NGHAu!Y;E8gp-aX+iPz;Y1fgYAT{$M z*VqMgN1y<;Y2QNa^P=6oaIpm7$woY41jf-u@XKd^^#a>=E>H9CymQT)>Ub~X5 zsB{j8s8B@wL4`RG4b&Omg-K1GdyGb50QM!?Z4Bf-bH0s+#cEz4p5oR(z3+}k6{BWg zQLXIsRF&#%x|dgP+a{JuU0qa7IDX5dPjy%8o_+?RQEFnV44)Iad_$UIt23H?>I$Wu z(Q=m?dT93a=yW7g(+{Ew_we&IX{)+5Js2lMMR92wJdSi4IO<2S{&L@D4TGXjfGTO$ zx?Y|Z;(Bn}$+ed&&+QMYz6g3U!$8lsJF5ak1<)UI$@gHGjmpFc4}|!lf)%iTE+tot z`aTknS@22_9qlvANb-h?J;I|*deaBMZVFR}VyR0)&HkD$RYQ-I@6F4STP;4y>Y%n$ zs^$(uc?sjbOR+DbwOLE-y0`(*0AD2eE%UoB@5H88@j}M6f622y4BKVhq2vaChN~Jw zC&l{g;>iBtGiztW-V4j4F%Ud;L1Ky7UP?wX!;Ip;D0NJdD`!Mg<0^5Q8NMr-M^GTk zB#T_77fI*eA^z}3uUb1y8iKVcvz2e%u_>39^07*Z)-)EGK(kN8XAU5f0(k0EPtGL9 zN!XzJ3E|O=e$8LRY@A$Dnm4Bw%Rw9vjyb7v;J>$~x8@*cY@po9Nj$3AK$0mlL>h^} z)WX4-9PU^pBa`1Vv-yY~o_%LL%z8$!wkbCdCH1*Z{V7csM76YfLJulJRcwoZWRbLO zO=0#xuzEI-N$&nL^5c~703g80LU-?bTYSqGMsm{knLL~zIJ{LF4By|Apj1Ds)+W-1 z)=w73HWb+lCpWd%eU-|iNy>~ zh9YSL%Dys2o!DG9Ap95R%~)){Xgm9|{^80+k7L&EZ>XY9q%AHXas-6MTD5Gw zJ4SIzEI~IfnFL#hDWD6s)4K8e{&=UUPC4w*Z2)79c0KC~hv1&28h+L*GO$Tpt${2G z3l7AER>l`nY&{xUpa0AL5-?|EgsgDJXqi+qSCB zxNDqfkNkx7CyfAQL1E;8IUXm67lciw%p@_2c=bYehW;s}5a1>Vt5-`@8ZV-l$Di$1@9UipY5{1miHdq>SUimDEk!DLn@gNocA%wr)ok zxZH@ym6!5Tp&dn{V$;UN12GL#Dnvfc^;2P?XE zqnsJo-?Z1lk+3xuXeJu#57B{Wk@^MbtmFd(YPd7f zgkF5RcK@&vGE*F(Qp5wAq8Q~PADJ&Z%Dk+#LIQSnGZoJcf~vsoBfW0nu;sM%bQRRc zWoq^yqt)NZ?{Sxm0TFS5#CIb|Jgs%`NgF+R47nvnF%qF;x*Mc`>7U!3VHI%M2L%-g zabmI$fq-1y@A{mCZiHOw#N()VJyhQAhl+BD;Xd7;jDHZv8=uWW@@(!*|32?>#hCsq z^3Eboa+QtXKCu~!8+i+Z2!=K1YyjEdn4;ASPF1T}CgDfda(D9-+HQoK9z3HSkRUJjt*P-n(#zq9Lzj8las%$x~Agn7fU zrl{>=bCwUV5Glg&mr#?SKoN@meOjM|Db_{c7g*NVKkEXHw`tI}IH;qNChdIvJiReW?5{j>fc| zz2g^WtOT{fei^Bqr15w# zC$qnsIzJ^%fjP#XTKWBcUUjpqDzR}+^U8_ zIQzfhE^4lPLT!|*ae}4fpotT-P_)q=(ijFQGA)inqw9@XHW-RY&2&QP<>-RTb>i+h z#mYpF^p4lyegga8Kd0b4<{5$hCO(Gkb$Bah9VC0;3WmwX+cY(wZGp+mE><}OyZAsGZ zF1k^$HzP@kurY{LoTDb%R<4555_oPWief)_j0PEbdI6gep-F_7g^Zc5X}LnoWG-m= zL}z;#!f_`tFYZ*yHA#kqN^04b^p`6DC0s*7X;F4pfW>xo8ixY?ox+nYczA-G0{ebb zqFr6Ok;a6MP}&H z8V`veq57p#nZHD)_a}^^-M3eUZlSo&CKn&-lW(>Y&o06vZm-dlB_t%q6i)M~MuWei zBPNa#r-xPJ{CITZR(QM_u9}|R}Pjo4voC+Ds9Sq>)&r0J$(XXCDe19 z3f~;0yCR+B=*A)xeE+A?(D&mV|ApWD{24Y)YLa8 zTER+k4OyRFquJqZjvGO2NaC`q+GTvX^=@EC}p0vTk<*Ne_F1M5&C__ry zCA!oXBJ)XU$)8aFEwgv5M=mdY2NDD zB1QKv(c2OV&RJ~HDRS@Q!z4rZamP_aDHQT!!+dtJB5U?p@#67+KK9CsMDpzg82 zz+=r+SUOOTjT!_j-b`z2YCxTJ1s7%T=f2Niu;Q8h_&Od-H&X7X0`pY!J4G6c`bWk? zSp4bbd!l&rg%9~RAS+bGJT5Y+da}_JW*YoK~sh!I+McoS@D~f0B;;B_{!9f#aHI9`N_X|Bx@?C+57jT<`$RlES95Ce=XS zZ!bGPby+e1Rix|=ElB8#Y!FqjnzXpbG58`vmRtKz;=lfRQz@j`OWnONkm>j2RR*am zd>ix1t`+Bii4xx+>F5e6RmU+k*{VI&I}%RmFYUzG-5~Y(T;rMP--3fiQch^IhSQr% z&Vd7ZVShYjJw8yc(WcN1r5(l}(}PseeqUYIL%FXx%folxq-@KalyvkC;-?R!(X-7g zS{tQ`*mHL*hjT9=GO9I+&^{+xRU@wfvJux~(Y+l2I0lT93D)UQ)~a+v`sw)kE#}h) zN!fp9DXX)QpN>CFItl+#jZJA7bU|lc(Be-S;v=Z|kjWQ0)U8+I=gId?Aj=plRb($w zvQP`Q!pX4VQe~p%NP?QYh+i(w@2Pb+W2SxldJ! zsz#y!>U54yHbPho;ppV2+(A1~O(sL#IdFiV z3N9U4iL=U1*Y+WO`w^uh76*PqsJ58x4t4OmVqO1X_d(t}0)2ec$Az!K> zHTL8JaZzBp8!l;-KaW{C)O!3L6VH5mMhL?L5PXJu8 zeF1BKPS5Kn^FD?rv+H{Pb2Oo2pY&u5^ZmYxkofl`Plrp%@(ho+554#giu?yNWbSf8 zV*!H6?fim(Vs25cC>s%P*Onu06`3`{A7jwwW;Ek|wwbAp^`6klB#~uZFLeBoO*;u4 z0BPo`zNdDKw{A^C+}dKMXeaEU1Pkgt1)x)lo5zrYbY+9%>sx&G#K{h0l@`7?(n+Nf zLSC4`F^a86^gQR$6DHNJ7~fW&RL`I020?IYDj)E}f)zs|*^OV<++cY*kE&a4t~((x zyk2=iAqG0kH#d0C56w z0dWKI0PzCx0r3L~00{yK0SN<%0Eq&L0f_@i07(K#0Z9YN0LcQ$0m%a?04V|~0VxBi z0I3400jUFN0BHhg0civ20O0r>+300ja8fP#R6fkJ>nfx>{o zfg*q+fuew-fntDSf#QJTff9fcfs%ldfl`1{fzp7|fii$H+e?tMlQ7kHA~*kfNhPqZg_buQzpbZ7S}h_ zp^f9L=gZ(*4?rIq%|kXqneF1^Mi%hO*(SC`uyI83EY5z;84V5M|LO)nwW5McESFOI zCt{s@UMAuL>^jT^=PSo)R)(0q9qe%{op4u2vQ@DJRC#|y(jC*kv(A86{YpwJ!=`C> z?;A)sLR0lx;_=M?(GFOH&EJbVzm&;+c%jSh>NE*{^l`6kgqx-Jwm`6)DjLe zNl@*-!&1}h-jE4w3z_T6i+vKpMgViG+i$;D!+5gFx9Q4{CUD^h-eH1P+-9jS3(?6Y zrIuRm4#WzGzdz0Ww%8)DZ}Mj$i;7aB)f^%Gl>nYO8Mq6-- zkjO=qDcOXfN#@#LVz|Tve2*x9QEMY{cI1RS|=GwFC4Kij4Cb`Xz zFHGenG}ok+RbJ~96gj2}ic^{#3?!hhk%DO1T`GJ&#WOfoWUQmbEiIpy*_(V}8S@@~ z(w0OQ`Va+HFDU?0(V74?apnVp;XJdUwR`E30QSjsm$Nb z4vFd~_fpLI=*qncf{@^}fOWOFN<+kPY}~SgI@;P2NY~F;l--NAW)!_@DBrsY zHUl2tuP4ASIFTw6^UY@@x+MEX>695Lesx z)8B$ycJ8+uo$v`2tuw@G_IqfsJfo5^zd%n=1`;dg`L4BSexPxKsmWSR|EShD(no0h%)IEexrzKC%nrIuauLHKTJNm*6sEk;*wZ_mVhQxjE92P4`wL? zc1kH0VRT6pb`7}yE<>mkwXMQp1h72Yd%<~zfx7%tRUVu9XVGIg=J3c-&`C0da|K$u zZW$I$E9@}Nu#wkMKl7|%Rm`!P~j=T*B3i+l`^4pMpX4Kv|pi4oL+WI+v9|fd_>x4xdCblX9(klY7-)cC7 z^zgw!G2OM1r%dt01)Ve&ncNc*`&aT^LuS0yaG7S-XX?Mzg+`g2jrzm5B3&^E(?yH8 zqP5XOMeBdNu5lL^ziu>97qEnQtAw(Vek~A90%TVs zvT0aDMq-p9qC44WTF=&lOAT{V;-(f6FmyJ*Q(Fm5zCMLt>c2~CPVLrw=N>0OqrgTA z=dwJE{Ype-$^Q9J#uh8uhU)vk_FA0Er0np*elU+_z{_p%*{jH9cO?mk6i(JZ@V zgyb*P<*&|)C}i#^YE;nB+=0^_04{||6ABa}9Q7abPDEcToM2SV&Xf=IU5t`Tji+}P zNcAB)@|qruJcDS#251Od2)l%_-!tyy+cVdbb+T0Z{Wdq8^Vo^KBtH>bSGyV;bO{h8y4!_WseX7^0_OfkoON#m zbVGSV=}!q`fLXY5hR%x5XLEhguvk)GE_p*GjX%+g0aPIEU#AAen%bGUBzmYCtcXbGf2zJo3+~6ro0ozI-$-w>V6!o2gL%O*Ra0$ezTCN+?<) zutZWu$0$7M{vByxf{65WKU40P&`DP&)1X&|LNujgJ|G|w)2{`0aZC|KpNIn!iRfgx zA)WBgsv6Op8Lllx0QnJR2Aa@o-eo#0UC%*Q5Ignq;IYECDzr-Ic_M{KXFDs(tzx}_ zm(iQ=>YTGM0+?u5NI$f`b>7P`_4qXacFhx|w9q2)UM8aIJK6B}ogg?df5@Q<%_iuu zgXJhwz0yf4*oW{#&dQZ~bz#riks8u!3e83G-l=(Lapt)o0NoI02CZeey`#?v0@$lH z_viq2LyMH=Cd+=WLSc?QhGkjJ;x|m6ttX6buhl&@KbCZ1X|M=!H|GrdJ$@biBhl{Z zLtNcz-loC4_|P!UI$iz&PaQ@qsaw4BUFYG;`fo5rSSNj~%+(I6NM+|lH#eGQXTs7{ zdhA&J#)p7D;{9JgS(;O=ahQ625ZBQvLo=CBvWWqKs!PEl zfkg6G2_(O%bVe!pnTBR#*4!N?#AAxP8y0@cR3Fmr;uBU*Izk2YKV{E{e@r65MVq@&4xSg3 zHw|CQFU@_iJyNeWtNt>ldPF zyXwE)LoVp-Fg9|talTAu)NFJ*6n>*9F@_DS=4X*=qGpzuYLuU+KJBY`Ll!IC6Vks( zV1%3^DOyR@cp{!NolvuJ0E!s=Veh@3-&GY;Pkw!$KT!FvnsQpLhf!hShR0|xxbfOQ zt=d`&{DpTdI9zDvWT?@Vo|U`O0jcLg(YQ5^bW>vRR7FwyO9Hg;f)|5%>`?0t;}<;I z^fZyC>Avj>jO#9YI}Efo`J24)hA-&4N~qV>^^`P;htv|iXgzh600Z|`Lx|Fq;57z> zE$R*!TIv@_1|LNpT`WUOe0ODuS#H~4$3cmdjuJBWIfwglt0bR$mrRB0bu`9O2e7`7 zurvZOUXX+dxg!PH$}^g1N88ukhJ#0&A0ib6n$LqDA5LmzP_;=j98}N;*XNgHB_d`f zG7)472b`AYhIZ*_fZWcH7m01NYRnI6h2ONNZZ{;2q*Vk@-tuFVxg2acIU>81vEZ;ZUbSz}c-O0D(I9JmnMqvyUQo2)0X zvT#NLO+bi?MJ61Prrw~d3Fdr}ds3|SIMv=@`xfXq|M zocPw+J1S}X=8I}^B&g&63?CDzXkS>cxHT>MJhXKvWHIHb`6f=9 zVeNvjwC-#yqQ3T`forMXOIDP38&Y5Q=vMu1^GXMCjDa8=#S!Ff%_Q}nV(qDlGX0h( z6QJbCRW5LmC|7@Bf*0X;l~}fTvY!et0L=Gyqz@s7fHlT-iI%|IlkN=Uw|E1gPr8&q zK~?oEX8f~>vY!!-^a$;h0q%kti+}&QTL*h_cG=O*{Jc)+5V*cK5MgmmpAGr+2Rxs1 zj+C5}^;9>I1nV733_6Fq=u1zi3Ltk$8u_n$q6Yl1Jj`{75{g(hK+^wdJl-6P)EIPu z#3{E{0Jwh{vlcf8>vEkIrU)~;86`wu>A8&-TA?85aY`rt&bbUudKC8I`Gf|?)ZrPZ z(6ogFE!X2E#KR0V6Cbh;?mVLElFr+5csMVDhOCa1O1*kQ+VVu*?F_Thd08EIw6F=2?fFu z3gE$M%=N-uyMK3*8a(R($>MPCgM@+nqxk4#srRs6cer5KILa6R6EWpAfy9>P@Z3t>BYCcP?(mFl4{Enrss{PQMj7}|2o*4CUwPHwZfC#76Y^){}i zmJ*+3-$2E3iQ$;a)pyw(V{l!hsilPzQU;+df@%`%g;<0@@BDx=Xx>bB_^~vi-dPy! zfGWgqubC%6rZ2_moW1SI@2(^fpvXyDgY1H#pS|j6U`1AUDsfUZzWfZ}uFr832WXzF z2=1z$==2fvS?%s-D0Lnv?mhb!H2J6uFO2e;`jJiT(s?;BCvX^AB=V`;-eQ;+i!4ZW z3SIQKFGc+m(%(@f8e@Ankzd$%YV5r=xt2OSC*-L%E%QzL}cy9t%!AOyGZ=<%_-+~Ib!D;0PtRK@X9_9!t*4v5b5gHv_B9Hm$RgW6n zxCkl=;n1SA4P4i0OKfo)$M( zJJWD4zT;k^ADk+_pc)#!8+1YR3-TOi+!4&Ub0YL0|4h$_gKVVrXP8`-{A1QK`0M$9 zLJ#7kPD#8ZTdMN>UC>jQq{?~5c!hy2lDgHm7)}Z-Y@jXrNU(yS)b|+miw|3>bdO3aQFi z%;XcwrUEQJHyX{W%8EP-AXw^${+wo=q^*9n5PX&S4oTGrjglrN@%k$;EpYYx^NcEp zwy^vXz6wxh5;EB2Wryk=E_5aQ?>2QpjDg!ANu9~8Y$1+jkR}EmhCg)Ehc@Z(FMAAP zHie8kzU%43wbdT6`_r} zvMe-kqlP6aEsUNFNTowzIeik7>2gb{K71ic*3E?^rp`9rFdw}ge-9of*PdbiS59pg z6wbB*%k&e?Ms9Bx&8`JU`)|doMe-Hi9tH%2{wD|sDF{fW&`dT~rtoYw0^nNTU~Y*R zy^rexp#A81XBMdMZPmkiH#8z=hPm2=v6e1V8JqLvRdj8rsXbn_Q}Yv=$shU$LoWD_ z$Tt4|VyV6TT6)MlHW{wOJ;f?fgHJcPmAP@2ISLaVjKp#cnLIH!pMkdd zcT&2+6mV}B(H{S^G5DoO5V*hx5Jb5kq<)+9XL1N!NSS?Y_&=0;}RNj2%oVi!bWv@s9QLNPZ(?RMJ3 zQ?y*et9gHhxU)zs!Edzg4Vq$|6)r9>Pg<ps|=30AAdotT;u4Z#LKRmQBNlU?g z5*-VhzGRCa@1<@t5<+`e!Bxwhs}u4}%P)1ib&uR`=aIzIu~SI4A{CF#-K0;^FM9w9 zRo+z$s-6T1R2)F(GYp&8GdN1pSu_^Ta2SS8nTNdZ_${YG46{JWyZ+qZ)vG|DO z`_|MFWLgg7G(8p+f{nMcXr{E*WT;2;9xC9+WLQw3dN0ncm}TI^Z}_bu0@9r0AJ_`4 z2gO9I_Jkl=I3R8|b{z|)GLAJHvfn|o5)@}t6ESB(b9exg+7M?Q%i|$SYts+zQc4)M zNu-xA=3elifvN2uiysg|Rhzu(4e&q9c9~!Cly68rJ1q4;&sCe3Zoz-fK<}r_1Rmph z>Rw_P_?neA2NB%O6q){p-~(j((z*7LgyicO{*v0i`f5>v*nvBW47*Qq{;m-D!tLG}c`3~i;QP?q449BY+>d$>kqFDhYfPvfm3iHID z_pvH|_J*ra7Md22Kj_qjwT7z7V&%!~n);#HAW?SHMXn=4;$invL4~i{ycho%LS;3*d@Ly7o&4*(-~|P>Pt+*>wpeQL=~?ZwipE)9DDEt*PL7G& z9ua)$;f~e!i&mvXK{XA1!GVuk;QqdGZWn3fv#kPY3$)^v2Dp z%hsCC>!BCdN}249pNHYoML#ara4%Ma5GB-X@)%V>)mgt}3wii^8x}C~B+77OT4xT9s1M; zn5Pl;?&8qJCt2!V`Hi^Y>D@$Y=P}x=uySk?)=>bZcbTWz4b!k}?=PnTMj*yuVHME3 zyLcCU!lOV*yor?#IOM4$cqod9SX z+}nw#NOh*&yuwik`6V0l2&IgOSP})LCJ{{8oOD4<<7ne0*e#>MD%W2}0A^mYWNp^`Tf8 zXtH*&X{qL&thRw(X$`gA5_!4?WB-f9>&0AX)QDKOX-U&=u%M|l71yzck$1Lc z1a8wX=)NALYcDL&7E1ZE-=y%zW?_Ms1`(e`qOU;4_#DO^2jv9FAk(sPn1lZC(eLU1 zZgrx|wR6Fn_^+GXJG_kiJR&9wXDhi@sR=0P4HH3rN0*xUSTJVijqHXVn2ba;TMx#Nd4SV@CrMVkja6J2xX3Lj#kpW@p2}y2wycCZc{xFa8^9rW;TB_72m__hNPd1C zpa-C{2^tcg=lOh2_WBp_V-pfQam+7qlnXLIBC~Kvj`^+>8I)2l2ZmZny#VEp1LB`$ zS0WS24sJB%LYpWGC`Fa!%1*yL+tX#sWc4wzr2i7!K($9qjf`XZPhk%uXbJ4m$jY6;j;pp zO`+Q#pI(QB7=mw-d_Iwx!Jap!{=cO5YLa6K3Ie?p^snAFHSRH36|Q{DxEdOv5!ZvR z;G4!~y~lFIj$YMnvOCnoUNAA+0OeycuWx4jS&<5Rq>7e>VO{v)MDx1cx?yDHd%A*# z@d~KSvhlC6fF}pCc>CYke(;BOUSTzd2b``M{@GSRERD%&NJKPR=B<+XSg5~v*D3CA z;rK4W-gySr7j{!e;qK(l28&GtmhDPfi1QQ6&15mZDrwFQ{&LCljvfsZ0jk8eYEN6T zTSeWjdOJJceXpnKHl3^m^1ENdJr7W1M3}U!1=^ycIcco6Vfw&G>HTs(;``5Ao_IsA zte9>$oSk*QLKlb|PB}j{eJX8>EsVDUjmZ)LIl?yuHi@73>2#;AAkmQ3w%I=bATi0X zADYtG{hghC(>mOq4`1%X;yO4>KN!ttD)RQHGmslUc`+ zX9jt9cBaBqw?Zk?mlY)3Dt8!N110FoRhI#n&*f(N=V&@CZYSjIas_yG4ASWQ1Vz`1 zt#C|LQjDa$`2mdwsy^UDhtIaoGOXG5y5!p!!l@T zMcE;l%L&ZPxFwFC9OKd4L6t~>@QD_A?bf9bQnEr|hS66N6!Icrb3$JbxKw#0z8zpY zAI)nU$K=%j_A&Do4)M*E?u#+GJw9$Gb2d|pm6uxhJ~3YX)@xC`+O*Ie zn_SpE@8#m=Z$%RbLW?!)kOWHPgMP?o^4pOacS@G0j2*tCPo@vRWQ4ZOEU`=vD9%%w z%_lCD{o0tUN7CSAX*bBtu0Le2M9xhnEHKk*N>ShfWJPIDw0y1WK{RK_k27_!;JtzG zJ0Fm|rH}m*A;War>X=?ML_NU7Ey82d6mJ!{p7fVgaX8y_iu*IqBTaswcj{VAyeQbT zHB+`TTJavT2+muK+^4cp`RsSkySAB#-8sDsuQZLwmgy z!b(_JGynr(FFp(j`$GY2L8Zfr$-2|L>{1RhTok38 zSAXHWpvN*mY(K-U*y=YI7VtV_@5iEc)B1@EU^D~v=<+FsL&>TKbI_KkI2NOHZ6Z24 zo!2X2dql4_VKqKXF+0A&9$`QazbVS&`2PLw&>a)FrfYLGOJm~&w{4t(KuZtWMAB>G zV=?0EZ5Aoz@ZPO$h4Pp^GB;ull@t3I%{Ika^%a=<=|t}tbv1wFgOPqQ{w%csRjH8; z(1j+IZRsDcZZ$}c5)v(oE!SPX0+&<+(Pp{~h{DE9_kgcszzUoTM+_f7-O8suA@h^u zKXD=FkHsc`X22F@(q5l?4?RJpQv9X?{K=je%RAIEsU2P~<{t8nHtKOg5SSsgU3M7Y z^igzqDq9ca2<&s?w~J}Da!z~m@%gC-AaNq4u;#S6Sfo@DSNV9B7?7(*Ho*3@6-4>L zzd>{xTk)LO)G1YKh;$CeG}Hit3e7tE?c$aAm@?4 z(pt9FGp4@@x~rBP+%ZkDLVv8NG4V$V_>-VhWlNM(HdSAO=O37_vUY(^BfHExU>wrb zf8BSFERuV1dGzWc*`BK5r}Ba;n6*j$aO6Cyw1CqPZZB%sDiM-8Ny`<&m5$9O2x{CA zJID!Kpi2K()9H9qglBYIzbR$c0A$t0lc0J@0x8$u8`rMGUCV zb7)1aJaONBhoJlgCk)@o?4O}*fw-g9QMYc;by)dnYg+E9fBJB+_l1g1QtTz^ zhJObX?XEEeNCx%jD!`LH7;!zeCCRO$Xum_Ke0Z5;jMdaXz~A*oR_K#9SBSFwR;@jV z8=+ndFx*gupj&1me0H~|6Do;ZHREBxQovq(S+Ku0E8uW)A0NVF_3$m zOSO`p8)fnGAnl`W{%9_kE8(o?a`;H;GELJ81LdG$NN%cqMj-OcM$F=&dh@8+83l!f z2VG&v_6fm+b)>}&<3D0hXHDcHJMFF@Hm3D(DoahU13b)AOPL%aIGq+y?YNlQ!o6>& z$%W`$s1BxRr1h0U0qieNip_q9Iq)jwRBhV!^L*?+u*ta&47&0z-e;;pQt6>pzt{3B zHBasT369%^J8O_IMfXW{29P;y7UsM^^W1Y@= z#EgkDuM8hKb>d>dCq13*${tVAQC|4vS2})9(0D;WaSL#p1Ux-TwS|h?TIsxpaN1o{M|XY- zIkuy;^C_XC#;%%u)!Mao>{yG)>2ZO32^CV<|CAd7-x}qs5tF|a$JbvsHA`=7L^E2- za?4yEQ>pHDK*IBfZXHtAVbdU#W(_XQn~rlzw(GYh`(4&{Y|t>KJunJP+3DFu_y76_ zb2{ZM4>;mVXTPU1Y)$p|jUOWLYk`{Ozs}%~Eo5|Z`~9Y1D6Rn4FMP`M$HUA#;%vgP z^gD0ZQK*^4Oj^9Xy&3gV*DeeH;iV{Nshm24eMaJR!*Y{7{|#?_W&a=FFDB6YMO~6h z$JEEjZ?+TB_~0IV&*~GF-O4c$+GqvdT{_;RZh(ba9kpTJlNYM(we z44Fgpc^REaw!|(+QyqT&Bfk`m+#x4mGYsPonR`*j^k0qPzjU5x z$OKqclJsq}hnU+sjygn#2GR#>ebQh1CG(e0w@#XGRy(oqs2vjnJCFm7X1PeTPP=S5 zAoyz;b`BjrOkI&6mNd7Q2V<|#uN9&6kK@Fc*Kk*q!FrLVTYIAbC`>~OqovK&guZNz zEy_bW*{n^LZwTpx4))zs$|nWMUtQyUlK?G=KU=(j27Q>3-ViVRGLt}r@9!;48a@ou zUQ%0BA-#pG3ZIc&y~8_c_zqs8E-u}91X%n73U00m8@YDgR-34wKJ~bNR|0$|iG{H- zOr&kgqtsf!ZY0wALnc%crdwRS&G6tj?cZ{Ux-(6ZD`QY2i$Yv>kQZh#socsz{s9aJ zd*_WYf9~FRHpOyQ$UF1Y6B)PGGLxwq4rl}~>(M`Bd*-hq^k;|9?iI&_kUrcpZeyT; z^o}GX(n?s|L~`KfNSl%_H1~=o6H9n5Dt{(it5Xv@4CEkNzOEpGZRC28jCK1uY}R~( zbibOxByoO&2&LH%RfXvv2p^j+@&h6-E)%fr8Q8sl@Psn@piZPRCFPiK{o+VST*k8t z*M|8M2=P)W%P(W(T-@IKBzTocN?ShmM?k3!MI2f;Huz2=GK&bewZ-5hoFIP1pBVGn)?47)XpPrxZF%KTHQHVRZvjyNX(Z^X; z4-Ug8^+g_%eL=S!ZnGZdfMLk6v3OnahjaGg2@)j?Md=9akmIoqC*hrZRf&~AP!CrP zm|nO)kfh@tb;@1T8y1UXVwV}*%6%*P-6`{KaieZJ7}g>0EvjV-HaQh_dLfQQM3!(p z`S>Ly)c0LfVN!l?(YPCAgaz<=V`e1kRBddnkPn+?zm0F*+aD}o!1>}=IvndxJrk46 zvk$t)ofQ?*U*KAGkCE{2^7R%OGb?sVxj|&9c}*06rny>bmqqq#^iz`VqPY4MlZbg0 zYPzmE)* z6z@fSuyxwspA7{8r)hwPq^{FtLrfHQhrO7RABNpthsbzm<>?ql0>$Nj&6>`@NJwBW zt7YGQmfp0!Fh-e7B~SCXFbF%3(eamRK$2HpCG28^&FS!PI}Fs#ik4-5DzrMJ+v@Ue zqPd=@(=I5VD8hsk&Yd_e4P=|qpjH%L8AmZ?Kv`^}BT`>WODO?(Ix(BlzhFEyl-M(> z{Ln0QB15Bbf8jNW*w!CZd$$E;uU%2%*g6a!bNca_C&=A;L)4vC_Y*SO3}!_cL=d=n z%dKcT;#QU~VYG?Oja;CjeQwhWq3t+u=*5I|q_FC@BxOyWC#M>O1W09{4>kXmF?Cnp zjy3RL=2{|$eeDL&I*f}ac>19n+|UrYAZb=0EEhx;BoY==Q*v1P%=T54^+PdSoF=D` zUMAAM`r$EhUU|&LejA>tcM5ViNyf=@Wkq%P{ND$RRHDh4zEVe125Vx6;vFkC8pTkC(9wW((##UM064W8lO(OtLKH3xUVL!xGUAsJU8avbq)udCDLb2Ci zYH^!&RX^o6CvMDXu(|vnMQ~wDO*-tnKdGI=&796ne(}dCK4EjN3M9%>ZEb3F}V5T=id;4xt35 z&=Ya(Qa*~3xJbv?SNuQ&Y8&s3gLu^=4MeyZ>aeLtxO?Nx$-Eg`nItU9F^?k&nHyJi}6eLovoqL!Za(R7&SD9i_gn zqXcD(gU$R)CC08zMN0Vhf2z0=sI00j{GWRbCqPm}z%+-n9CBE;w5KAHrKXQR2h1Ts zMwvuKa6pt_a>NM~;rn+1GB^M#isJBu01;74k$9EEvu9|j)iX7h`tT{f?_#x*wOAi_ z-*fiBj-Jk1bdS2f9bll&9Zp6(zcy`hE z4#`Oqj$ePzZ+fKb``$sFKh8_Btjic7*3xZnget|MgC1P!$c&irp(SS}E6+}ovmH{pB+<^J;o=v!jVgvpTmtgTz zj))BwUu{a)yV2gZ3oP+v5TY|5o3kW}bv=4~mofm$+ieeBORu ziJkLhw#tWXB*B6x0|wzrBzeukumv(pdwdINL{)^R3uyI+cNC#BN~0uPtw--@iBJn+ zjV6zR)P)kJQV_n7Y&PQSg(Ppm;6;S*U^SpGo-C5N`o&%fZ3Zf542}^8Brlft^tu5} zrcQXcSj_sCVG1?F)a!6vEVhVT!U0#j6go^{afZgwbj>gog(%z)QBH=*tX&Vq`WR9h zhhJit^LJog%7|leU@47(cr}*N1WO3oodkRzORDWKeiY`JPYnL;>&dM&)V9)`QM!u8POw`|As=D>YF6hcuCA6)8b_}o zzewy~!}hq<1I}wnyRj!?h?I7Dt@!Bg_tOyHPjkYAb>#8iA;?@OAzE)Y1D((%L1w53 z#3qQ3s=$>5#+U-P_3X-@#vyAx8T&%tApZIfo*KHE=_YOi>3o9o8_2Q3OT%+7tv$wX zq|t)UHj>;J*lgmr`}NZixrtsKP`imB;+_yq?=^&dM56U(GM4sB-A zF5=N<3Dka!!OTQfU=>az$~*-OOk%d?!vEa&nRG8>KZ6qc$Rx~8(K^$i+2KVcd&QW-Q4cT(AH`IrVu%ttYp zFcUgi39+yc9G>*h{}4PUG&m$0DvwV!G#Bw;(|suH*=KK~P}rSnsE!dsbr%f&jEz<9 zq2rl{?usm4sXe&&8Hsyg%I6GZhhqk;LB}*2W3VEPYcveE(iyK(t z0jlVaCkLp>1~Ut}F-)#w=sME6Qpk*tM6ZJs&=yGsw8UcrzJ<>ruEZ}IfF})bMg1X; z%)x*n3DbUQiGfAZ4*QE_s_Ka5hbee2!VK7j^91dOJ{Wj}SzC-$f_85Ro*rTS;t_b1 zgU;aeQC0>Rbc|a@{aBa zYj_r;%Gl(^$SY&Q4`y3&H{0s+q85Y7S&N%FSX53PX}H8QyXuYMCkUa)BxwITj#ny} zv-Ox$!7(MMsbE_dRa1r@Q)qNh1Ug@kjyQ6PlMB#rihItTd+@Ddm%8Fa6)AY5$7$ni@C@rt z^I+nD`qL7uJDMbABKJVwGco`ptE5@S7M600!z(6JTfXbc(ewu2c4ho@;cqqepONl1 z_g{I}JHr!~&hV7e8ttpa?Zw1D|6j1eWa{wJ#6gIxmYy~@CpS$@ujWL-m1-IP=AX}( z(Y-~POm;8LYvwMd2*0_ZvoYYbINI!6vGyX5SF_J@zCzAf`B=SyCudpFTFm%TrfZKz z;_#PLd<;(KxLupE@SJ#{O(0JKRp-QBErr{8;fLHgv2E43dKguFtr}M&?VLCxvr25x z?Yy`$eH=BlNz-dDKN0rVWDFUN5$8FNkB2$iyl@7e8X2zNFbjVDh+&S@{GQTIe|~9O pV>0!4NukR}zYp$mL0oKZ{nOwC_Y2}`Z?EjtyWu8Nk-soE{|D1N`XvAW diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md index 64bda801..39982717 100644 --- a/ootrando_overworldmap_hamsda/changelog.md +++ b/ootrando_overworldmap_hamsda/changelog.md @@ -1,5 +1,10 @@ # Changelog +## 2.1.1.1 + +- fixed Spirit Temple GS98 to separate hookshot/rang for adult/child +- fixed keysanity layouts + ## 2.1.1.0 - changed song icons (thanks Raizuto_Gaming#1769) diff --git a/ootrando_overworldmap_hamsda/locations/dungeons.json b/ootrando_overworldmap_hamsda/locations/dungeons.json index 8e2401d7..c6cc2445 100644 --- a/ootrando_overworldmap_hamsda/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/locations/dungeons.json @@ -1350,8 +1350,9 @@ "name": "GS98 - Room Before Iron Knuckle Child Side", "short_name": "Before Knuckle", "access_rules": [ - "boomerang,@Spirit Temple/Torch Puzzle", - "hookshot,@Spirit Temple/Torch Puzzle" + "@Spirit Temple/Lower Child,@logic/explosives,sticks,boomerang", + "@Spirit Temple/Lower Child,@logic/explosives,dinsfire,magic,boomerang", + "@Spirit Temple/Mirror Room,@logic/has fire,hookshot" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index ab8dd3d7..fbffa130 100644 --- a/ootrando_overworldmap_hamsda/manifest.json +++ b/ootrando_overworldmap_hamsda/manifest.json @@ -1,7 +1,7 @@ { "name": "OoT Randomizer - Map and Item Tracker", "game_name": "Ocarina of Time Randomizer", - "package_version": "2.1.1.0", + "package_version": "2.1.1.1", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/ootrando_overworldmap_hamsda/var_keysanity/layouts/capture.json b/ootrando_overworldmap_hamsda/var_keysanity/layouts/capture.json new file mode 100644 index 00000000..9f909ecb --- /dev/null +++ b/ootrando_overworldmap_hamsda/var_keysanity/layouts/capture.json @@ -0,0 +1,77 @@ +{ + "tracker_capture_item": { + "type": "container", + "content": { + "type": "itemgrid", + "item_margin": "1,2", + "rows": [ + [ + "sticks", + "nuts", + "bombs", + "bow", + "firearrow", + "dinsfire", + "sword1", + "", + "sword3" + ], + [ + "slingshot", + "ocarina", + "bombchu", + "hookshot", + "icearrow", + "faroreswind", + "shield1", + "shield2", + "shield3" + ], + [ + "boomerang", + "lens", + "beans", + "hammer", + "lightarrow", + "nayruslove", + "lift1", + "redtunic", + "bluetunic" + ], + [ + "bottle1", + "", + "", + "", + "adulttrade", + "kidtrade", + "scale1", + "ironboots", + "hoverboots" + ], + [ + "lullaby", + "epona", + "saria", + "sun", + "time", + "storm", + "wallet1", + "magic", + "" + ], + [ + "minuet", + "bolero", + "serenade", + "requiem", + "nocturne", + "prelude", + "carpenter", + "card", + "" + ] + ] + } + } +} \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/var_keysanity/layouts/tracker.json b/ootrando_overworldmap_hamsda/var_keysanity/layouts/tracker.json index ae4810bb..c9567932 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/layouts/tracker.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/layouts/tracker.json @@ -1,79 +1,4 @@ { - "tracker_capture_item": { - "type": "container", - "content": { - "type": "itemgrid", - "item_margin": "1,2", - "rows": [ - [ - "sticks", - "nuts", - "bombs", - "bow", - "firearrow", - "dinsfire", - "sword1", - "", - "sword3" - ], - [ - "slingshot", - "ocarina", - "bombchu", - "hookshot", - "icearrow", - "faroreswind", - "shield1", - "shield2", - "shield3" - ], - [ - "boomerang", - "lens", - "beans", - "hammer", - "lightarrow", - "nayruslove", - "lift1", - "redtunic", - "bluetunic" - ], - [ - "bottle1", - "", - "", - "", - "adulttrade", - "kidtrade", - "scale1", - "ironboots", - "hoverboots" - ], - [ - "lullaby", - "epona", - "saria", - "sun", - "time", - "storm", - "wallet1", - "magic", - "" - ], - [ - "minuet", - "bolero", - "serenade", - "requiem", - "nocturne", - "prelude", - "carpenter", - "card", - "" - ] - ] - } - }, "tracker_default": { "type": "container", "background": "#212121", @@ -514,17 +439,25 @@ "rows": [ [ "type_bridge", - "open_forest", - "open_door", - "show_skulltulas", + "type_forest", + "type_door", + "", "", "" ], [ + "type_kak", "type_lens", "logic_chus", + "", + "", + "" + ], + [ "scrub_shuffle", "shopsanity", + "show_skulltulas", + "", "", "" ] @@ -987,19 +920,14 @@ "rows": [ [ "type_bridge", - "open_forest", - "open_door", - "show_skulltulas", - "", - "" - ], - [ + "type_forest", + "type_door", + "type_kak", "type_lens", "logic_chus", "scrub_shuffle", "shopsanity", - "", - "" + "show_skulltulas" ] ] } diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json index 45f26b78..3072cd73 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json @@ -1364,8 +1364,9 @@ "name": "GS98 - Room Before Iron Knuckle Child Side", "short_name": "Before Knuckle", "access_rules": [ - "boomerang,@Spirit Temple/Torch Puzzle", - "hookshot,@Spirit Temple/Torch Puzzle" + "@Spirit Temple/Lower Child,spirit_small_keys:1,@logic/explosives,sticks,boomerang", + "@Spirit Temple/Lower Child,spirit_small_keys:1,@logic/explosives,dinsfire,magic,boomerang", + "@Spirit Temple/Mirror Room,@logic/has fire,hookshot" ], "chest_unopened_img": "images/skulltula.png", "chest_opened_img": "images/skulltula_token.png", diff --git a/repository.json b/repository.json index 1a8a124e..45f72eb4 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "2.1.1.0", + "version": "2.1.1.1", "uid": "ootrando_overworldmap_hamsda", "link": "https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip", "variants": [