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

Add CUP Weapons Compatibility #9599

Merged
merged 9 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from 6 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
1 change: 1 addition & 0 deletions .github/workflows/pboproject.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
xcopy /e /h /q z\ace\tools\pDummies\gm gm\
xcopy /e /h /q z\ace\tools\pDummies\vn vn\
xcopy /e /h /q z\ace\tools\pDummies\WW2 WW2\
xcopy /e /h /q z\ace\tools\pDummies\CUP CUP\
- name: Build
run: py P:\z\ace\tools\make.py ci
env:
Expand Down
1 change: 1 addition & 0 deletions addons/compat_cup_weapons/$PBOPREFIX$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
z\ace\addons\compat_cup_weapons
37 changes: 37 additions & 0 deletions addons/compat_cup_weapons/CfgMagazines.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
class CfgMagazines {
class CA_LauncherMagazine;
class CUP_NLAW_M: CA_LauncherMagazine {
ammo = "ACE_NLAW";
};

// legacy classes from ACE disposable launchers
class CUP_M136_M;
class ACE_PreloadedMissileDummy_CUP: CUP_M136_M {
scope = 1;
scopeArsenal = 0;
};
class CUP_RPG18_M;
class ACE_PreloadedMissileDummy_RPG18_CUP: CUP_RPG18_M {
scope = 1;
scopeArsenal = 0;
};
class CUP_M72A6_M;
class ACE_PreloadedMissileDummy_M72A6_CUP: CUP_M72A6_M {
scope = 1;
scopeArsenal = 0;
};
class ACE_PreloadedMissileDummy_NLAW_CUP: CUP_NLAW_M {
scope = 1;
scopeArsenal = 0;
};
class CUP_Stinger_M;
class ACE_PreloadedMissileDummy_Stinger_CUP: CUP_Stinger_M {
scope = 1;
scopeArsenal = 0;
};
class CUP_Strela_2_M;
class ACE_PreloadedMissileDummy_Strela_2_CUP: CUP_Strela_2_M {
scope = 1;
scopeArsenal = 0;
};
};
36 changes: 36 additions & 0 deletions addons/compat_cup_weapons/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
class CfgWeapons {
class Launcher_Base_F;
class CUP_launch_M47: Launcher_Base_F {
ace_overpressure_angle = 45;
ace_overpressure_range = 8;
ace_overpressure_damage = 0.5;
};

class CUP_launch_MAAWS: Launcher_Base_F {
ace_overpressure_angle = 60;
ace_overpressure_range = 15;
ace_overpressure_damage = 0.7;
};
class CUP_launch_MAAWS_Scope: CUP_launch_MAAWS {};

class CUP_launch_RPG7V: Launcher_Base_F {
ace_overpressure_angle = 45;
ace_overpressure_range = 6;
ace_overpressure_damage = 0.5;
};

class CUP_launch_Mk153Mod0: Launcher_Base_F {
ace_overpressure_angle = 30;
ace_overpressure_range = 15;
ace_overpressure_damage = 0.7;
};
class CUP_launch_Mk153Mod0_SMAWOptics: CUP_launch_Mk153Mod0 {};

class CUP_launch_NLAW_Loaded: Launcher_Base_F {
ace_overpressure_angle = 30;
ace_overpressure_range = 2;
ace_overpressure_damage = 0.5;
ace_nlaw_enabled = 1;
canLock = 1;
};
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
class ace_csw_groups {
class CUP_compats_29Rnd_30mm_AGS30_M {
CUP_29Rnd_30mm_AGS30_M = 1;
};
class CUP_compats_48Rnd_40mm_MK19_M {
CUP_48Rnd_40mm_MK19_M = 1;
};
class CUP_AT13_M {
CUP_6Rnd_AT13_M = 1;
};
class CUP_compats_TOW_M {
CUP_6Rnd_TOW_HMMWV_M = 1;
};
class CUP_compats_TOW2_M {
CUP_6Rnd_TOW2_M = 1;
};
class CUP_compats_PG9_M {
CUP_16Rnd_PG9_AT_M = 1;
};
class CUP_compats_OG9_M {
CUP_16Rnd_OG9_HE_M = 1;
};
class CUP_compats_105mm_he {
CUP_30Rnd_105mmHE_M119_M = 1;
};
class CUP_compats_105mm_smoke {
CUP_30Rnd_105mmSMOKE_M119_M = 1;
};
class CUP_compats_105mm_wp {
CUP_30Rnd_105mmWP_M119_M = 1;
};
class CUP_compats_105mm_laser {
CUP_30Rnd_105mmLASER_M119_M = 1;
};
class CUP_compats_105mm_illum {
CUP_30Rnd_105mmILLUM_M119_M = 1;
};
class CUP_compats_122mm_he {
CUP_30Rnd_122mmHE_D30_M = 1;
};
class CUP_compats_122mm_smoke {
CUP_30Rnd_122mmSMOKE_D30_M = 1;
};
class CUP_compats_122mm_wp {
CUP_30Rnd_122mmHE_D30_M = 1;
};
class CUP_compats_122mm_laser {
CUP_30Rnd_122mmLASER_D30_M = 1;
};
class CUP_compats_122mm_illum {
CUP_30Rnd_122mmILLUM_D30_M = 1;
};
class CUP_compats_122mm_at {
CUP_30Rnd_122mmAT_D30_M = 1;
};
};
111 changes: 111 additions & 0 deletions addons/compat_cup_weapons/compat_cup_weapons_csw/CfgMagazines.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
class CfgMagazines {
class VehicleMagazine;
class CUP_29Rnd_30mm_AGS30_M: VehicleMagazine {
ace_isbelt = 1;
};

class CUP_compats_29Rnd_30mm_AGS30_M: CUP_29Rnd_30mm_AGS30_M {
scope = 2;
type = 256;
count = 29;
mass = 40;
displayName = SUBCSTRING(mag_AGS30_displayName);
model = "\A3\Structures_F_EPB\Items\Military\Ammobox_rounds_F.p3d";
picture = QPATHTOEF(csw,UI\ammoBox_50bmg_ca.paa);
};

class 200Rnd_40mm_G_belt;
class CUP_48Rnd_40mm_MK19_M: 200Rnd_40mm_G_belt {
ace_isbelt = 1;
};

class CUP_compats_48Rnd_40mm_MK19_M: CUP_29Rnd_30mm_AGS30_M {
scope = 2;
type = 256;
count = 48;
mass = 40;
displayname = SUBCSTRING(mag_MK19_displayName);
model = "\A3\Structures_F_EPB\Items\Military\Ammobox_rounds_F.p3d";
picture = QPATHTOEF(csw,UI\ammoBox_50bmg_ca.paa);
};

class CUP_6Rnd_TOW_HMMWV_M;
class CUP_compats_TOW_M: CUP_6Rnd_TOW_HMMWV_M {
scope = 2;
type = 256;
count = 1;
mass = 200;
displayname = SUBCSTRING(mag_TOW_displayName);
model = "\A3\Structures_F_EPB\Items\Military\Ammobox_rounds_F.p3d";
picture = "\A3\Weapons_F_beta\Launchers\titan\Data\UI\gear_titan_missile_at_ca.paa";
};

class CUP_6Rnd_TOW2_M;
class CUP_compats_TOW2_M: CUP_6Rnd_TOW2_M {
scope = 2;
type = 256;
count = 1;
mass = 200;
displayname = SUBCSTRING(mag_TOW2_displayName);
model = "\A3\Structures_F_EPB\Items\Military\Ammobox_rounds_F.p3d";
picture = "\A3\Weapons_F_beta\Launchers\titan\Data\UI\gear_titan_missile_at_ca.paa";
};

class CUP_16Rnd_PG9_AT_M;
class CUP_compats_PG9_M: CUP_16Rnd_PG9_AT_M {
displayName = SUBCSTRING(mag_PG9_displayName);
model = "\A3\Structures_F_EPB\Items\Military\Ammobox_rounds_F.p3d";
scope = 2;
type = 256;
count = 1;
mass = 80;
picture = "\A3\Weapons_F_Exp\Launchers\RPG7\Data\UI\icon_rocket_RPG7_ca.paa";
};

class CUP_16Rnd_OG9_HE_M;
class CUP_compats_OG9_M: CUP_16Rnd_OG9_HE_M {
displayName = SUBCSTRING(mag_OG9_displayName);
model = "\A3\Structures_F_EPB\Items\Military\Ammobox_rounds_F.p3d";
scope = 2;
type = 256;
count = 1;
mass = 80;
picture = "\A3\Weapons_F_Exp\Launchers\RPG7\Data\UI\icon_rocket_RPG7_ca.paa";
};

class ACE_1Rnd_82mm_Mo_HE;
class CUP_compats_105mm_he: ACE_1Rnd_82mm_Mo_HE {
displayName = SUBCSTRING(mag_M1HE_displayName);
mass = 120;
};
class CUP_compats_105mm_smoke: CUP_compats_105mm_he {
displayName = SUBCSTRING(mag_M84Smoke_displayName);
};
class CUP_compats_105mm_wp: CUP_compats_105mm_he {
displayName = SUBCSTRING(mag_M60A2_displayName);
};
class CUP_compats_105mm_laser: CUP_compats_105mm_he {
displayName = SUBCSTRING(mag_M67AT_displayName);
};
class CUP_compats_105mm_illum: CUP_compats_105mm_he {
displayName = SUBCSTRING(mag_M314Illum_displayName);
};
class CUP_compats_122mm_he: CUP_compats_105mm_he {
displayName = SUBCSTRING(mag_3OF56_displayName);
};
class CUP_compats_122mm_laser: CUP_compats_105mm_he {
displayName = SUBCSTRING(mag_3OF69M_displayName);
};
class CUP_compats_122mm_wp: CUP_compats_105mm_he {
displayName = SUBCSTRING(mag_122mmWP_displayName);
};
class CUP_compats_122mm_smoke: CUP_compats_105mm_he {
displayName = SUBCSTRING(mag_122mmSmoke_displayName);
};
class CUP_compats_122mm_illum: CUP_compats_105mm_he {
displayName = SUBCSTRING(mag_122mmIllum_displayName);
};
class CUP_compats_122mm_at: CUP_compats_105mm_he {
displayName = SUBCSTRING(mag_122mmAT_displayName);
};
};
Loading
Loading