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.

Sign up for GitHub

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

Compats - Add and Fix ace vehicle damage ERA and SLAT arrays #9925

Merged
merged 3 commits into from
Apr 10, 2024
Merged

Compats - Add and Fix ace vehicle damage ERA and SLAT arrays #9925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6585a7
added missing hitpoints and new classes
lambdatiger Apr 5, 2024
986c526
added CUP compats
lambdatiger Apr 5, 2024
5b2609f
Fixed missing base class and missing comma
lambdatiger Apr 5, 2024
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
136 changes: 136 additions & 0 deletions addons/compat_cup_vehicles/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,141 @@ class CfgVehicles {
roles[]={"cargo"};
};
};
EGVAR(vehicle_damage,eraHitpoints)[] = {
"hitera_l1", "hitera_l2", "hitera_l3", "hitera_l4", "hitera_l5",
"hitera_l6", "hitera_l7", "hitera_l8", "hitera_r1", "hitera_r2",
"hitera_r3", "hitera_r4", "hitera_r5", "hitera_r6", "hitera_r7",
"hitera_r8", "hitera_t1", "hitera_t2", "hitera_t3", "hitera_t4",
"hitera_t5", "hitera_t6", "hitera_t7", "hitera_t8", "hitera_fr1",
"hitera_fr2", "hitera_fr3", "hitera_fr4", "hitera_fr5", "hitera_fr6",
"hitera_fr7", "hitera_fr8", "hitera_fr9", "hitera_fl1", "hitera_fl2",
"hitera_fl3", "hitera_fl4", "hitera_fl5"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {};
};
class CUP_T90_Base: Tank_F {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"hitera_l1", "hitera_l2", "hitera_l3", "hitera_r1", "hitera_r2",
"hitera_r3", "hitera_1_t_l", "hitera_1_t_r", "hitera_2_t_l",
"hitera_2_t_r"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {};
};
class CUP_T90M_Base: Tank_F {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"hitera_t1", "hitera_t2", "hitera_t3", "hitera_t4", "hitera_t5",
"hitera_t6", "hitera_t7", "hitera_t8", "hitera_t9", "hitera_t10",
"hitera_t11", "hitera_t12", "hitera_t13", "hitera_t14", "hitera_t15",
"hitera_t16", "hitera_t17", "hitera_t18", "hitera_t19", "hitera_t20",
"hitera_t21", "hitera_f1", "hitera_f2", "hitera_f3", "hitera_f4",
"hitera_f5", "hitera_f6", "hitera_f7", "hitera_s1", "hitera_s2",
"hitera_s3", "hitera_s4", "hitera_s5", "hitera_s6", "hitera_s7",
"hitera_s8", "hitera_s9", "hitera_s10", "hitera_s11", "hitera_s12",
"hitera_t22", "hitera_t23", "hitera_t24", "hitera_t25", "hitera_t26",
"hitera_t27", "hitera_t28", "hitera_t29", "hitera_t30", "hitera_t31",
"hitera_t32", "hitera_t33"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {
"hitslat_left", "hitslat_right", "hitslat_turret_rear",
"hitslat_turret_left", "hitslat_rear"
};
};

class CUP_T72_ACR_Base;
class CUP_B_T72_CZ: CUP_T72_ACR_Base {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"hitera_top_l1", "hitera_top_l2", "hitera_top_l3", "hitera_top_l4",
"hitera_top_r1", "hitera_top_r2", "hitera_top_r3", "hitera_top_r4",
"hitera_front_r1", "hitera_front_r2", "hitera_front_l1",
"hitera_front_l2", "hitera_top_rear"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {};
};

class CUP_Leopard2_Base;
class CUP_Leopard2_ERA_Base: CUP_Leopard2_Base {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"hitera_1", "hitera_2", "hitera_3", "hitera_4", "hitera_5", "hitera_6",
"hitera_7", "hitera_8", "hitera_9", "hitera_10", "hitera_11", "hitera_12",
"hitera_13", "hitera_14", "hitera_15", "hitera_16", "hitera_17", "hitera_18",
"hitera_19", "hitera_20", "hitera_21", "hitera_22", "hitera_23", "hitera_24",
"hitera_25", "hitera_26", "hitera_27", "hitera_28", "hitera_29", "hitera_30",
"hitera_31", "hitera_32", "hitera_33", "hitera_34", "hitera_35", "hitera_36",
"hitera_37", "hitera_38", "hitera_39", "hitera_40", "hitera_41", "hitera_42",
"hitera_43", "hitera_44", "hitera_45", "hitera_46", "hitera_47"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {};
};

class CUP_M1_Abrams_base;
class CUP_M1A2_TUSK_base: CUP_M1_Abrams_base {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"hitera_l1", "hitera_l2", "hitera_l3", "hitera_l4", "hitera_r1",
"hitera_r2", "hitera_r3", "hitera_r4"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {
"hitslat_rear"
};
};

class CUP_M1Abrams_Base;
class CUP_M1Abrams_TUSK_Base: CUP_M1Abrams_Base {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"hitera_l01", "hitera_l02", "hitera_l03", "hitera_l04", "hitera_l05",
"hitera_l06", "hitera_l07", "hitera_l08", "hitera_l09", "hitera_l10",
"hitera_l11", "hitera_l12", "hitera_l13", "hitera_l14", "hitera_l15",
"hitera_l16", "hitera_r01", "hitera_r02", "hitera_r03", "hitera_r04",
"hitera_r05", "hitera_r06", "hitera_r07", "hitera_r08", "hitera_r09",
"hitera_r10", "hitera_r11", "hitera_r12", "hitera_r13", "hitera_r14",
"hitera_r15", "hitera_r16"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {
"hitslat_rear"
};
};

class CUP_M1Abrams_A2_Base;
class CUP_M1Abrams_A2_TUSK_Base: CUP_M1Abrams_A2_Base {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"hitera_l01", "hitera_l02", "hitera_l03", "hitera_l04", "hitera_l05",
"hitera_l06", "hitera_l07", "hitera_l08", "hitera_l09", "hitera_l10",
"hitera_l11", "hitera_l12", "hitera_l13", "hitera_l14", "hitera_l15",
"hitera_l16", "hitera_l17", "hitera_l18", "hitera_l19", "hitera_l20",
"hitera_r01", "hitera_r02", "hitera_r03", "hitera_r04", "hitera_r05",
"hitera_r06", "hitera_r07", "hitera_r08", "hitera_r09", "hitera_r10",
"hitera_r11", "hitera_r12", "hitera_r13", "hitera_r14", "hitera_r15",
"hitera_r16", "hitera_r17", "hitera_r18", "hitera_r19", "hitera_r20"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {
"hitslat_rear"
};
};

class CUP_M1A2Abrams_Base;
class CUP_M1A2Abrams_TUSK_Base: CUP_M1A2Abrams_Base {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"hitera_l01", "hitera_l02", "hitera_l03", "hitera_l04", "hitera_l05",
"hitera_l06", "hitera_l07", "hitera_l08", "hitera_l09", "hitera_l10",
"hitera_l11", "hitera_l12", "hitera_l13", "hitera_l14", "hitera_l15",
"hitera_l16", "hitera_r01", "hitera_r02", "hitera_r03", "hitera_r04",
"hitera_r05", "hitera_r06", "hitera_r07", "hitera_r08", "hitera_r09",
"hitera_r10", "hitera_r11", "hitera_r12", "hitera_r13", "hitera_r14",
"hitera_r15", "hitera_r16"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {
"hitslat_rear"
};
};
class CUP_M1A2Abrams_TUSK_II_Base: CUP_M1A2Abrams_TUSK_Base {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"hitera_l01", "hitera_l02", "hitera_l03", "hitera_l04", "hitera_l05",
"hitera_l06", "hitera_l07", "hitera_l08", "hitera_l09", "hitera_l10",
"hitera_l11", "hitera_l12", "hitera_l13", "hitera_l14", "hitera_l15",
"hitera_l16", "hitera_l17", "hitera_l18", "hitera_l19", "hitera_l20",
"hitera_r01", "hitera_r02", "hitera_r03", "hitera_r04", "hitera_r05",
"hitera_r06", "hitera_r07", "hitera_r08", "hitera_r09", "hitera_r10",
"hitera_r11", "hitera_r12", "hitera_r13", "hitera_r14", "hitera_r15",
"hitera_r16", "hitera_r17", "hitera_r18", "hitera_r19", "hitera_r20"
};
};
};
67 changes: 62 additions & 5 deletions addons/compat_rhs_afrf3/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,11 @@ class CfgVehicles {
"era_13_hitpoint", "era_14_hitpoint", "era_15_hitpoint", "era_16_hitpoint", "era_17_hitpoint", "era_18_hitpoint",
"era_19_hitpoint", "era_20_hitpoint", "era_21_hitpoint", "era_22_hitpoint", "era_23_hitpoint", "era_24_hitpoint",
"era_25_hitpoint", "era_26_hitpoint", "era_27_hitpoint", "era_28_hitpoint", "era_29_hitpoint", "era_30_hitpoint",
"era_31_hitpoint", "era_32_hitpoint"
"era_31_hitpoint", "era_32_hitpoint", "era_33_hitpoint", "era_34_hitpoint", "era_35_hitpoint", "era_36_hitpoint",
"era_37_hitpoint", "era_38_hitpoint", "era_39_hitpoint", "era_40_hitpoint", "era_41_hitpoint", "era_42_hitpoint",
"era_43_hitpoint", "era_44_hitpoint", "era_45_hitpoint", "era_46_hitpoint", "era_47_hitpoint", "era_48_hitpoint",
"era_49_hitpoint", "era_50_hitpoint", "era_58_hitpoint", "era_59_hitpoint", "era_60_hitpoint", "era_61_hitpoint",
"era_62_hitpoint", "era_63_hitpoint", "era_64_hitpoint", "era_65_hitpoint", "era_66_hitpoint", "era_67_hitpoint"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {
"SLAT_51_hitpoint", "SLAT_52_hitpoint", "SLAT_53_hitpoint",
Expand Down Expand Up @@ -470,6 +474,9 @@ class CfgVehicles {
"era_43_hitpoint", "era_44_hitpoint", "era_45_hitpoint", "era_46_hitpoint", "era_47_hitpoint", "era_48_hitpoint",
"era_49_hitpoint", "era_50_hitpoint"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {
"slat_51_hitpoint", "slat_52_hitpoint", "slat_53_hitpoint", "slat_54_hitpoint"
};
};
class rhs_t90am_tv: rhs_t90_tv {
EGVAR(vehicle_damage,eraHitpoints)[] = {
Expand All @@ -483,7 +490,7 @@ class CfgVehicles {
"era_43_hitpoint", "era_44_hitpoint", "era_45_hitpoint", "era_46_hitpoint", "era_47_hitpoint", "era_48_hitpoint",
"era_49_hitpoint", "era_50_hitpoint", "era_51_hitpoint", "era_52_hitpoint", "era_53_hitpoint", "era_54_hitpoint",
"era_55_hitpoint", "era_56_hitpoint", "era_57_hitpoint", "era_58_hitpoint", "era_59_hitpoint", "era_60_hitpoint",
"era_51_hitpoint", "era_62_hitpoint", "era_63_hitpoint", "era_64_hitpoint", "era_65_hitpoint", "era_66_hitpoint"
"era_61_hitpoint", "era_62_hitpoint", "era_63_hitpoint", "era_64_hitpoint", "era_65_hitpoint", "era_66_hitpoint"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {
"SLAT_18_hitpoint", "SLAT_19_hitpoint", "SLAT_20_hitpoint", "SLAT_21_hitpoint",
Expand All @@ -492,10 +499,31 @@ class CfgVehicles {
};
};
class rhs_t90sm_tv: rhs_t90am_tv {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint",
"era_5_hitpoint", "era_6_hitpoint", "era_7_hitpoint", "era_8_hitpoint",
"era_9_hitpoint", "era_10_hitpoint", "era_11_hitpoint", "era_12_hitpoint",
"era_13_hitpoint", "era_14_hitpoint", "era_15_hitpoint", "era_16_hitpoint",
"era_17_hitpoint", "era_18_hitpoint", "era_19_hitpoint", "era_20_hitpoint",
"era_21_hitpoint", "era_22_hitpoint", "era_24_hitpoint", "era_25_hitpoint",
"era_27_hitpoint", "era_28_hitpoint", "era_29_hitpoint", "era_30_hitpoint",
"era_31_hitpoint", "era_32_hitpoint", "era_33_hitpoint", "era_34_hitpoint",
"era_35_hitpoint", "era_36_hitpoint", "era_37_hitpoint", "era_38_hitpoint",
"era_39_hitpoint", "era_40_hitpoint", "era_41_hitpoint", "era_42_hitpoint",
"era_43_hitpoint", "era_44_hitpoint", "era_45_hitpoint", "era_46_hitpoint",
"era_47_hitpoint", "era_48_hitpoint", "era_49_hitpoint", "era_50_hitpoint",
"era_26_hitpoint", "era_55_hitpoint", "era_56_hitpoint", "era_57_hitpoint",
"era_58_hitpoint", "era_59_hitpoint", "era_60_hitpoint", "era_61_hitpoint",
"era_62_hitpoint", "era_63_hitpoint", "era_64_hitpoint", "era_65_hitpoint",
"era_66_hitpoint", "era_23_hitpoint"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {
"SLAT_23_hitpoint", "SLAT_26_hitpoint", "SLAT_51_hitpoint", "SLAT_52_hitpoint",
"SLAT_53_hitpoint", "SLAT_54_hitpoint", "SLAT_55_hitpoint", "SLAT_56_hitpoint",
"SLAT_57_hitpoint"
"slat_23_hitpoint", "slat_26_hitpoint", "slat_51_hitpoint",
"slat_52_hitpoint", "slat_53_hitpoint", "slat_54_hitpoint",
"slat_55_hitpoint", "slat_56_hitpoint", "slat_57_hitpoint",
"slat_18_hitpoint", "slat_19_hitpoint", "slat_20_hitpoint",
"slat_21_hitpoint", "slat_22_hitpoint", "slat_24_hitpoint",
"slat_25_hitpoint"
};
};

Expand Down Expand Up @@ -539,6 +567,35 @@ class CfgVehicles {
"era_31_hitpoint", "era_32_hitpoint", "era_33_hitpoint", "era_34_hitpoint", "era_35_hitpoint", "era_36_hitpoint"
};
};
class rhs_t80um: rhs_t80u {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint", "era_5_hitpoint", "era_6_hitpoint",
"era_7_hitpoint", "era_8_hitpoint", "era_9_hitpoint", "era_10_hitpoint", "era_11_hitpoint", "era_12_hitpoint",
"era_13_hitpoint", "era_14_hitpoint", "era_15_hitpoint", "era_16_hitpoint", "era_17_hitpoint", "era_18_hitpoint",
"era_19_hitpoint", "era_20_hitpoint", "era_21_hitpoint", "era_22_hitpoint", "era_23_hitpoint", "era_24_hitpoint",
"era_25_hitpoint", "era_26_hitpoint", "era_27_hitpoint", "era_28_hitpoint", "era_29_hitpoint", "era_30_hitpoint",
"era_31_hitpoint", "era_32_hitpoint", "era_33_hitpoint", "era_34_hitpoint", "era_35_hitpoint", "era_36_hitpoint"
};
};

class rhs_t15_base;
class rhs_t15_tv: rhs_t15_base {
EGVAR(vehicle_damage,eraHitpoints)[] = {
"era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint",
"era_5_hitpoint", "era_6_hitpoint", "era_7_hitpoint", "era_8_hitpoint",
"era_9_hitpoint", "era_10_hitpoint", "era_11_hitpoint", "era_12_hitpoint",
"era_13_hitpoint", "era_14_hitpoint", "era_15_hitpoint", "era_16_hitpoint",
"era_17_hitpoint", "era_18_hitpoint", "era_19_hitpoint", "era_20_hitpoint",
"era_21_hitpoint", "era_22_hitpoint", "era_23_hitpoint", "era_24_hitpoint",
"era_25_hitpoint", "era_26_hitpoint", "era_27_hitpoint", "era_28_hitpoint",
"era_29_hitpoint", "era_30_hitpoint", "era_31_hitpoint", "era_32_hitpoint",
"era_33_hitpoint", "era_34_hitpoint", "era_35_hitpoint", "era_36_hitpoint",
"era_37_hitpoint"
};
EGVAR(vehicle_damage,slatHitpoints)[] = {
"slat_38_hitpoint", "slat_39_hitpoint", "slat_40_hitpoint", "slat_41_hitpoint"
};
};

// Wirecutter Backpacks
class rhs_assault_umbts;
Expand Down