diff --git a/assets/weapons_vr_ja.cfg b/assets/weapons_vr_ja.cfg index 7f43a15..04963ce 100644 --- a/assets/weapons_vr_ja.cfg +++ b/assets/weapons_vr_ja.cfg @@ -4,20 +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.704,-3.404,4.765,-8.826,33.500,0.000,-27.000" +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.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_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_14 "0.52,-12.87,13.29,-22.09,11.30,26.60,-3.40" +seta vr_weapon_adjustment_17 "0.940,-5.404,12.128,-3.851,-48.600,13.500,-7.500" 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 "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_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_5 "1.642,-2.826,6.249,-8.429,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" +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" diff --git a/assets/weapons_vr_jo.cfg b/assets/weapons_vr_jo.cfg index fad7a26..301c7bf 100644 --- a/assets/weapons_vr_jo.cfg +++ b/assets/weapons_vr_jo.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.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_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_12 "1.840,-3.087,4.424,-8.750,22.400,0.000,-21.400" +seta vr_weapon_adjustment_13 "0.940,-5.404,12.128,-3.851,-48.600,13.500,-7.500" 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.010,-3.604,5.188,-11.050,0.000,0.000,0.000" +seta vr_weapon_adjustment_2 "1.000,-3.800,4.840,-8.020,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 "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_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_5 "1.642,-2.826,6.249,-8.429,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_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.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" +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" diff --git a/assets/z_Crusty_and_Elin_vr_weapons.pk3 b/assets/z_Crusty_and_Elin_vr_weapons.pk3 new file mode 100644 index 0000000..5114d91 Binary files /dev/null and b/assets/z_Crusty_and_Elin_vr_weapons.pk3 differ diff --git a/java/com/drbeef/jkxr/GLES3JNIActivity.java b/java/com/drbeef/jkxr/GLES3JNIActivity.java index 82d1356..5cc3ec1 100644 --- a/java/com/drbeef/jkxr/GLES3JNIActivity.java +++ b/java/com/drbeef/jkxr/GLES3JNIActivity.java @@ -236,6 +236,17 @@ import java.util.Vector; copy_asset_with_rename("/sdcard/JKXR/JK2/base", "openjo_sp_pico.cfg", "openjo_sp.cfg", false); } + //Bunch of cool mods and their credits - only copy if user wants them + if (!new File("/sdcard/JKXR/JK2/base/no_copy").exists()) { + copy_asset("/sdcard/JKXR/JK2/base", "packaged_mods_credits.txt", false); + copy_asset("/sdcard/JKXR/JK2/base", "GGDynamicWeapons.pk3", false); + copy_asset("/sdcard/JKXR/JK2/base", "Kyle's_lightsaber_hilt_hd.pk3", false); + + //Weapon Models + copy_asset("/sdcard/JKXR/JK2/base", "z_Crusty_and_Elin_vr_weapons.pk3", false); + copy_asset("/sdcard/JKXR/JK3/base", "z_Crusty_and_Elin_vr_weapons.pk3", false); + } + //Read these from a file and pass through commandLineParams = new String("jo");