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

CSW - Fix CUP CSW #9907

Merged
merged 3 commits into from
Apr 2, 2024
Merged
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
37 changes: 18 additions & 19 deletions addons/compat_cup_weapons/compat_cup_weapons_csw/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class CfgWeapons {
deployTime = 20;
pickupTime = 25;
class assembleTo {
ace_csw_mortarBaseplate = "CUP_O_2b14_82mm_RU";
ace_csw_mortarBaseplate = "CUP_I_2b14_82mm_AAF";
};
};
class WeaponSlotsInfo: WeaponSlotsInfo {
Expand All @@ -31,7 +31,7 @@ class CfgWeapons {
picture = "\CUP\Weapons\CUP_Weapons_StaticWeapons\M252\data\ui\icomap_mortar_m251_ca.paa";
class ace_csw: ace_csw {
class assembleTo {
ace_csw_mortarBaseplate = "CUP_B_M252_US";
ace_csw_mortarBaseplate = "CUP_I_M252_AAF";
};
};
};
Expand All @@ -42,7 +42,7 @@ class CfgWeapons {
picture = "\CUP\Weapons\CUP_Weapons_StaticWeapons\M252\data\ui\icomap_mortar_m251_ca.paa";
class ace_csw: ace_csw {
class assembleTo {
ace_csw_mortarBaseplate = "CUP_B_L16A2_BAF_MPT";
ace_csw_mortarBaseplate = "CUP_I_L16A2_AAF";
};
};
};
Expand All @@ -58,8 +58,8 @@ class CfgWeapons {
deployTime = 4;
pickupTime = 4;
class assembleTo {
ace_csw_m3Tripod = "CUP_B_M2StaticMG_US";
ace_csw_m3TripodLow = "CUP_B_M2StaticMG_MiniTripod_US";
ace_csw_m3Tripod = "CUP_I_M2StaticMG_AAF";
ace_csw_m3TripodLow = "CUP_I_M2StaticMG_MiniTripod_AAF";
};
};
class WeaponSlotsInfo: WeaponSlotsInfo {
Expand All @@ -81,8 +81,8 @@ class CfgWeapons {
deployTime = 4;
pickupTime = 4;
class assembleTo {
ace_csw_kordTripod = "CUP_O_DSHKM_ChDKZ";
ace_csw_kordTripodLow = "CUP_O_DSHkM_MiniTriPod_ChDKZ";
ace_csw_kordTripod = "CUP_I_DSHKM_AAF";
ace_csw_kordTripodLow = "CUP_I_DSHKM_MiniTriPod_AAF";
};
};
class WeaponSlotsInfo: WeaponSlotsInfo {
Expand All @@ -104,8 +104,8 @@ class CfgWeapons {
deployTime = 4;
pickupTime = 4;
class assembleTo {
ace_csw_kordTripod = "CUP_O_KORD_high_RU";
ace_csw_kordTripodLow = "CUP_O_KORD_RU";
ace_csw_kordTripod = "CUP_I_KORD_high_AAF";
ace_csw_kordTripodLow = "CUP_I_KORD_AAF";
};
};
class WeaponSlotsInfo: WeaponSlotsInfo {
Expand All @@ -127,7 +127,7 @@ class CfgWeapons {
deployTime = 4;
pickupTime = 4;
class assembleTo {
ace_csw_sag30Tripod = "CUP_O_AGS_RU";
ace_csw_sag30Tripod = "CUP_I_AGS_AAF";
};
};
class WeaponSlotsInfo: WeaponSlotsInfo {
Expand All @@ -149,7 +149,7 @@ class CfgWeapons {
deployTime = 4;
pickupTime = 4;
class assembleTo {
ace_csw_m3TripodLow = "CUP_B_MK19_TriPod_US";
ace_csw_m3TripodLow = "CUP_I_MK19_TriPod_AAF";
};
};
class WeaponSlotsInfo: WeaponSlotsInfo {
Expand All @@ -168,7 +168,7 @@ class CfgWeapons {
type = "mount";
deployTime = 4;
pickupTime = 4;
deploy = "CUP_O_Metis_RU";
deploy = "CUP_I_Metis_AAF";
};
class WeaponSlotsInfo: WeaponSlotsInfo {
mass = 300;
Expand All @@ -186,7 +186,7 @@ class CfgWeapons {
deployTime = 4;
pickupTime = 4;
class assembleTo {
ace_csw_m220Tripod = "CUP_B_TOW_TriPod_US";
ace_csw_m220Tripod = "CUP_I_TOW_TriPod_AAF";
};
};
class WeaponSlotsInfo: WeaponSlotsInfo {
Expand All @@ -200,7 +200,7 @@ class CfgWeapons {
class CUP_TOW2_carry: CUP_TOW_carry {
class ace_csw: ace_csw {
class assembleTo {
ace_csw_m220Tripod = "CUP_B_TOW2_TriPod_US";
ace_csw_m220Tripod = "CUP_I_TOW2_TriPod_AAF";
};
};
};
Expand All @@ -216,7 +216,7 @@ class CfgWeapons {
deployTime = 4;
pickupTime = 4;
class assembleTo {
ace_csw_spg9Tripod = "CUP_B_SPG9_CDF";
ace_csw_spg9Tripod = "CUP_I_SPG9_AAF";
};
};
class WeaponSlotsInfo: WeaponSlotsInfo {
Expand Down Expand Up @@ -257,12 +257,12 @@ class CfgWeapons {
magazineReloadTime = 0.5;
};

class CUP_Vmlauncher_AT13_single_veh;
class CUP_Vmlauncher_AT13_single_veh;
class CUP_proxy_AT13: CUP_Vmlauncher_AT13_single_veh {
magazineReloadTime = 0.5;
};

class CUP_Vmlauncher_TOW_single_veh;
class CUP_Vmlauncher_TOW_single_veh;
class CUP_proxy_TOW: CUP_Vmlauncher_TOW_single_veh {
magazineReloadTime = 0.5;
};
Expand All @@ -272,7 +272,7 @@ class CfgWeapons {
magazineReloadTime = 0.5;
};

class CUP_Vcannon_M119_veh;
class CUP_Vcannon_M119_veh;
class CUP_proxy_M119: CUP_Vcannon_M119_veh {
magazineReloadTime = 0.5;
};
Expand All @@ -287,4 +287,3 @@ class CfgWeapons {
magazineReloadTime = 0.5;
};
};