From c4f919f769fd1adc2bd6cf617b5a299cb4b61a4c Mon Sep 17 00:00:00 2001
From: Petr Bartos <petr.bartos@plus4u.net>
Date: Fri, 28 Apr 2023 21:54:58 +0200
Subject: [PATCH] Allow to override weapon adjustment

---
 .../jni/OpenJK/code/qcommon/common.cpp        |  10 ++---
 .../Android/jni/OpenJK/code/ui/ui_main.cpp    |   6 +--
 ...3 => z_vr_weapons_jka_Crusty_and_Elin.pk3} | Bin 1651458 -> 1652105 bytes
 ...3 => z_vr_weapons_jko_Crusty_and_Elin.pk3} | Bin 1498380 -> 1499017 bytes
 java/com/drbeef/jkxr/GLES3JNIActivity.java    |  35 +++++++++++++-----
 .../weapons_vr.cfg                            |  21 +++++------
 .../weapons_vr.cfg                            |  20 +++++-----
 7 files changed, 51 insertions(+), 41 deletions(-)
 rename assets/{z_Crusty_and_Elin_vr_weapons_JKAcademy.pk3 => z_vr_weapons_jka_Crusty_and_Elin.pk3} (99%)
 rename assets/{z_Crusty_and_Elin_vr_weapons.pk3 => z_vr_weapons_jko_Crusty_and_Elin.pk3} (99%)
 rename assets/weapons_vr_ja.cfg => z_vr_assets_jka/weapons_vr.cfg (56%)
 rename assets/weapons_vr_jo.cfg => z_vr_assets_jko/weapons_vr.cfg (55%)

diff --git a/Projects/Android/jni/OpenJK/code/qcommon/common.cpp b/Projects/Android/jni/OpenJK/code/qcommon/common.cpp
index 6f8c142..6f5d306 100644
--- a/Projects/Android/jni/OpenJK/code/qcommon/common.cpp
+++ b/Projects/Android/jni/OpenJK/code/qcommon/common.cpp
@@ -990,13 +990,11 @@ void Com_ExecuteCfg(void)
 		// skip the q3config.cfg and autoexec.cfg if "safe" is on the command line
 		Cbuf_ExecuteText(EXEC_NOW, "exec " Q3CONFIG_NAME "\n");
 		Cbuf_Execute();
-		Cbuf_ExecuteText(EXEC_NOW, "exec autoexec_sp.cfg\n");
 		//Execute to overwrite weapon locations with our desired adjustments
-#ifdef JK2_MODE
-		Cbuf_AddText( "exec weapons_vr_jo.cfg\n" );
-#else
-		Cbuf_AddText( "exec weapons_vr_ja.cfg\n" );
-#endif
+		Cbuf_ExecuteText(EXEC_NOW, "exec weapons_vr.cfg\n" );
+		Cbuf_Execute();
+		// Execute autoexec last (allowing to re-adjust weapons)
+		Cbuf_ExecuteText(EXEC_NOW, "exec autoexec_sp.cfg\n");
 		Cbuf_Execute();
 	}
 }
diff --git a/Projects/Android/jni/OpenJK/code/ui/ui_main.cpp b/Projects/Android/jni/OpenJK/code/ui/ui_main.cpp
index 060ef35..b912625 100644
--- a/Projects/Android/jni/OpenJK/code/ui/ui_main.cpp
+++ b/Projects/Android/jni/OpenJK/code/ui/ui_main.cpp
@@ -6519,11 +6519,7 @@ void UI_ResetDefaults( void )
 	ui.Cmd_ExecuteText( EXEC_APPEND, "cvar_restart\n");
 	Controls_SetDefaults();
 	ui.Cmd_ExecuteText( EXEC_APPEND, "exec default.cfg\n");
-#ifdef JK2_MODE
-	ui.Cmd_ExecuteText( EXEC_APPEND, "exec weapons_vr_jo.cfg\n");
-#else
-	ui.Cmd_ExecuteText( EXEC_APPEND, "exec weapons_vr_ja.cfg\n");
-#endif
+	ui.Cmd_ExecuteText( EXEC_APPEND, "exec weapons_vr.cfg\n");
 	ui.Cmd_ExecuteText( EXEC_APPEND, "vid_restart\n" );
 }
 
diff --git a/assets/z_Crusty_and_Elin_vr_weapons_JKAcademy.pk3 b/assets/z_vr_weapons_jka_Crusty_and_Elin.pk3
similarity index 99%
rename from assets/z_Crusty_and_Elin_vr_weapons_JKAcademy.pk3
rename to assets/z_vr_weapons_jka_Crusty_and_Elin.pk3
index eaec73f7dd92afecec9b7b88cbc17190c753f707..3ce75bbfd33ac35fe161eabe4d240636d7ebad6b 100644
GIT binary patch
delta 736
zcmZpAmeTn;rJ;qfg{g(Pg{6hHg{_6Xg`<VDg{y_Tg{OtLg|CIbMW98nMW{u%MWjWv
zMXW`<MPiF&pj<sOiwFY)0|&#`sdK`1crV^8&&0rx%*MdL2NW$&O)SXID~>NK(o0TD
zpE~7k-z@`y*7ucM-Py;p`;XVx_O06MB52rZCNQPNwf6TppH-sby51@*7M=FzEQ`-P
zd+S@f{%z@w6%Pw$ys}y8R%<&?&2|0Hh|qBUw`=ELO_WHjjjxxp<Bxs2ocHa%d(Vzb
zFZbJey0z+Mhi3fu_itC|z1^8*%3JjG`qPpXf27|(&bzrYd-we9nReGt?<wZ_ckSDD
ztCeMI;-}2|mK*=I;#c9EuWwg*p4}^JU2A*x_u_wd?|rrS@;A+y?bd&VtJh`;lr*b}
z&+TQtYhhsbifvP8n05B1rP=jMXC!R*_gJv)T!i=es>v6HPBZ6!Q4>0FYHj=XbdB_x
zM+K4;Uv?c+k5UOXSm$EtrdlS^qpUPbscy|dj$5gdIX;K)D4zf5f#b}xodp~#qz|#I
zX5^{!$UgA#mF8Ldlw+GFr5t^vv*s*M>ZH>@JS3j-wYoHHbe(MI|4E5|igK-=SH1kI
zMJHnzUol&|-8v`lYE&H>E*5*P$m0RCxYkXLKE?{IK!YDbYYcd7H=lYWsPbaQ(t}Eq
z*e>4iw`md;@UmYilVVsHbumJ3#&bo98desbE{%=thZZ<-3;bAh!?u}Az4@46^JS$V
z#qhjX(IuR$DnijsddDm|ZEkMq6WPHjXz80gS@Du3i;j$4(Dty2i;f)m`Xxl|$;GL2
zetM|y-}KV+jp)Yb6aUK?R9c$ot#f(0^yQ>Vj(O~2lcLi)6J=K$a5uBaYL?Ebn#B6=
zx5j_Q?f!C-^F;y}ndF#prz&8=VqgT~C5=GUXlX3Kn-!S$7#Q?{@FviRSqhRs9snr=
BHB0~i

delta 86
zcmWN^w+(<W002Rgb2h;ZVggn{?BGEV`i31~3nVt8VF~<K{qgDj)f*Nz4lW)(0U;4F
k2`L#l1tk?V4U(3Qp5a#O_?(lvr1X4YnvF{ev5d;x53|e`+yDRo

diff --git a/assets/z_Crusty_and_Elin_vr_weapons.pk3 b/assets/z_vr_weapons_jko_Crusty_and_Elin.pk3
similarity index 99%
rename from assets/z_Crusty_and_Elin_vr_weapons.pk3
rename to assets/z_vr_weapons_jko_Crusty_and_Elin.pk3
index 3f0568e42f3fe5cdd1ab38e415205420564327ba..55628acf684e350fa7316bfbc59f6c3a9f15fdba 100644
GIT binary patch
delta 720
zcmeC#72UZ%x}k-!g{g(Pg{6hHg{_6Xg`<VDg{y_Tg{OtLg|CIbMW98nMW{u%MWjV^
zi`e$#^~@|H3=9k$3~bZpgk8%$k}b-_z#z`Xz`zF-El*7>$j>W|FDueZPD`IU<!s+A
z2Z5INHb*-??<lXU`u9mDu*gL@hbgjoVy@WJx0mlu3zHEN^X8B+{u~$^`t8|U-@k8O
zmF`&auwcfn%Anp~bvC|Tai2E^=a#S7UKiG$IOS_?{mmM=TkGbVmHeujEnjc3b(Nm@
zE^lw2pS%9ASiI{>@$#!CC#HTs{qn-c`kJ2IPoJ#Ywm<)J%{#r%=Zt>1zs<k9<kgMZ
z;H+EM_g#Mc@_OO5?W@&HzgunlRW<9o``_jFzFK_wo94`X<-fw!YYrT{98b8WZ}2m}
z*4V$RP;$}5YYt{5YwJZg(th`(T)F1tcIyozr`SRDC>0Hft&GWM9{&!Wk{Xf}$*3bJ
z*wtasa4~bXqTn&EH5<Qq&#4YbD^ilNy26{-bnzTxomcjpr&oh#rO(Rgn{ZQcQ}<1e
zvXAb9rR)2;gbqBi^4u&JqbSMebJ1j$dgH|6gy8v;H%(ac@ZcQ&IWb1{6ZyrS-#Dq!
z^g%VUHSxvFP_a<IGo6vElpas2?EUF9^|#6C%bI>cMJE#GM22&vy9hmX%UU7zBs^)k
zlEk{{&$Sr#DV;RbSQH`0)y$<k=RkPmJIRn6$t>PH-{yL>s%?GUHd#zW{n;#`62@%R
zT`8BWf)WlZ7e!5oU9$T^V&dV6RnA+xM2@PhTeiGOdHRAUXUt1JX>ay6iktY+=F?)v
z$<u$|JT`U39uY4a{)5E{iZ@lgd0t1fMoJuc;ju3Gm8aN`_eFXCn6_^{F6Jy6z{n)W
nj5{p>lM@3Y5HD#2szys$0p6^@6vx0|2!yqw3=H2+iUD~5V?RHp

delta 80
zcmWN^xeb6I06<YZ!21T~a0TXI8H?YTIF81|#?rWvrTka@_4eE47b0R3QY4CuoPv^y
fnueB+o`I1GjoIz_oZoAm(Nc-f95^Gy@z`)bDV!G*

diff --git a/java/com/drbeef/jkxr/GLES3JNIActivity.java b/java/com/drbeef/jkxr/GLES3JNIActivity.java
index 7dcefc5..c1eb7d6 100644
--- a/java/com/drbeef/jkxr/GLES3JNIActivity.java
+++ b/java/com/drbeef/jkxr/GLES3JNIActivity.java
@@ -219,10 +219,6 @@ import java.util.Vector;
 		//Copy the command line params file
 		copy_asset("/sdcard/JKXR", "commandline.txt", false);
 
-		//Copy the weapon adjustment config - should we force overwrite?
-		copy_asset("/sdcard/JKXR/JK2/base", "weapons_vr_jo.cfg", true);
-		copy_asset("/sdcard/JKXR/JK3/base", "weapons_vr_ja.cfg", true);
-
 		//Our assets
 		copy_asset("/sdcard/JKXR/JK2/base", "z_vr_assets_base.pk3", true);
 		copy_asset("/sdcard/JKXR/JK2/base", "z_vr_assets_jko.pk3", true);
@@ -235,14 +231,20 @@ import java.util.Vector;
 			copy_asset("/sdcard/JKXR/JK2/base", "GGDynamicWeapons.pk3", false);
 
 			//Weapon Models
-			copy_asset("/sdcard/JKXR/JK2/base", "z_Crusty_and_Elin_vr_weapons.pk3", true);
+			copy_asset("/sdcard/JKXR/JK2/base", "z_vr_weapons_jko_Crusty_and_Elin.pk3", true);
 			copy_asset("/sdcard/JKXR/JK2/base", "assets6_vr_weapons_shaders.pk3", true);
+            //Delete weapons pak and config with old name
+            delete_asset(new File("/sdcard/JKXR/JK2/base/z_Crusty_and_Elin_vr_weapons.pk3"));
+            delete_asset(new File("/sdcard/JKXR/JK2/base/weapons_vr_jo.cfg"));
 		}
 
 		//Bunch of cool mods and their credits - only copy if user wants them
 		if (!new File("/sdcard/JKXR/JK3/base/no_copy").exists()) {
 			//Weapon Models
-			copy_asset("/sdcard/JKXR/JK3/base", "z_Crusty_and_Elin_vr_weapons_JKAcademy.pk3", true);
+			copy_asset("/sdcard/JKXR/JK3/base", "z_vr_weapons_jka_Crusty_and_Elin.pk3", true);
+            //Delete weapons pak with old name
+            delete_asset(new File("/sdcard/JKXR/JK3/base/z_Crusty_and_Elin_vr_weapons.pk3"));
+            delete_asset(new File("/sdcard/JKXR/JK3/base/weapons_vr_ja.cfg"));
 		}
 
 		//Copy mods to the demo folder if demo assets exist, since the demo doesn't seem to be able to load mods from base
@@ -265,9 +267,12 @@ import java.util.Vector;
 			copy_asset(demoFolder, "packaged_mods_credits.txt", false);
 			copy_asset(demoFolder, "GGDynamicWeapons.pk3", false);
 
-			//Weapon Models
-			copy_asset(demoFolder, "z_Crusty_and_Elin_vr_weapons.pk3", true);
-			copy_asset(demoFolder, "assets6_vr_weapons_shaders.pk3", true);
+            //Weapon Models
+            copy_asset(demoFolder, "z_vr_weapons_jko_Crusty_and_Elin.pk3", true);
+            copy_asset(demoFolder, "assets6_vr_weapons_shaders.pk3", true);
+            //Delete weapons pak and config with old name
+            delete_asset(new File(demoFolder + "/z_Crusty_and_Elin_vr_weapons.pk3"));
+            delete_asset(new File(demoFolder + "/weapons_vr_jo.cfg"));
 		}
 
 		//Read these from a file and pass through
@@ -370,6 +375,18 @@ import java.util.Vector;
 		}
 	}
 
+	public void delete_asset(File file) {
+		if (!file.exists()) {
+			return;
+		}
+		if (file.isDirectory()) {
+			for (File nestedFile : file.listFiles()) {
+				delete_asset(nestedFile);
+			}
+		}
+		file.delete();
+	}
+
 	@Override protected void onStart()
 	{
 		Log.v( TAG, "GLES3JNIActivity::onStart()" );
diff --git a/assets/weapons_vr_ja.cfg b/z_vr_assets_jka/weapons_vr.cfg
similarity index 56%
rename from assets/weapons_vr_ja.cfg
rename to z_vr_assets_jka/weapons_vr.cfg
index 6f7d32d..7f43a15 100644
--- a/assets/weapons_vr_ja.cfg
+++ b/z_vr_assets_jka/weapons_vr.cfg
@@ -4,21 +4,20 @@
 // Values are:  scale,right,up,forward,pitch,yaw,roll
 
 seta vr_weapon_adjustment_1 "0.55,-4.89,8.12,-12.36,-28.60,10.80,-199.50"
-seta vr_weapon_adjustment_2 "1.000,-3.840,8.320,-13.680,0.000,0.000,0.000"
-seta vr_weapon_adjustment_10 "1.840,-3.489,6.370,-7.946,0.000,0.000,0.000"
-seta vr_weapon_adjustment_11 "1.755,-5.140,4.980,-10.462,18.700,1.000,-11.000"
-seta vr_weapon_adjustment_12 "1.840,-3.087,4.424,-8.750,22.400,0.000,-21.400"
+seta vr_weapon_adjustment_10 "1.704,-3.404,4.765,-8.826,33.500,0.000,-27.000"
+seta vr_weapon_adjustment_11 "1.104,-5.544,4.475,-10.290,25.000,0.000,-31.100"
+seta vr_weapon_adjustment_12 "1.716,-3.065,4.231,-7.751,18.200,0.000,-23.200"
 seta vr_weapon_adjustment_13 "1.000,-3.980,7.680,-10.020,0.000,0.000,0.000"
 seta vr_weapon_adjustment_14 "0.52,-12.87,13.29,-22.09,11.30,26.60,-3.40"
-seta vr_weapon_adjustment_17 "1.000,-6.860,12.340,-4.600,-49.700,0.000,0.000"
 seta vr_weapon_adjustment_18 "0.510,-8.235,10.706,-3.922,-5.600,0.400,0.000"
 seta vr_weapon_adjustment_19 "0.43,-8.97,13.22,-21.68,-4.80,-4.50,-0.40"
+seta vr_weapon_adjustment_2 "1.000,-3.840,8.320,-13.680,0.000,0.000,0.000"
 seta vr_weapon_adjustment_20 "0.44,-13.55,12.79,-26.06,0.30,-1.40,-0.40"
 seta vr_weapon_adjustment_22 "0.64,-12.59,12.94,-20.44,11.30,26.60,-3.40"
-seta vr_weapon_adjustment_3 "0.906,-4.194,8.234,-9.801,0.000,0.000,0.000"
-seta vr_weapon_adjustment_4 "0.928,-4.095,9.116,-3.707,0.000,0.000,0.000"
+seta vr_weapon_adjustment_3 "1.010,-4.079,6.495,-7.842,0.000,0.000,0.000"
+seta vr_weapon_adjustment_4 "1.068,-3.408,6.891,-6.611,0.000,0.000,0.000"
 seta vr_weapon_adjustment_5 "1.642,-2.826,6.249,-8.429,0.000,0.000,0.000"
-seta vr_weapon_adjustment_6 "0.652,-3.344,13.988,-7.730,0.000,0.000,0.000"
-seta vr_weapon_adjustment_7 "0.998,-4.349,6.473,-10.160,0.000,0.000,0.000"
-seta vr_weapon_adjustment_8 "1.006,-4.553,11.571,-12.545,0.000,0.000,0.000"
-seta vr_weapon_adjustment_9 "1.456,-3.695,6.676,-3.420,0.000,0.000,0.000"
+seta vr_weapon_adjustment_6 "0.904,-3.695,8.938,-9.115,0.000,0.000,0.000"
+seta vr_weapon_adjustment_7 "1.000,-4.640,7.680,-10.900,0.000,0.000,0.000"
+seta vr_weapon_adjustment_8 "1.000,-4.780,8.240,-10.440,0.000,0.000,0.000"
+seta vr_weapon_adjustment_9 "1.500,-3.587,4.467,-7.747,0.000,0.000,0.000"
diff --git a/assets/weapons_vr_jo.cfg b/z_vr_assets_jko/weapons_vr.cfg
similarity index 55%
rename from assets/weapons_vr_jo.cfg
rename to z_vr_assets_jko/weapons_vr.cfg
index 75365e3..fad7a26 100644
--- a/assets/weapons_vr_jo.cfg
+++ b/z_vr_assets_jko/weapons_vr.cfg
@@ -4,21 +4,21 @@
 // Values are:  scale,right,up,forward,pitch,yaw,roll
 
 seta vr_weapon_adjustment_1 "0.55,-4.89,8.12,-12.36,-28.60,10.80,-199.50"
-seta vr_weapon_adjustment_10 "1.840,-3.489,6.370,-7.946,0.000,0.000,0.000"
-seta vr_weapon_adjustment_11 "1.755,-5.140,4.980,-10.462,18.700,1.000,-11.000"
-seta vr_weapon_adjustment_12 "1.840,-3.087,4.424,-8.750,22.400,0.000,-21.400"
-seta vr_weapon_adjustment_13 "1.000,-6.860,12.340,-4.600,-49.700,0.000,0.000"
+seta vr_weapon_adjustment_10 "1.704,-3.404,4.765,-8.826,33.500,0.000,-27.000"
+seta vr_weapon_adjustment_11 "1.104,-5.544,4.475,-10.290,25.000,0.000,-31.100"
+seta vr_weapon_adjustment_12 "1.716,-3.065,4.231,-7.751,18.200,0.000,-23.200"
+seta vr_weapon_adjustment_13 "1.146,-6.248,9.110,-12.950,15.100,0.000,-2.700"
 seta vr_weapon_adjustment_14 "0.52,-12.87,13.29,-22.09,11.30,26.60,-3.40"
 seta vr_weapon_adjustment_18 "0.510,-8.235,10.706,-3.922,-5.600,0.400,0.000"
 seta vr_weapon_adjustment_19 "0.43,-8.97,13.22,-21.68,-4.80,-4.50,-0.40"
-seta vr_weapon_adjustment_2 "1.000,-3.800,4.840,-8.020,0.000,0.000,0.000"
+seta vr_weapon_adjustment_2 "1.010,-3.604,5.188,-11.050,0.000,0.000,0.000"
 seta vr_weapon_adjustment_20 "0.44,-13.55,12.79,-26.06,0.30,-1.40,-0.40"
 seta vr_weapon_adjustment_22 "0.64,-12.59,12.94,-20.44,11.30,26.60,-3.40"
-seta vr_weapon_adjustment_3 "0.906,-4.194,8.234,-9.801,0.000,0.000,0.000"
-seta vr_weapon_adjustment_4 "0.928,-4.095,9.116,-3.707,0.000,0.000,0.000"
+seta vr_weapon_adjustment_3 "1.010,-4.079,6.495,-7.842,0.000,0.000,0.000"
+seta vr_weapon_adjustment_4 "1.068,-3.408,6.891,-6.611,0.000,0.000,0.000"
 seta vr_weapon_adjustment_5 "1.642,-2.826,6.249,-8.429,0.000,0.000,0.000"
-seta vr_weapon_adjustment_6 "0.652,-3.344,13.988,-7.730,0.000,0.000,0.000"
+seta vr_weapon_adjustment_6 "0.904,-3.695,8.938,-9.115,0.000,0.000,0.000"
 seta vr_weapon_adjustment_7 "0.998,-4.349,6.473,-10.160,0.000,0.000,0.000"
-seta vr_weapon_adjustment_8 "1.006,-4.553,11.571,-12.545,0.000,0.000,0.000"
-seta vr_weapon_adjustment_9 "1.456,-3.695,6.676,-3.420,0.000,0.000,0.000"
+seta vr_weapon_adjustment_8 "1.000,-4.780,8.240,-10.440,0.000,0.000,0.000"
+seta vr_weapon_adjustment_9 "1.500,-3.587,4.467,-7.747,0.000,0.000,0.000"