Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc Fixed - Fix CUP Gunner ACRE Attenuation #627

Merged
merged 5 commits into from
Jan 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"files.exclude": {
"**/.hemttout": true
"**/include": true
"files.exclude": {
"**/.hemttout": true,
"**/include": true
}
}
72 changes: 65 additions & 7 deletions addons/miscFixes/patchCUP/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,18 @@ class CfgPatches {
};
};

#define CUP_MAINTURRET_DISABLE_ATTENUATE class Turrets: Turrets {\
class MainTurret: MainTurret {\
disableSoundAttenuation = 1;\
};\
}

class CfgVehicles {
// Base classes
class Car;
class Car_F: Car {
class Turrets;
};
// Fix broken artillery computer on FV432 Mortar (shows artillery computer for 7.62mg)
class CUP_B_FV432_Bulldog_GB_D;
class CUP_B_FV432_Base: CUP_B_FV432_Bulldog_GB_D {
Expand Down Expand Up @@ -43,10 +54,12 @@ class CfgVehicles {
};
class UserActions {}; // clear all user actions (not a big deal)
};
// Fix the M1038 back seat
class Car_F;
// Fix the M1038 back seat and attenuation
class CUP_nHMMWV_Base: Car_F {
class CargoTurret;
class Turrets: Turrets {
class MainTurret;
};
};
class CUP_nM1038_Base: CUP_nHMMWV_Base {
class Turrets {
Expand All @@ -55,6 +68,21 @@ class CfgVehicles {
};
};
};
class CUP_nM1025_M2_Base: CUP_nHMMWV_Base {
CUP_MAINTURRET_DISABLE_ATTENUATE;
};
class CUP_nM1025_Mk19_Base: CUP_nHMMWV_Base {
CUP_MAINTURRET_DISABLE_ATTENUATE;
};
class CUP_nM1025_M240_Base: CUP_nHMMWV_Base {
CUP_MAINTURRET_DISABLE_ATTENUATE;
};
class CUP_nM1036_TOW_Base: CUP_nHMMWV_Base {
CUP_MAINTURRET_DISABLE_ATTENUATE;
};
class CUP_nM1025_SOV_Base: CUP_nHMMWV_Base {
attenuationEffectType = "OpenCarAttenuation";
};
// Tweaks to the GTK Boxer's handling (accel/braking) + HMG swap to M3M + countermeasures move to gunner
class Wheeled_APC_F: Car_F {
class NewTurret;
Expand Down Expand Up @@ -84,11 +112,11 @@ class CfgVehicles {
brakeIdleSpeed = 1.78; // was 0
maxFordingDepth = 1.0; // was 1.5
class Wheels {
class wheel_1_1 {
maxBrakeTorque = 20000; // was 12500
maxHandBrakeTorque = 30000; // was 25000
};
};
class wheel_1_1 {
maxBrakeTorque = 20000; // was 12500
maxHandBrakeTorque = 30000; // was 25000
};
};
class AnimationSources: AnimationSources {
class main_gun_muzzle_rot {
weapon = "CUP_Vhmg_M3P_veh";
Expand Down Expand Up @@ -117,6 +145,36 @@ class CfgVehicles {
};
};
};
// CUP Frag7 Humvees
class CUP_ECVHMMWV_Base: Car_F {
class Turrets: Turrets {
class MainTurret;
};
};
class CUP_ECVHMMWV_m2_Base: CUP_ECVHMMWV_Base {
CUP_MAINTURRET_DISABLE_ATTENUATE;
};
class CUP_ECVHMMWV_m240_Base: CUP_ECVHMMWV_Base {
CUP_MAINTURRET_DISABLE_ATTENUATE;
};
class CUP_ECVHMMWV_mk19_Base: CUP_ECVHMMWV_Base {
CUP_MAINTURRET_DISABLE_ATTENUATE;
};
// CUP Tigrs
class CUP_Tigr_Base: Car_F {
class Turrets: Turrets {
class MainTurret;
};
};
class CUP_Tigr_M_PK_Base: CUP_Tigr_Base {
CUP_MAINTURRET_DISABLE_ATTENUATE;
};
class CUP_Tigr_STS_PK_Base: CUP_Tigr_Base {
CUP_MAINTURRET_DISABLE_ATTENUATE;
};
class CUP_Tigr_M_KORD_Base: CUP_Tigr_Base {
CUP_MAINTURRET_DISABLE_ATTENUATE;
};
};

class CfgRecoils {
Expand Down