From 0983c9b3bb1ff0226f2688873d99ed1495df313f Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Sat, 24 Aug 2024 19:57:44 +0200 Subject: [PATCH] General - Fix and improve misc. interaction anims (#10248) --- .../compat_rhs_afrf3_repair/CfgVehicles.hpp | 22 +++++++++++ .../compat_sog_trenches/CfgVehicles.hpp | 2 +- .../compat_spe_repair/CfgVehicles.hpp | 14 +++++++ addons/compat_ws/CfgVehicles.hpp | 26 ++----------- addons/interaction/CfgVehicles.hpp | 37 ++++++++++++++----- addons/repair/CfgVehicles.hpp | 6 ++- 6 files changed, 72 insertions(+), 35 deletions(-) diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/CfgVehicles.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/CfgVehicles.hpp index 6cd2237a6f..48da0552b8 100644 --- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/CfgVehicles.hpp +++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/CfgVehicles.hpp @@ -50,6 +50,28 @@ class CfgVehicles { }; }; }; + class rhs_gaz66_vmf: rhs_truck {}; + class rhs_gaz66_ammo_base: rhs_gaz66_vmf { + class EGVAR(interaction,anims): EGVAR(interaction,anims) { + class spare_hide: spare_hide { + positions[] = {"_target selectionPosition ['spare', 'FireGeometry', 'AveragePoint']"}; + }; + }; + }; + class rhs_gaz66_repair_base: rhs_gaz66_vmf { + class EGVAR(interaction,anims): EGVAR(interaction,anims) { + class spare_hide: spare_hide { + positions[] = {"_target selectionPosition ['spare', 'FireGeometry', 'AveragePoint']"}; + }; + }; + }; + class rhs_gaz66_ap2_base: rhs_gaz66_vmf { + class EGVAR(interaction,anims): EGVAR(interaction,anims) { + class spare_hide: spare_hide { + positions[] = {"_target selectionPosition ['spare', 'FireGeometry', 'AveragePoint']"}; + }; + }; + }; class RHS_Ural_BaseTurret: Truck_F { class EGVAR(interaction,anims) { diff --git a/addons/compat_sog/compat_sog_trenches/CfgVehicles.hpp b/addons/compat_sog/compat_sog_trenches/CfgVehicles.hpp index 3a826d0139..bc67a39f78 100644 --- a/addons/compat_sog/compat_sog_trenches/CfgVehicles.hpp +++ b/addons/compat_sog/compat_sog_trenches/CfgVehicles.hpp @@ -121,7 +121,7 @@ class CfgVehicles { class vn_wheeled_lr2a_base: vn_wheeled_car_base { class EGVAR(interaction,anims) { class hide_shovel { - positions[] = {"_target selectionPosition ['hide_shovel', 'ViewGeometry', 'AveragePoint']"}; + positions[] = {"_target selectionPosition ['hide_shovel', 'FireGeometry', 'AveragePoint']"}; items[] = {"ACE_EntrenchingTool"}; name = ECSTRING(trenches,EntrenchingToolName); text = ECSTRING(trenches,EntrenchingToolName); diff --git a/addons/compat_spe/compat_spe_repair/CfgVehicles.hpp b/addons/compat_spe/compat_spe_repair/CfgVehicles.hpp index 5b245eebbc..2f20e427d8 100644 --- a/addons/compat_spe/compat_spe_repair/CfgVehicles.hpp +++ b/addons/compat_spe/compat_spe_repair/CfgVehicles.hpp @@ -30,6 +30,20 @@ class CfgVehicles { }; }; }; + class SPE_CCKW_353_Repair: SPE_CCKW_353_Base { + class EGVAR(interaction,anims): EGVAR(interaction,anims) { + class spare_wheel_hide_source: spare_wheel_hide_source { + positions[] = {{-0.9, 0.43, -0.75}}; + }; + }; + }; + class SPE_CCKW_353_Fuel: SPE_CCKW_353_Base { + class EGVAR(interaction,anims): EGVAR(interaction,anims) { + class spare_wheel_hide_source: spare_wheel_hide_source { + positions[] = {{-0.9, -0.2, -0.7}}; + }; + }; + }; class SPE_R200_base: SPE_Car_base { class EGVAR(interaction,anims) { diff --git a/addons/compat_ws/CfgVehicles.hpp b/addons/compat_ws/CfgVehicles.hpp index 9c2f3184c0..98dc922d98 100644 --- a/addons/compat_ws/CfgVehicles.hpp +++ b/addons/compat_ws/CfgVehicles.hpp @@ -1,10 +1,11 @@ class CfgVehicles { // Vehicle animation interactions + // Easier to not inherit class Offroad_01_base_lxWS; class Offroad_01_armor_base_lxWS: Offroad_01_base_lxWS { class EGVAR(interaction,anims) { class HideBackpacks { - positions[] = {{-1.15, -1.15, -0.7}, {1.1, -1.15, -0.7}, {1.1, -2.5, -0.7}}; + positions[] = {{-1.15, -1.17, -0.66}, {1.05, -1.17, -0.66}, {1.05, -2.52, -0.66}}; items[] = {"B_TacticalPack_blk", "B_TacticalPack_blk", "B_Carryall_khk", "B_Carryall_khk"}; name = "$STR_a3_cfgvehicleclasses_backpacks0"; text = "$STR_a3_cfgvehicleclasses_backpacks0"; @@ -12,30 +13,11 @@ class CfgVehicles { }; }; - class I_G_Offroad_01_AT_F; - class Offroad_01_AT_lxWS: I_G_Offroad_01_AT_F { - class EGVAR(interaction,anims) { - class HideBackpacks { - positions[] = {{-1.15, -1.25, -0.2}, {1.1, -1.25, -0.2}, {1.1, -2.6, -0.2}}; - items[] = {"B_TacticalPack_blk", "B_TacticalPack_blk", "B_Carryall_khk", "B_Carryall_khk"}; - name = "$STR_a3_cfgvehicleclasses_backpacks0"; - text = "$STR_a3_cfgvehicleclasses_backpacks0"; - }; - }; - }; + class Offroad_01_AT_lxWS; class Offroad_01_armor_AT_lxWS: Offroad_01_AT_lxWS { - class EGVAR(interaction,anims): EGVAR(interaction,anims) { - class HideBackpacks: HideBackpacks { - positions[] = {{-1.15, -1.25, -0.7}, {1.1, -1.25, -0.7}, {1.1, -2.6, -0.7}}; - }; - }; - }; - - class I_G_Offroad_01_armed_F; - class Offroad_01_armed_lxWS: I_G_Offroad_01_armed_F { class EGVAR(interaction,anims) { class HideBackpacks { - positions[] = {{-1.15, -1.03, -0.8}, {1.1, -1.03, -0.8}, {1.1, -2.38, -0.8}}; + positions[] = {{-1.15, -1.27, -0.66}, {1.05, -1.27, -0.66}, {1.05, -2.62, -0.66}}; items[] = {"B_TacticalPack_blk", "B_TacticalPack_blk", "B_Carryall_khk", "B_Carryall_khk"}; name = "$STR_a3_cfgvehicleclasses_backpacks0"; text = "$STR_a3_cfgvehicleclasses_backpacks0"; diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp index ab338c3f09..128e79c9f5 100644 --- a/addons/interaction/CfgVehicles.hpp +++ b/addons/interaction/CfgVehicles.hpp @@ -381,13 +381,36 @@ class CfgVehicles { class Offroad_01_base_F: Car_F { class GVAR(anims) { class HideBackpacks { - positions[] = {{-1.15, -1.15, -0.2}, {1.1, -1.15, -0.2}, {1.1, -2.5, -0.2}}; + positions[] = {{-1.15, -1.15, -0.2}, {1.05, -1.15, -0.2}, {1.05, -2.5, -0.2}}; items[] = {"B_TacticalPack_blk", "B_TacticalPack_blk", "B_Carryall_khk", "B_Carryall_khk"}; name = "$STR_a3_cfgvehicleclasses_backpacks0"; text = "$STR_a3_cfgvehicleclasses_backpacks0"; }; }; }; + class Offroad_01_military_base_F: Offroad_01_base_F {}; + class Offroad_01_armed_base_F: Offroad_01_military_base_F { + class GVAR(anims): GVAR(anims) { + class HideBackpacks: HideBackpacks { + positions[] = {{-1.15, -1.03, -0.8}, {1.05, -1.03, -0.8}, {1.05, -2.38, -0.8}}; + }; + }; + }; + class Offroad_01_AT_base_F: Offroad_01_military_base_F { + class GVAR(anims): GVAR(anims) { + class HideBackpacks: HideBackpacks { + positions[] = {{-1.15, -1.25, -0.2}, {1.05, -1.25, -0.2}, {1.05, -2.6, -0.2}}; + }; + }; + }; + class Offroad_01_military_covered_base_F: Offroad_01_military_base_F { + class GVAR(anims): GVAR(anims) { + class HideBackpacks: HideBackpacks { + positions[] = {{-1.15, -1, -0.27}, {1.05, -1, -0.27}, {1.05, -2.35, -0.27}}; + }; + }; + }; + class Quadbike_01_base_F: Car_F { class ACE_Actions: ACE_Actions { class ACE_MainActions: ACE_MainActions { @@ -504,10 +527,7 @@ class CfgVehicles { }; class APC_Tracked_01_base_F: Tank_F { - class GVAR(anims); - }; - class B_APC_Tracked_01_base_F: APC_Tracked_01_base_F { - class GVAR(anims): GVAR(anims) { + class GVAR(anims) { class showBags { phase = 0; selections[] = {"vhc_bags"}; @@ -518,6 +538,7 @@ class CfgVehicles { }; }; }; + class B_APC_Tracked_01_base_F: APC_Tracked_01_base_F {}; class B_APC_Tracked_01_CRV_F: B_APC_Tracked_01_base_F { class GVAR(anims): GVAR(anims) { class showBags: showBags { @@ -527,11 +548,7 @@ class CfgVehicles { }; class APC_Tracked_02_base_F: Tank_F { - class GVAR(anims); - }; - class O_APC_Tracked_02_base_F: APC_Tracked_02_base_F {}; - class O_APC_Tracked_02_cannon_F: O_APC_Tracked_02_base_F { - class GVAR(anims): GVAR(anims) { + class GVAR(anims) { class showBags { phase = 0; selections[] = {"vhc_bags"}; diff --git a/addons/repair/CfgVehicles.hpp b/addons/repair/CfgVehicles.hpp index 011a038f91..89d3cd8313 100644 --- a/addons/repair/CfgVehicles.hpp +++ b/addons/repair/CfgVehicles.hpp @@ -478,20 +478,22 @@ class CfgVehicles { class Truck_01_cargo_base_F: Truck_01_viv_base_F { class EGVAR(interaction,anims) { class Tyre1_hide { - selections[] = {"tyre1_hide"}; + positions[] = {"_target selectionPosition ['tyre1_hide', 'ViewGeometry', 'AveragePoint']"}; items[] = {"ACE_Wheel"}; name = CSTRING(RemoveWheel); text = CSTRING(RemovingWheel); + distance = 2.5; }; }; }; class Truck_01_flatbed_base_F: Truck_01_viv_base_F { class EGVAR(interaction,anims) { class Tyre1_hide { - selections[] = {"tyre1_hide"}; + positions[] = {"_target selectionPosition ['tyre1_hide', 'ViewGeometry', 'AveragePoint']"}; items[] = {"ACE_Wheel"}; name = CSTRING(RemoveWheel); text = CSTRING(RemovingWheel); + distance = 2.5; }; }; };