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

Spearhead 1944 Compatibility #9292

Merged
merged 38 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
bf5587d
compat(spe): initial
BrettMayson Jul 9, 2023
311df13
--changed csw/turrets
Coldfront15 Jul 26, 2023
879d347
disable spe disassemble
BrettMayson Jul 26, 2023
132114c
csw: all mortars done
BrettMayson Jul 26, 2023
f59cf2f
more cleanup
BrettMayson Jul 26, 2023
a5dc50b
add missing hearing protection
BrettMayson Jul 26, 2023
288f822
final cleanup
BrettMayson Jul 26, 2023
d9b5ce0
goofed and removed too much
BrettMayson Jul 26, 2023
3525937
ok all done
BrettMayson Jul 26, 2023
f45bb2d
formatting
BrettMayson Jul 26, 2023
cdf4148
remove adt
BrettMayson Jul 26, 2023
38cf3f6
Merge branch 'compat_spe' of https://github.com/BrettMayson/ace-priva…
Coldfront15 Jul 27, 2023
b2aa8ca
-+ updated frameworks
Coldfront15 Jul 29, 2023
bce1936
formatting
Aug 2, 2023
5ec151e
Require HEMTT v1.7.2
jonpas Aug 11, 2023
9bf7535
cleanup tabs / formating
PabstMirror Aug 17, 2023
0cfbf1e
Apply suggestions from code review
BrettMayson Aug 24, 2023
2709a7a
Merge branch 'master' into pr/9292
PabstMirror Sep 3, 2023
9b69fa2
split to subcomponents, fix ubcs
PabstMirror Sep 3, 2023
b680a20
Merge branch 'master' into pr/9292
PabstMirror Sep 5, 2023
a42ec09
swap has_include for skipWhenMissingDependencies
PabstMirror Sep 5, 2023
96b557d
fix explosives
PabstMirror Sep 5, 2023
347fdfb
add pdumies for ww2
PabstMirror Sep 5, 2023
ce7d40b
Apply suggestions from code review
jonpas Sep 7, 2023
3be80db
cleanup sten duplicate configs
PabstMirror Sep 12, 2023
08aa02b
Merge branch 'compat_spe' of https://github.com/BrettMayson/ACE3 into…
PabstMirror Sep 12, 2023
deb919d
Merge branch 'master' into pr/9292
PabstMirror Sep 12, 2023
4aa0cb1
move hearing to macro
PabstMirror Sep 12, 2023
b03f00a
fix macro repaclement
PabstMirror Sep 12, 2023
a1c84ba
Use `SUBADDON`
PabstMirror Sep 12, 2023
5dcd22a
Move `addonRootClass` to bottom of CfgPatches
jonpas Sep 12, 2023
819d5b3
Merge branch 'master' into compat_spe
jonpas Sep 12, 2023
2cbff44
Relative includes
jonpas Sep 12, 2023
f9fa4d0
move config macro includes to config.cpp
PabstMirror Sep 12, 2023
b235b0f
Merge branch 'compat_spe' of https://github.com/BrettMayson/ACE3 into…
PabstMirror Sep 12, 2023
8b610b1
Merge branch 'master' into pr/9292
PabstMirror Sep 25, 2023
1d31246
comment off csw changes for now
PabstMirror Sep 25, 2023
98cad41
Update .hemtt/project.toml
PabstMirror Sep 25, 2023
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
13 changes: 12 additions & 1 deletion .hemtt/project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,16 @@ preset = "Hemtt"

[hemtt.launch]
workshop = [
"450814997", # CBA_A3's Workshop ID
"450814997", # CBA_A3
]

[hemtt.launch.spe]
workshop = [
"450814997", # CBA_A3
]
optionals = [
"compat_spe"
]
PabstMirror marked this conversation as resolved.
Show resolved Hide resolved
dlc = [
"spe"
]
1 change: 1 addition & 0 deletions optionals/compat_spe/$PBOPREFIX$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
z\ace\addons\compat_spe
50 changes: 50 additions & 0 deletions optionals/compat_spe/ACE_CSW_Groups.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
class ACE_CSW_Groups {

// --- Gun Turrets -------------------------------------------------------------

class SPE_100Rnd_762x63 {
SPE_100Rnd_762x63 = 1;
};

class SPE_100Rnd_762x63_M1 {
SPE_100Rnd_762x63_M1 = 1;
};

class SPE_100Rnd_762x63_M2_AP {
SPE_100Rnd_762x63_M2_AP = 1;
};

class SPE_100Rnd_792x57 {
SPE_100Rnd_792x57 = 1;
};

class SPE_100Rnd_792x57_sS {
SPE_100Rnd_792x57_sS = 1;
};

class SPE_100Rnd_792x57_SMK {
SPE_100Rnd_792x57_SMK = 1;
};

// --- Mortars -------------------------------------------------------------

class SPE_1Rnd_81mmHE_M1_M43A1 {
SPE_1Rnd_81mmHE_M1_M43A1 = 1;
};
class SPE_1Rnd_81mmWP_M1_M57 {
SPE_1Rnd_81mmWP_M1_M57 = 1;
};
class SPE_81mm_M1_M57_SmokeShell {
SPE_81mm_M1_M57_SmokeShell = 1;
};

class SPE_1Rnd_81mm_FA_Mle_1932_HE {
SPE_1Rnd_81mm_FA_Mle_1932_HE = 1;
};
class SPE_81mm_FA_Mle_1932_Smoke {
SPE_81mm_FA_Mle_1932_Smoke = 1;
};
class SPE_81mm_FA_Mle_1932_Illu {
SPE_81mm_FA_Mle_1932_Illu = 1;
};
};
15 changes: 15 additions & 0 deletions optionals/compat_spe/ACE_Medical_Injuries.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
class ACE_Medical_Injuries {
class damageTypes {
class woundHandlers;

class explosive {
class woundHandlers: woundHandlers {};
};
class GVAR(explosive_incendiary): explosive {
class woundHandlers: woundHandlers {
// TODO use function name after bug with the woundHandlers config caching is fixed
ADDON = QUOTE({call FUNC(woundsHandlerIncendiary)});
};
};
};
};
6 changes: 6 additions & 0 deletions optionals/compat_spe/CfgAmmo.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class CfgAmmo {
#include "CfgAmmo\bombs.hpp"
#include "CfgAmmo\explosives.hpp"
#include "CfgAmmo\grenades.hpp"
#include "CfgAmmo\melee.hpp"
};
46 changes: 46 additions & 0 deletions optionals/compat_spe/CfgAmmo/bombs.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
class SPE_Bomb_base;
class SPE_NC250_Bomb: SPE_Bomb_base {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 166000;
EGVAR(frag,charge) = 130000;
EGVAR(frag,gurney_c) = 2750;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"};
};
class SPE_NC50_Bomb: SPE_Bomb_base {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 25000;
EGVAR(frag,charge) = 24400;
EGVAR(frag,gurney_c) = 2750;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large"};
};
class SPE_SC500_Bomb: SPE_Bomb_base {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 200000;
EGVAR(frag,charge) = 275000;
EGVAR(frag,gurney_c) = 2750;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"};
};
class SPE_US_500lb_Bomb: SPE_Bomb_base {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 100000;
EGVAR(frag,charge) = 124000;
EGVAR(frag,gurney_c) = 2700;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"};
};
class SPE_US_1000lb_Bomb: SPE_Bomb_base {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 200000;
EGVAR(frag,charge) = 158000;
EGVAR(frag,gurney_c) = 2700;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"};
};
231 changes: 231 additions & 0 deletions optionals/compat_spe/CfgAmmo/explosives.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
class ShellBase;
class SubmunitionBase;
class MineCore;
class PipeBombBase;
class SPE_MAIN_pipebomb: PipeBombBase {};
class SPE_ShellHE_base: ShellBase {};
class SPE_ShellHEAT_base: ShellBase {};
class RocketBase;
class SPE_MAIN_mine: MineCore {};
class SPE_Rocket_base: RocketBase {};
class SPE_PzFaust_30m: SPE_Rocket_base {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 150;
EGVAR(frag,charge) = 400;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_small"};
};
class SPE_60mm_M6: SPE_Rocket_base {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 250;
EGVAR(frag,charge) = 400;
EGVAR(frag,gurney_c) = 2750;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_small"};
};
class SPE_Sh_M43A1_81_HE: SubmunitionBase {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 1200;
EGVAR(frag,charge) = 600;
EGVAR(frag,gurney_c) = 2750;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
};
class SPE_M48_HE: SPE_ShellHE_base {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 1250;
EGVAR(frag,charge) = 670;
EGVAR(frag,gurney_c) = 2750;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
};
class SPE_M101_M1_HE: SPE_ShellHE_base {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 2500;
EGVAR(frag,charge) = 1980;
EGVAR(frag,gurney_c) = 2750;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large"};
};
class SPE_S_105L28_Gr38: SPE_ShellHE_base {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 2500;
EGVAR(frag,charge) = 1500;
EGVAR(frag,gurney_c) = 2750;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large"};
};
class SPE_S_105L28_Gr39HlC: SPE_ShellHEAT_base {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 2500;
EGVAR(frag,charge) = 1500;
EGVAR(frag,gurney_c) = 2750;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large"};
};
class SPE_R_280mm_WkSpr: SubmunitionBase {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 37000;
EGVAR(frag,charge) = 50000;
EGVAR(frag,gurney_c) = 2750;
EGVAR(frag,gurney_k) = "1/2";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large","ACE_frag_huge"};
};
class SPE_US_Bangalore_ammo: SPE_MAIN_pipebomb {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 1700;
EGVAR(frag,charge) = 4100;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_Ladung_Big_ammo: SPE_MAIN_pipebomb {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 500;
EGVAR(frag,charge) = 1500;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_Ladung_Small_ammo: SPE_MAIN_pipebomb {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 250;
EGVAR(frag,charge) = 750;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_US_M1A1_ATMINE_ammo: SPE_MAIN_mine {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 2100;
EGVAR(frag,charge) = 2700;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_US_TNT_half_pound_ammo: SPE_MAIN_pipebomb {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 100;
EGVAR(frag,charge) = 226;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_US_TNT_4pound_ammo: SPE_MAIN_pipebomb {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 372;
EGVAR(frag,charge) = 1814;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_US_M3_PRessure_ammo: SPE_MAIN_mine {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 2267;
EGVAR(frag,charge) = 454;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_US_M3_ammo: SPE_MAIN_mine {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 2267;
EGVAR(frag,charge) = 454;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_shumine42_ammo: SPE_MAIN_mine {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 300;
EGVAR(frag,charge) = 200;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_Shg24x7_Improvised_Mine_ammo: SPE_MAIN_mine {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 525;
EGVAR(frag,charge) = 1330;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_small_HD"};
};
class SPE_SMI35_Pressure_ammo: SPE_MAIN_mine {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 2720;
EGVAR(frag,charge) = 182;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_SMI35_1_ammo: SPE_MAIN_mine {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 2720;
EGVAR(frag,charge) = 182;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_SMI35_ammo: SPE_MAIN_mine {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 2720;
EGVAR(frag,charge) = 182;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_STMI_ammo: SPE_MAIN_mine {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 1520;
EGVAR(frag,charge) = 152;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class SPE_TMI42_ammo: SPE_MAIN_mine {
EGVAR(frag,enabled) = 1;
EGVAR(frag,force) = 1;
EGVAR(frag,metal) = 2520;
EGVAR(frag,charge) = 5400;
EGVAR(frag,gurney_c) = 2440;
EGVAR(frag,gurney_k) = "3/5";
EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
Loading