teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-25 05:21:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow to override weapon adjustment

Browse source
This commit is contained in:
Petr Bartos 2023-04-28 21:54:58 +02:00 committed by Simon
parent b075f1a28c
commit cc79e8ae3f
7 changed files with 51 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Projects/Android/jni/OpenJK/code/qcommon/common.cpp
View file

@ -990,13 +990,11 @@ void Com_ExecuteCfg(void)
// skip the q3config.cfg and autoexec.cfg if "safe" is on the command line // skip the q3config.cfg and autoexec.cfg if "safe" is on the command line
Cbuf_ExecuteText(EXEC_NOW, "exec " Q3CONFIG_NAME "\n"); Cbuf_ExecuteText(EXEC_NOW, "exec " Q3CONFIG_NAME "\n");
Cbuf_Execute(); Cbuf_Execute();
Cbuf_ExecuteText(EXEC_NOW, "exec autoexec_sp.cfg\n");
//Execute to overwrite weapon locations with our desired adjustments //Execute to overwrite weapon locations with our desired adjustments
#ifdef JK2_MODE Cbuf_ExecuteText(EXEC_NOW, "exec weapons_vr.cfg\n" );
Cbuf_AddText( "exec weapons_vr_jo.cfg\n" ); Cbuf_Execute();
#else // Execute autoexec last (allowing to re-adjust weapons)
Cbuf_AddText( "exec weapons_vr_ja.cfg\n" ); Cbuf_ExecuteText(EXEC_NOW, "exec autoexec_sp.cfg\n");
#endif
Cbuf_Execute(); Cbuf_Execute();
} }
} }

6
Projects/Android/jni/OpenJK/code/ui/ui_main.cpp
View file

@ -6519,11 +6519,7 @@ void UI_ResetDefaults( void )
ui.Cmd_ExecuteText( EXEC_APPEND, "cvar_restart\n"); ui.Cmd_ExecuteText( EXEC_APPEND, "cvar_restart\n");
Controls_SetDefaults(); Controls_SetDefaults();
ui.Cmd_ExecuteText( EXEC_APPEND, "exec default.cfg\n"); ui.Cmd_ExecuteText( EXEC_APPEND, "exec default.cfg\n");
#ifdef JK2_MODE ui.Cmd_ExecuteText( EXEC_APPEND, "exec weapons_vr.cfg\n");
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, "vid_restart\n" ); ui.Cmd_ExecuteText( EXEC_APPEND, "vid_restart\n" );
} }

BIN
assets/z_Crusty_and_Elin_vr_weapons_JKAcademy.pk3 → assets/z_vr_weapons_jka_Crusty_and_Elin.pk3
View file

Binary file not shown.

BIN
assets/z_Crusty_and_Elin_vr_weapons.pk3 → assets/z_vr_weapons_jko_Crusty_and_Elin.pk3
View file

Binary file not shown.

31
java/com/drbeef/jkxr/GLES3JNIActivity.java
View file

@ -219,10 +219,6 @@ import java.util.Vector;
//Copy the command line params file //Copy the command line params file
copy_asset("/sdcard/JKXR", "commandline.txt", false); 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 //Our assets
copy_asset("/sdcard/JKXR/JK2/base", "z_vr_assets_base.pk3", true); copy_asset("/sdcard/JKXR/JK2/base", "z_vr_assets_base.pk3", true);
copy_asset("/sdcard/JKXR/JK2/base", "z_vr_assets_jko.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); copy_asset("/sdcard/JKXR/JK2/base", "GGDynamicWeapons.pk3", false);
//Weapon Models //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); 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 //Bunch of cool mods and their credits - only copy if user wants them
if (!new File("/sdcard/JKXR/JK3/base/no_copy").exists()) { if (!new File("/sdcard/JKXR/JK3/base/no_copy").exists()) {
//Weapon Models //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 //Copy mods to the demo folder if demo assets exist, since the demo doesn't seem to be able to load mods from base
@ -266,8 +268,11 @@ import java.util.Vector;
copy_asset(demoFolder, "GGDynamicWeapons.pk3", false); copy_asset(demoFolder, "GGDynamicWeapons.pk3", false);
//Weapon Models //Weapon Models
copy_asset(demoFolder, "z_Crusty_and_Elin_vr_weapons.pk3", true); copy_asset(demoFolder, "z_vr_weapons_jko_Crusty_and_Elin.pk3", true);
copy_asset(demoFolder, "assets6_vr_weapons_shaders.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 //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() @Override protected void onStart()
{ {
Log.v( TAG, "GLES3JNIActivity::onStart()" ); Log.v( TAG, "GLES3JNIActivity::onStart()" );

21
assets/weapons_vr_ja.cfg → z_vr_assets_jka/weapons_vr.cfg
View file

@ -4,21 +4,20 @@
// Values are: scale,right,up,forward,pitch,yaw,roll // 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_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.704,-3.404,4.765,-8.826,33.500,0.000,-27.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.104,-5.544,4.475,-10.290,25.000,0.000,-31.100"
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.716,-3.065,4.231,-7.751,18.200,0.000,-23.200"
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,-3.980,7.680,-10.020,0.000,0.000,0.000" 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_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_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_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_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_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_3 "1.010,-4.079,6.495,-7.842,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_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_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_7 "1.000,-4.640,7.680,-10.900,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_8 "1.000,-4.780,8.240,-10.440,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_9 "1.500,-3.587,4.467,-7.747,0.000,0.000,0.000"

20
assets/weapons_vr_jo.cfg → z_vr_assets_jko/weapons_vr.cfg
View file

@ -4,21 +4,21 @@
// Values are: scale,right,up,forward,pitch,yaw,roll // 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_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_10 "1.704,-3.404,4.765,-8.826,33.500,0.000,-27.000"
seta vr_weapon_adjustment_11 "1.755,-5.140,4.980,-10.462,18.700,1.000,-11.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.840,-3.087,4.424,-8.750,22.400,0.000,-21.400" 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,-6.860,12.340,-4.600,-49.700,0.000,0.000" 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_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_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_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_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_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_3 "1.010,-4.079,6.495,-7.842,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_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_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_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_8 "1.000,-4.780,8.240,-10.440,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_9 "1.500,-3.587,4.467,-7.747,0.000,0.000,0.000"