From c1f71d5c3ee9d44e16ce4210746ef913d2f4cb78 Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Sun, 5 Apr 2020 19:02:54 +0100
Subject: [PATCH] Couple of fixes

- Walking/running speed config (and menu options)
- Prevent weapon clipping on near Z plane so that iron sights can be used better
- Stop switch from left to right handed mode messing up control of menus
---
 Projects/Android/jni/QzDoom/VrInputDefault.c  |  12 +++-
 .../jni/gzdoom-g3.3mgw_mobile/src/g_game.cpp  |  54 ++++--------------
 .../src/gl/renderer/gl_renderer.h             |   2 +-
 .../src/gl/stereo3d/gl_stereo_cvars.cpp       |   4 +-
 .../wadsrc/static/menudef.txt                 |   5 +-
 assets/res/lzdoom.pk3                         | Bin 3222793 -> 3222904 bytes
 6 files changed, 30 insertions(+), 47 deletions(-)

diff --git a/Projects/Android/jni/QzDoom/VrInputDefault.c b/Projects/Android/jni/QzDoom/VrInputDefault.c
index 02f6000..afff236 100644
--- a/Projects/Android/jni/QzDoom/VrInputDefault.c
+++ b/Projects/Android/jni/QzDoom/VrInputDefault.c
@@ -33,16 +33,25 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
     if (getGameState() != 0 || isMenuActive()) //gamestate != GS_LEVEL
     {
         Joy_GenerateButtonEvents((pOffTrackedRemoteOld->Joystick.x > 0.7f ? 1 : 0), (pOffTrackedRemoteNew->Joystick.x > 0.7f ? 1 : 0), 1, KEY_PAD_DPAD_RIGHT);
+        Joy_GenerateButtonEvents((pDominantTrackedRemoteOld->Joystick.x > 0.7f ? 1 : 0), (pDominantTrackedRemoteNew->Joystick.x > 0.7f ? 1 : 0), 1, KEY_PAD_DPAD_RIGHT);
 
         Joy_GenerateButtonEvents((pOffTrackedRemoteOld->Joystick.x < -0.7f ? 1 : 0), (pOffTrackedRemoteNew->Joystick.x < -0.7f ? 1 : 0), 1, KEY_PAD_DPAD_LEFT);
+        Joy_GenerateButtonEvents((pDominantTrackedRemoteOld->Joystick.x < -0.7f ? 1 : 0), (pDominantTrackedRemoteNew->Joystick.x < -0.7f ? 1 : 0), 1, KEY_PAD_DPAD_LEFT);
 
         Joy_GenerateButtonEvents((pOffTrackedRemoteOld->Joystick.y < -0.7f ? 1 : 0), (pOffTrackedRemoteNew->Joystick.y < -0.7f ? 1 : 0), 1, KEY_PAD_DPAD_DOWN);
+        Joy_GenerateButtonEvents((pDominantTrackedRemoteOld->Joystick.y < -0.7f ? 1 : 0), (pDominantTrackedRemoteNew->Joystick.y < -0.7f ? 1 : 0), 1, KEY_PAD_DPAD_DOWN);
 
         Joy_GenerateButtonEvents((pOffTrackedRemoteOld->Joystick.y > 0.7f ? 1 : 0), (pOffTrackedRemoteNew->Joystick.y > 0.7f ? 1 : 0), 1, KEY_PAD_DPAD_UP);
+        Joy_GenerateButtonEvents((pDominantTrackedRemoteOld->Joystick.y > 0.7f ? 1 : 0), (pDominantTrackedRemoteNew->Joystick.y > 0.7f ? 1 : 0), 1, KEY_PAD_DPAD_UP);
 
         handleTrackedControllerButton(pDominantTrackedRemoteNew, pDominantTrackedRemoteOld, domButton1, KEY_PAD_A);
         handleTrackedControllerButton(pDominantTrackedRemoteNew, pDominantTrackedRemoteOld, ovrButton_Trigger, KEY_PAD_A);
         handleTrackedControllerButton(pDominantTrackedRemoteNew, pDominantTrackedRemoteOld, domButton2, KEY_PAD_B);
+
+        handleTrackedControllerButton(pOffTrackedRemoteNew, pOffTrackedRemoteOld, domButton1, KEY_PAD_A);
+        handleTrackedControllerButton(pOffTrackedRemoteNew, pOffTrackedRemoteOld, ovrButton_Trigger, KEY_PAD_A);
+        handleTrackedControllerButton(pOffTrackedRemoteNew, pOffTrackedRemoteOld, domButton2, KEY_PAD_B);
+
         handleTrackedControllerButton(&leftTrackedRemoteState_new, &leftTrackedRemoteState_old, ovrButton_Enter, KEY_PAD_B);
     }
     else
@@ -98,7 +107,7 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
                 float zxDist = length(x, z);
 
                 if (zxDist != 0.0f && z != 0.0f) {
-                    VectorSet(weaponangles, -degrees(atanf(y / zxDist)), -degrees(atan2f(x, -z)), 0.0f);
+                    VectorSet(weaponangles, -degrees(atanf(y / zxDist)), -degrees(atan2f(x, -z)), weaponangles[ROLL]);
                 }
             }
         }
@@ -162,6 +171,7 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
             {
                 ready_teleport = false;
                 trigger_teleport = true;
+                resetDoomYaw = true;
             }
 
 			//Apply a filter and quadratic scaler so small movements are easier to make
diff --git a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/g_game.cpp b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/g_game.cpp
index c449d49..648f2ec 100644
--- a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/g_game.cpp
+++ b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/g_game.cpp
@@ -137,6 +137,8 @@ CVAR (Bool, cl_waitforsave, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
 CVAR (Bool, enablescriptscreenshot, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
 EXTERN_CVAR (Float, con_midtime);
 EXTERN_CVAR(Bool, vr_teleport);
+EXTERN_CVAR(Int, vr_move_speed);
+EXTERN_CVAR(Float, vr_run_multiplier);
 
 //==========================================================================
 //
@@ -618,9 +620,9 @@ void G_BuildTiccmd (ticcmd_t *cmd)
 	if (strafe)
 	{
 		if (Button_Right.bDown)
-			side += sidemove[speed];
+			side += (vr_move_speed * (speed ? vr_run_multiplier : 1.0));
 		if (Button_Left.bDown)
-			side -= sidemove[speed];
+			side -= (vr_move_speed * (speed ? vr_run_multiplier : 1.0));
 	}
 	else
 	{
@@ -663,9 +665,9 @@ void G_BuildTiccmd (ticcmd_t *cmd)
 	else
 	{
 		if (Button_Forward.bDown)
-			forward += forwardmove[speed];
+			forward += (vr_move_speed * (speed ? vr_run_multiplier : 1.0));
 		if (Button_Back.bDown)
-			forward -= forwardmove[speed];
+			forward -= (vr_move_speed * (speed ? vr_run_multiplier : 1.0));
 	}
 
 	if (Button_MoveRight.bDown)
@@ -701,47 +703,13 @@ void G_BuildTiccmd (ticcmd_t *cmd)
 	if (Button_MoveUp.bDown)		cmd->ucmd.buttons |= BT_MOVEUP;
 	if (Button_ShowScores.bDown)	cmd->ucmd.buttons |= BT_SHOWSCORES;
 
-	// Handle joysticks/game controllers.
-	if (0) {
-		float joyaxes[NUM_JOYAXIS];
-		I_GetAxes(joyaxes);
-
-		// Remap some axes depending on button state.
-		if (Button_Strafe.bDown || (Button_Mlook.bDown && lookstrafe)) {
-			joyaxes[JOYAXIS_Side] = joyaxes[JOYAXIS_Yaw];
-			joyaxes[JOYAXIS_Yaw] = 0;
-		}
-		if (Button_Mlook.bDown) {
-			joyaxes[JOYAXIS_Pitch] = joyaxes[JOYAXIS_Forward];
-			joyaxes[JOYAXIS_Forward] = 0;
-		}
-
-		if (joyaxes[JOYAXIS_Pitch] != 0) {
-			G_AddViewPitch(joyint(joyaxes[JOYAXIS_Pitch] * 2048));
-		}
-		if (joyaxes[JOYAXIS_Yaw] != 0) {
-			G_AddViewAngle(joyint(-1280 * joyaxes[JOYAXIS_Yaw]));
-		}
-
-		side -= joyint(sidemove[speed] * joyaxes[JOYAXIS_Side]);
-		forward += joyint(joyaxes[JOYAXIS_Forward] * forwardmove[speed]);
-		fly += joyint(joyaxes[JOYAXIS_Up] * 2048);
-
-		// Handle mice.
-		if (!Button_Mlook.bDown && !freelook)
-		{
-			forward += (int)((float)mousey * m_forward);
-		}
-	}
-
-	float joyforward=0;
-	float joyside=0;
-	float dummy=0;
-
 	if (!vr_teleport) {
+		float joyforward=0;
+		float joyside=0;
+		float dummy=0;
 		VR_GetMove(&joyforward, &joyside, &dummy, &dummy, &dummy, &dummy, &dummy, &dummy);
-		side += joyint(joyside * sidemove[speed]);
-		forward += joyint(joyforward * forwardmove[speed]);
+		side += joyint(joyside * (vr_move_speed * (speed ? vr_run_multiplier : 1.0)));
+		forward += joyint(joyforward * (vr_move_speed * (speed ? vr_run_multiplier : 1.0)));
 	}
 
 	cmd->ucmd.pitch = LocalViewPitch >> 16;
diff --git a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/gl/renderer/gl_renderer.h b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/gl/renderer/gl_renderer.h
index c45e285..c5abae7 100644
--- a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/gl/renderer/gl_renderer.h
+++ b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/gl/renderer/gl_renderer.h
@@ -243,7 +243,7 @@ public:
 
 	int PTM_BestColor (const uint32_t *pal_in, int r, int g, int b, int first, int num);
 
-	static float GetZNear() { return 5.f; }
+	static float GetZNear() { return 0.5f; }
 	static float GetZFar() { return 65536.f; }
 };
 
diff --git a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/gl/stereo3d/gl_stereo_cvars.cpp b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/gl/stereo3d/gl_stereo_cvars.cpp
index 25e3bfd..2607804 100644
--- a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/gl/stereo3d/gl_stereo_cvars.cpp
+++ b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/gl/stereo3d/gl_stereo_cvars.cpp
@@ -56,7 +56,7 @@ CVAR(Float, vr_ipd, 0.064f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) // METERS
 CVAR(Float, vr_screendist, 0.80f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) // METERS
 
 // default conversion between (vertical) DOOM units and meters
-CVAR(Float, vr_vunits_per_meter, 30.0f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) // METERS
+CVAR(Float, vr_vunits_per_meter, 38.0f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) // METERS
 CVAR(Float, vr_height_adjust, 0.0f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) // METERS
 CVAR(Int, vr_control_scheme, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Bool, vr_move_use_offhand, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
@@ -64,6 +64,8 @@ CVAR(Bool, vr_teleport, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Float, vr_weaponRotate, -30, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Float, vr_weaponScale, 1.0f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Float, vr_snapTurn, 45.0f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
+CVAR(Int, vr_move_speed, 24, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
+CVAR(Float, vr_run_multiplier, 1.6, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 
 //HUD control
 CVAR(Float, vr_hud_scale, 0.5f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
diff --git a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/menudef.txt b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/menudef.txt
index 40cb718..94e75b4 100644
--- a/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/menudef.txt
+++ b/Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/menudef.txt
@@ -2282,6 +2282,10 @@ OptionMenu VROptionsMenu protected
 	Option "Use Teleport",		        "vr_teleport", "OnOff"
 	Slider "Snap-turn Angle",		    "vr_snapTurn", 0.0, 90.0, 1.0, 2
 
+	StaticText " "
+	Slider "Walking Speed",		        "vr_move_speed", 5, 50, 1, 2
+	Slider "Run Multiplier",	        "vr_run_multiplier", 0.0, 4.0, 0.1, 2
+
 	StaticText " "
 	Slider "Weapon Pitch Adjust",		"vr_weaponRotate", -45, 45, 5, 2
 	Slider "Weapon Scale",		        "vr_weaponScale", 0.1, 1.0, 0.01, 2
@@ -2611,7 +2615,6 @@ OptionMenu "OpenGLOptions" protected
 {
 	Title "$GLMNU_TITLE"
 	Submenu "$GLMNU_TEXOPT",					"GLTextureGLOptions"
-	Submenu "$GLPREFMNU_VRMODE",				"VR3DMenu"
 	Submenu "$GLMNU_POSTPROCESS",				"PostProcessMenu"
 	StaticText " "
 	Option "$GLPREFMNU_SECLIGHTMODE",			gl_lightmode,					"LightingModes"
diff --git a/assets/res/lzdoom.pk3 b/assets/res/lzdoom.pk3
index 4dda8c1bd69da79d62b13eb5a1bed50bf4c4d61b..38de271107d660c9459bf4060d551a0bd38f3623 100644
GIT binary patch
delta 8086
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
Skh0xh9$+-(S$hKmgZ~45t=pgg

delta 7970
zcmZ9Q2Ut}{w}v_U00O4~!l8qJ0*Z*UuO-o64cHr~L=h}hQBb4_YSbtitWj*i<!=RJ
ziNS&mjUYvhy@0(36B`zUXzb;FbLL36m*<&hc)wXQvu4fgwP&9<H;yXiqhw|&vZO3!
zmT{IzmT6X_EVC^0EQ`IWCd0HQon{U6R=z5_@U_C|!q;<K4O8uJHB4Qi+&?!$?c&mW
zU`UUiLBT^JLqmcFbnoHmXO2J5(2zFWgW{4hJT(^P-)6*&$G;RXORbx`XNnp{gQ7*T
zM6p7#Mrn*<gJO%q?d(wOQ5;YlQJhemQCv`5QQT0Pptz%Wpm?G*MQMiOh2o9kgVG$O
z1&S|9OB6qpRw(}a_e^QM@b~|>JPHb6E$yD4vrIl<c17`}ez}D+Wd|@ng%uSAu#v{Y
zmaC1ZJb<}Uhd|cRqQg&WqqMk*acMD>m(Lt&1w_Rdstjbq6xrn0m5o%S(}J!n##rsH
zF(NtB!j?8MW=js;SVyy+{u-kRG0|z1+nIUNG)U5^UUZ-v3zKSlQRD7xgu;oEyR*?!
zes8*pS}~fs^k6Z{oS_=>2-7%INe>pR7*Cp>EJ?ADruAeQ(yAC5(1&?Y*f8cme!Vc}
z`dFcy9R{~ILs7J%yS>;XDRs1H2w0#|)9K-GYjtnfH;(6WGjd<3F{aPGS+KM!fh$ub
z8Yfz6`>-KW@OS|`M>2Q%u`fDCB-4(5%#B(^VCs)t8JHrJ)e+2@()wZQnY6thOP5}y
z@dgiCQmSc0iz6|0WPjMNN+)#?y!;S}5h}QnpTU(h>B&UO3_{1i$-MTYCDYNdNiddg
zK}o?ZRVtoBcY|59^h96V(9i*FsN^t<i#Bv*02?OF_(6bcmd1u2hGWj~ftbO3Hr0iE
z3D`NV^qnIVeZYDTf?_*QC}s07YcP*g8JB;WFXVp%*f|7p>W^IhH-NUZ53(YVYD3sG
zX~AOAiXb}E_HSW7f2mOPk!&>>%KhcS)z2$6DiO~0TyB!nK-S09b_nE^E9zw}o$rUx
z&F6CT%6eHRVyp;-9KK4(14G#eY4hrOu%O^ISRD((>K?#Q;ZGhzaiDIk6DDWYYAi+A
zaVBi(@=%zVlT{dEe<Y8}!x82cVK^**8(_%>jXBNj4pX~um^Pt7;W(vps4N_VT5S_O
zN{2BmKdK>8kL~qJoTS`Y4_f*X^k8XHK?C_q(1WGkyBo+mw_p)^4~LGxYSnuiw59aH
zQN6_FK7|eB#oyx44j2i!(}Djho08RF9LMv#ZQ()Dwj_e-_asC*SX8e>DSW6d0_XEy
zNxi0`MWq@G9{FIYqD;t1<r?jZC<q_R>jeuMABE>B;fPRzqM4<5dOt;BTGj9M@+isg
zxPVi~u@}{S5!>o$*gQB+UNLN>()xsk)}GL~(W4CPMqv!=sJsX%@+2f3mzu?5Cl*m;
zEQ^zhPSdei7Oxmitw*u3Qu#&tK91Sb?omiTnO6ifjbmYoaGDm!Ql$0QsV0t%lWK2L
zbOL5h9*t+p<hFp?JBWJzZS45-(JV+Bbf;d{Qq&kI-~S;LmnwwhELTFSgu>!6&Upjm
z#<RiF&Ob#<@Lw7;;kQ=;{Qi!j5-|T?_j#)W-A}-&`S4J{`bQcQ3LT4K%c{9zM@3^X
z(xJy>Jq~^1pYht3mW^Yf(pR+<IG*XK>LvOZC$d43?(YUlY9ed`Ue+r%WSfDmCgb6P
zmIB7JBuV*EwEjLGv0D6D4>_&1X4EN(1uJL6%v#dwM8Co$^mC)SB$lk)m7t~0W3{f7
znaqOlf;gAV;_zU!O<{4$r~9<TO11X1xKOL2k`xxCJXC0qqV{VosC6o&jU{@?jn;CS
zddXnmc3G<?t27L1MiFT&Ui#%eMW!JNchcB!$>*_v6OXkTikN^P`P2yI$OJZ2(TSYX
z**L`;UOCa47g}@rH62FRU(nlhmVmg&X24Gkoy=f~${c4)@^G<qpn(&Sd|S}^i7Y`%
z^rhU1*b~o5Y@lKUO_&51&a|Q1lh|-YN9r&cRSe}!#$lREHIrGav@wak{f@;b#!}&T
zz#DtWc?yeFOrRO4q{6@G-V_!i{rwm9o{D;z2W^|mMk%I~^)xn0s$NQyrlE6Nx-kvb
zuiw)*-?M0iG39*^)rpL!qY9ug)7eP%*Z^yz2`SNu@#zV%RJj>GKAMgv=BIAdYz8*(
zU^kjR1J>bmcLs)f)SY@}0_W1!Ot|Ainwh8qDRm}`P$W{tOsp%fKUL1efd~k)HX(0U
z{5NJ6Mtm3|<o&bQx6;&b0q#Elwnqw>&mn7+fWJ9x8Y^IU7QiM|z)=qECvmVLzu9cC
zq65vGjfo>>3GEX!>Bc+(W99(Viv?70c)wgghq(ZYRRT6}n3O9(H4m_2Geys1W29U8
zytbt~^Dym;T>^T|2lP82pn${F5&@120M$nX%;KOuCEy8%ZWRIs{|M-FMa)<HBj#Is
zQ-Ie(K-paZ*&JFt67ZVCw>1Ky76A%h2sp{1?yZ2u@2pMf>uluEenwQ6jUcVgMvx+@
zHXA{DpyHY>B`t;nW{m}0<<Q4LK)@0}F`h_nww1%;W&#>71zhkIFqMO&EZ`o8xUV?a
zQ2%9^&XV$$VY)Hhgyyy!9^UCAU@ixFpnzHqcZUd=5!%?4B7cJK$`L|2{1ckfV+6F!
z0o29Q%p7dY@+4l{(x)8E{UKezm=%DvQw3CTI6PB82Lg1SD_{eM*hK<VD*-jj1*CK6
zu}aK$YbEAexn4kz{{l{I60n0qyKMsOS8>=aAd|!7{Q{~v#2*q6vKnywh=3x1!j-Jn
zAV^Ougtll64D7E7c*Vi(4*`*D0jdWAPH_1ARDisW!wZ_b4v%GLdb|$LV+aMWN7bEn
zqmt@glYK54`_hzLsKe+EuRN)19;#ln8I^QQMXC+3$)cnUz)#k6aRU;`RvYT@GxACn
zt@{~o#7}l)vJqCTDSjjRCej&RwI#L*eLgr-&L-rdqb~FoHLlwuHluYgm7$WBx{=ow
zw61SL^S7`Fv!6TJ7^TNWkEgm%tzAg<3+t#V?!u+CwCIE+%40}G@le%H{kS?gJvKQp
znR4@yfKNbHNTl3~Z-^EYu@&DCU8r~~8?CO4fNgw2(wGVU@nVRczasOLr_!unS){sV
zrj5~LSx#%8HU^&~d<K(zG{66y0`qYf&OJb@@-e0r{gcl^6>X^hHYBxh%HPH!rPm&$
z-p)o!AG~SYcC6#R51rr6qOJA?>x?ERMyI!qk4uZ=DO5jh*bca;pyfO8X_6C8?{~0B
zg-pYD;w@oG<vTIX=3mLZ0QvRIuQa6q**}!76tF1e57%{Mc|+$!Z#6RV<}TLJc=KJI
z5oK=E*;DZ@7HoX$XFDSb+^%yZpWS$ucBr$XXnT7b`f)eT!DTzTyBqt}h^ltus#11A
zXH3z1aCds_!W-;_QhPzCrK&x6$ZDF^%W8V0#gwD>!t;TYw-*<h3oYwgjj7c>7A|#c
z(?I#7jlDVL@53-wUpJ6-g;-WvAkF*@^UW?q^F{+aDa3_(NgvS?xgX<I4HZzaA6J|m
z(*z9o-rj=xA3(?9^MvwYp1qn%xN>BPP+a!wG}N{nmz18ru?|x83NEKg{_A<|K<a}C
zM&4!)_O$*todw13L8hRC*zPL@LVkP@4t%puz=$I3$*3a&wjR`3)7ew#@VW>cwmcJZ
z-(omvTqhuDpU#|)6~m?Ew?b)k2<tX6qP#M!yK0|3-nNGj`HV&ll*T1EXQz-F>ur*)
z9B>0J!8mPoLjI=&*Q<x#0%A)sM6I8Iic)y|tQ`m3g4#P+(#GH5WLz1xOhvh62*6q#
zKt6Urp-x3!H__U=97}MVDCAY;ILa190`iM6g8N}i{Xd6=VpgPUOe?vv`6N{yVJ>8R
z1c97W#leHJ59mzAlsQK*=)s3v&X9`#5w@d_!dKT10zU0We5#IOsE5Y1^caT9HgPnk
zA-_YprxnVR1K60;TuE@{iYxgaKrj8Gh8)8T=bCakMKbcI@)P*=z~wk>+ZiCBL}x~e
zxKi3qG`~8I9hfjcK*9-xac>BRR4ENd>kK|^N{V%jX!uF=krxW(c`-&Y;}6@zlbG>I
zwvfA>!d~zEuYl51IJbv?7SQ=LB4V;vK*3%|Gb%cbyWp;3p_CoM48I&g;Cr0Gc&n~+
zd6Kl{p76@86#L?K77kQ?6w2JQI1-&LXwW$<@a<V7o@g3)4vW6)B(&TzofSPfhb}$*
zgpyK*eR%HYq@uX<kUw^4AYVEU$9?<MD;f%|fX%hUdc~A9<%s)vE?=C}K<-kB<5luY
z17%w&f>Txr!-czr%=S2GsQm>fUzZDI{RQ|x^DGA&$~=OEV|fwHdmAbp%8_su)F3D;
zFCr*oE;X=za*++eyCU!sOIE09*Cm#&Tw>}>fy<rksLN$s&c~@J^9r8nfTK7Y#g{Sm
zEhnzHQj06-YDP1z;Iq=DqtF^(#UboBUcmRquo;W4qRZ=ap{&nv#^wDCJh8t9Pm-n!
zIprD)Rqk7+pVpnKui?{SS-zg^Y2bCVS)DStRLZGSr8DI{adxG4H`rjM?unkfXhju5
zaP$Voz5e%#n{0ye`e%b(zZ39%%}wO%OiLHh)#4T#s+{9wpw`YVDq468^OpMQB?o$W
zi-jrg_jjSxAQv|pe;b|u9IPh?x^f#|3f|QE4ogygSgP-UJh#lngo^LLZqHg55x^nq
zT&(HZCAih=4}9x-Z!+jNPa=J8`2&G5mT1?XNGAb3T}^1+VeGea735W>4dgS2v3>e{
zxU~w4^X&3(+lnKIu-RSoSl6RowH1+AaTj?B*YvwASt1gx;eX<QdsD%mcqm_=;hHmb
z`3qb2`40gFf8qR2QBdAPIOQU_X^7p!=w2$J96YX5)8uQ|zy0^%$_o!6TinOd?cyV#
z%Ezq{Pc+E)_hA$4FXUQ($eVscEQ}vOPU$S<p%3tIJB4s?ptBF~16gIbfQXaWG<^<@
zdx({^quhsVg0yiKZ*?U9N5})!%Z2HhM=Vs5)^V^WRW*x{ZtWB>y}-?a7FJ_pGtRq_
zqQcFM-c@6Z+Ff;{@~du66!#dE_=PGSvmwe*WfRf%LD|HN`aXfd^+1C(qiYj$D&bPI
zP=j<Tw27M9J%x1VvO&sy%EFZ;cMW9s4AI%Uh*F=i@1zSydF@Q@x7|%CX$LkO3Bs0I
z)F38PZi%+c8XUciAs*ZdM|xR<#jROG{hzZj%G8}6Bo}zt)7j^kaFZYp`lc2uyzsjx
z&8)*uMcZrfkXY9msHoNxIpZk;-@OiT98NRp*hHyaFa^Fqw6uR?d*cl-z6hCV23JOe
zisnzDP1Usd3Obv-K<97@c!8r6yPEP|;+=B-1v38ewE~jXHPujJ5lrJ=!ql5`Um`Iy
z-b&H0u(kgGVAP&^aHNz19NTqVdAp4_JJQ<iO;z-(wQNIPuh6+SMZH1}zIj-5o_?gM
zIX!rfI5m2WI6XWq<l(Q8`%110IP)4|nsq}!r#HCW52dAVaALN<7TUl!O|7Z*TTB{e
zMu7_1f%@&j+d%)iD}0Md<Eic~JZ@_xT4%h&347u$AlsvvmfpWZ=dYRy<=JjL3d!%G
zwDA#2@ot?Z_cB=W9WIpM4>*c5Cki;m!FIBME+28>Ik8m0xMj^$RQ3@aUoRI*Kmihj
z{x#O;6BgWagOJyL!Wswd6`=WyhlTAIFz+)4pH-=cpX5;K&ISFyIVti8X~#`rQ&WKD
z=2RhyCJMQuwC^F8Qzg$QqWO$M9;WQ|6yKT?y^xS3Iao237E5xf;s;VF<w?q;&R(L;
z?=+6d8l@bpyzOp~GCjP^NNp?!DP#N%(gb5UT=}_^fp(n6iu98=GLbtfYeNkBZLY_g
zV63U53{r)OJXGnFXrM!hURoMpijm_c>Lqt7<+OR4o*by}_sC9#Z?LSMjpUB_;F;M-
zPEo#_W9VOU2CKF+!vtYV4bpTodAPFYMgvuE^wO*_$7)?^fVrF|^(&x(=CUI_FYq#_
zs~>Ql-<Ts@TMLC8WFdztQ;wl?n70F!Sjb_@50wVWy?`imP{BJ#BX7My&LM9VZR3is
zt6p)W^RC|J<fewS*Gn(C(nxRbM&gRRS&iU4Z!7c_8cg;1D}&KQ4Z^bZ8v{MlV7LA|
z$UtMXa=0Rn%C&NaQeI*ZLoMYY%H$meI&F#W+e-}8)e1xZ#}hvahk3iw0V}McrkS1`
zsHHVFu5(KRt+z(o(DopHEZ(*EQIShyIG^3gApOu-j#M5GGEhVXE=MWBJ{F|5LCjYV
z{#UoA*<7lN{Z}%jRij|~(FOy)OK7OSuR!*{@&UU#*A^k^n%1z<uM!9Fi7f`RT+~pH
zsQl7tq7I#oZ)n(9p~FJH-e!<)Zo|C&?c^XuS6XE!M;R|`-`t31T-P~}n<K8HzV<jv
z3n<QBj#KtH*PJTPHOEi7_BbZfsjY(?htJei4swiiTt}ZA<RpCEk9U+~m6!c|DY}&}
zuCtCXHKj^N*^c@<$-||UJ!q?wJPL1Qtur3V++LLEEJsP_deJ#&IZe4U*_Zy4;@ga_
zxnTCGE^t31-<K5IeBHSetlWLtm&zXaI?`nq*`C5(VbJ!0Uh)v1j;FblZPJpQOk28B
zb2m9y`cHSd>jnq1-Q+>I-Br2CDbmMuuG!MMOJ9=T>?ZtpFQ@V*cy2t-wxsQ6Te=B9
zM!O>liz&}to?v`vzMl~-y{xmNs0Ds1>fj*<8!tcnMVopVTawSU3)Mn%B_~h#9q-YK
zcCl7AG~E*i(2MD*3BC4|gQUZ~XlGMAYLQLh>}x$tmfG|aV%KK!5NTYr0Lz$GW^}L_
z%vAA0$-RPGk?uYYNDnVKIiE7U<Wyx0wW1no<tp6w@<vN4MS06(6q|VENbD-|O^r7O
zims(-Z@dL6d}I|_)?xevANX{^idb{GDP>ywn~M9&OCOBVm|8bS4!qpipQ5|?yVJ?$
zuwCAjYFl78TDQP>#|*Hdg&fA;YiLQ8cAXFwQ+(xNQpF_!&wS;P(%u>Yu`T7{iX~Lq
qQl2c?J5pIoxOC95wVFoyVTQm$p&a#tl|=5X<PcM<7p;wqjQ$sE{u3Dh