Skip to content

Commit

Permalink
SPE Compat - Add CSW support (acemod#10285)
Browse files Browse the repository at this point in the history
Co-authored-by: PabstMirror <[email protected]>
  • Loading branch information
johnb432 and PabstMirror authored Sep 17, 2024
1 parent 038dce8 commit af6f969
Show file tree
Hide file tree
Showing 25 changed files with 869 additions and 221 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class CfgWeapons {
class assembleTo {
ace_csw_m3Tripod = "CUP_I_M2StaticMG_AAF";
ace_csw_m3TripodLow = "CUP_I_M2StaticMG_MiniTripod_AAF";
EGVAR(compat_spe,m3Tripod) = "CUP_I_M2StaticMG_MiniTripod_AAF";
};
};
class WeaponSlotsInfo: WeaponSlotsInfo {
Expand Down
1 change: 1 addition & 0 deletions addons/compat_rhs_usf3/compat_rhs_usf3_csw/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class CfgWeapons {
class assembleTo {
EGVAR(csw,m3Tripod) = "RHS_M2StaticMG_WD";
EGVAR(csw,m3TripodLow) = "RHS_M2StaticMG_MiniTripod_WD";
EGVAR(compat_spe,m3Tripod) = "RHS_M2StaticMG_MiniTripod_WD";
};
};
class WeaponSlotsInfo: WeaponSlotsInfo {
Expand Down
50 changes: 0 additions & 50 deletions addons/compat_spe/compat_spe_csw/ACE_CSW_Groups.hpp

This file was deleted.

94 changes: 94 additions & 0 deletions addons/compat_spe/compat_spe_csw/CfgMagazineGroups.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
class EGVAR(csw,groups) {
// --- Gun Turrets -------------------------------------------------------------
class SPE_50Rnd_762x63 {
SPE_50Rnd_762x63 = 1;
};
class SPE_100Rnd_762x63 {
SPE_100Rnd_762x63 = 1;
};

class SPE_50Rnd_762x63_M1 {
SPE_50Rnd_762x63_M1 = 1;
};
class SPE_100Rnd_762x63_M1 {
SPE_100Rnd_762x63_M1 = 1;
};

class SPE_50Rnd_762x63_M2_AP {
SPE_50Rnd_762x63_M2_AP = 1;
};
class SPE_100Rnd_762x63_M2_AP {
SPE_100Rnd_762x63_M2_AP = 1;
};

class SPE_50Rnd_762x63_Tracer {
SPE_50Rnd_762x63_Tracer = 1;
};
class SPE_100Rnd_762x63_Tracer {
SPE_100Rnd_762x63_Tracer = 1;
};

class SPE_50Rnd_792x57 {
SPE_50Rnd_792x57 = 1;
};
class SPE_100Rnd_792x57 {
SPE_100Rnd_792x57 = 1;
SPE_250Rnd_792x57 = 1;
};

class SPE_50Rnd_792x57_sS {
SPE_50Rnd_792x57_sS = 1;
};
class SPE_100Rnd_792x57_sS {
SPE_100Rnd_792x57_sS = 1;
SPE_250Rnd_792x57_sS = 1;
};

class SPE_50Rnd_792x57_SMK {
SPE_50Rnd_792x57_SMK = 1;
};
class SPE_100Rnd_792x57_SMK {
SPE_100Rnd_792x57_SMK = 1;
SPE_250Rnd_792x57_SMK = 1;
};

class SPE_50Rnd_792x57_Tracer {
SPE_50Rnd_792x57_Tracer = 1;
};
class SPE_100Rnd_792x57_Tracer {
SPE_100Rnd_792x57_Tracer = 1;
};

// Makes it compatible with other mods' .50 BMG
class EGVAR(csw,100Rnd_127x99_mag) {
SPE_100Rnd_127x99_M2 = 1;
};
class SPE_100Rnd_127x99_M2: EGVAR(csw,100Rnd_127x99_mag) {};

// --- Mortars -------------------------------------------------------------
class SPE_1Rnd_81mmHE_M1_M43A1 {
SPE_8Rnd_81mmHE_M1_M43A1 = 1;
SPE_1Rnd_81mmHE_M1_M43A1 = 1;
};
class SPE_1Rnd_81mmWP_M1_M57 {
SPE_8Rnd_81mmWP_M1_M57 = 1;
SPE_1Rnd_81mmWP_M1_M57 = 1;
};
class SPE_81mm_M1_M57_SmokeShell {
SPE_8rnd_81mm_M1_M57_SmokeShell = 1;
SPE_81mm_M1_M57_SmokeShell = 1;
};

class SPE_1Rnd_81mm_FA_Mle_1932_HE {
SPE_8Rnd_81mm_FA_Mle_1932_HE = 1;
SPE_1Rnd_81mm_FA_Mle_1932_HE = 1;
};
class SPE_81mm_FA_Mle_1932_Smoke {
SPE_8Rnd_81mm_FA_Mle_1932_Smoke = 1;
SPE_81mm_FA_Mle_1932_Smoke = 1;
};
class SPE_81mm_FA_Mle_1932_Illu {
SPE_8Rnd_81mm_FA_Mle_1932_Illu = 1;
SPE_81mm_FA_Mle_1932_Illu = 1;
};
};
26 changes: 26 additions & 0 deletions addons/compat_spe/compat_spe_csw/CfgMagazines.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// In SPE 1.1.1, the tracer magazines don't have proper names
class CfgMagazines {
class SPE_50Rnd_762x63;
class SPE_50Rnd_762x63_Tracer: SPE_50Rnd_762x63 {
displayName = SUBCSTRING(50Rnd_762x63_Tracer);
displayNameShort = "$STR_A3_tracer_dns";
};

class SPE_100Rnd_762x63;
class SPE_100Rnd_762x63_Tracer: SPE_100Rnd_762x63 {
displayName = SUBCSTRING(100Rnd_762x63_Tracer);
displayNameShort = "$STR_A3_tracer_dns";
};

class SPE_50Rnd_792x57;
class SPE_50Rnd_792x57_Tracer: SPE_50Rnd_792x57 {
displayName = SUBCSTRING(50Rnd_792x57_Tracer);
displayNameShort = "$STR_A3_tracer_dns";
};

class SPE_100Rnd_792x57;
class SPE_100Rnd_792x57_Tracer: SPE_100Rnd_792x57 {
displayName = SUBCSTRING(100Rnd_792x57_Tracer);
displayNameShort = "$STR_A3_tracer_dns";
};
};
Loading

0 comments on commit af6f969

Please sign in to comment.