Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

GM Compat - Fix inheritance issues (#8546)

Browse Source
This commit is contained in:
Björn Dahlgren 2021-10-17 22:15:27 +02:00 committed by GitHub
parent 3daa510868
commit e1185def3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
optionals/compat_gm/CfgAmmo.hpp
View File

@ -7,19 +7,19 @@ class CfgAmmo {
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class MineBase;
class gm_mine_at_mn111: MineBase {
class gm_mine_at_base;
class gm_mine_at_mn111: gm_mine_at_base {
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class gm_mine_at_dm21: MineBase {
class gm_mine_at_dm21: gm_mine_at_base {
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class gm_mine_at_tm46: MineBase {
class gm_mine_at_tm46: gm_mine_at_base {
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
class APERSMine_Range_Ammo;
class gm_mine_ap_dm31: APERSMine_Range_Ammo {
class gm_mine_bounce_base;
class gm_mine_ap_dm31: gm_mine_bounce_base {
EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02};
};
};

32
optionals/compat_gm/CfgMagazines.hpp
View File

@ -1,6 +1,4 @@
class cfgMagazines {
class CA_Magazine;
// MG3
class gm_120rnd_762x51mm_mg3_grn;
class gm_120Rnd_762x51mm_B_T_DM21_mg3_grn: gm_120rnd_762x51mm_mg3_grn {
@ -14,14 +12,13 @@ class cfgMagazines {
};
// PK
class gm_100rnd_762x54mm_pk_grn;
class gm_100Rnd_762x54mm_API_b32_pk_grn: gm_100rnd_762x54mm_pk_grn {
ACE_isBelt = 1;
};
class gm_100Rnd_762x54mm_B_T_t46_pk_grn: gm_100rnd_762x54mm_pk_grn {
ACE_isBelt = 1;
};
class gm_100rnd_762x54mmR_pk_grn;
class gm_100Rnd_762x54mm_API_b32_pk_grn: gm_100rnd_762x54mmR_pk_grn {
ACE_isBelt = 1;
};
class gm_100Rnd_762x54mm_B_T_t46_pk_grn: gm_100rnd_762x54mmR_pk_grn {
ACE_isBelt = 1;
};
class gm_100Rnd_762x54mmR_API_7bz3_pk_grn: gm_100rnd_762x54mmR_pk_grn {
ACE_isBelt = 1;
};
@ -30,7 +27,8 @@ class cfgMagazines {
};
// Explosives
class gm_explosive_petn_charge: CA_Magazine {
class gm_explosive_petn_charge_base;
class gm_explosive_petn_charge: gm_explosive_petn_charge_base {
EGVAR(explosive,DelayTime) = 1;
EGVAR(explosive,Placeable) = 1;
EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_petn";
@ -48,12 +46,13 @@ class cfgMagazines {
};
};
class gm_explosive_plnp_charge: gm_explosive_petn_charge {
class gm_explosive_plnp_charge_base;
class gm_explosive_plnp_charge: gm_explosive_plnp_charge_base {
EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_plnp";
};
class ATMine_Range_Mag;
class gm_mine_at_tm46: ATMine_Range_Mag {
class gm_mine_at_base;
class gm_mine_at_tm46: gm_mine_at_base {
EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_mine_tm46";
useAction = 0;
class ACE_Triggers {
@ -63,7 +62,7 @@ class cfgMagazines {
};
};
};
class gm_mine_at_dm21: ATMine_Range_Mag {
class gm_mine_at_dm21: gm_mine_at_base {
EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_dm21";
useAction = 0;
class ACE_Triggers {
@ -73,7 +72,7 @@ class cfgMagazines {
};
};
};
class gm_mine_at_mn111: ATMine_Range_Mag {
class gm_mine_at_mn111: gm_mine_at_base {
EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_m111";
useAction = 0;
class ACE_Triggers {
@ -84,8 +83,7 @@ class cfgMagazines {
};
};
// class ATMine_Range_Mag;
class gm_mine_ap_dm31: ATMine_Range_Mag {
class gm_mine_ap_dm31: gm_mine_at_base {
EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_gm_explosive_dm31";
useAction = 0;
class ACE_Triggers {

10
optionals/compat_gm/CfgVehicles.hpp
View File

@ -214,17 +214,19 @@ class CfgVehicles {
EGVAR(medical,medicClass) = 1;
};
class gm_kat1_base;
class gm_kat1_451_base: gm_kat1_base {
class gm_kat1_base: gm_wheeled_truck_base {
EGVAR(refuel,fuelCapacity) = 270;
};
class gm_kat1_451_base;
class gm_kat1_451_refuel_base: gm_kat1_451_base {
gm_InsigniasDefaultHazardSign = "gm_insignia_hazard_fuelF54_wht";
EGVAR(refuel,fuelCargo) = 4600;
EGVAR(refuel,hooks)[] = {{-0.60,-3.44,-0.919689},{0.60,-3.44,-0.919689}};
};
class gm_kat1_454_cargo_base: gm_kat1_451_base {
class gm_kat1_454_base;
class gm_kat1_454_cargo_base: gm_kat1_454_base {
EGVAR(cargo,space) = 10;
};
@ -280,7 +282,7 @@ class CfgVehicles {
EGVAR(cookoff,cookoffSelections)[] = {"mainturret_hatch","commanderturret_hatch"};
};
class gm_pt76_base: gm_tracked_APC_base {
class gm_pt76_base: gm_tracked_Tank_base {
EGVAR(refuel,fuelCapacity) = 250;
};

36
optionals/compat_gm/CfgWeapons.hpp
View File

@ -73,52 +73,54 @@ class CfgWeapons {
class gm_gc_headgear_zsh3_orn: gm_gc_headgear_zsh3_base {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_base;
class gm_ge_headgear_beret_crew_red_antiair: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_bdx;
class gm_ge_headgear_beret_crew_blk;
class gm_ge_headgear_beret_crew_grn;
class gm_ge_headgear_beret_crew_red;
class gm_ge_headgear_beret_crew_red_antiair: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_blk_antitank: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_blk_antitank: gm_ge_headgear_beret_crew_blk {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_blk_armor: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_blk_armor: gm_ge_headgear_beret_crew_blk {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_blk_armorrecon: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_blk_armorrecon: gm_ge_headgear_beret_crew_blk {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_red_artillery: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_red_artillery: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_red_engineer: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_red_engineer: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_red_maintenance: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_red_maintenance: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_grn_mechinf: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_grn_mechinf: gm_ge_headgear_beret_crew_grn {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_red_militarypolice: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_red_militarypolice: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_red_nbc: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_red_nbc: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_red_opcom: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_red_opcom: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_bdx_paratrooper: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_bdx_paratrooper: gm_ge_headgear_beret_crew_bdx {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_blk_recon: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_blk_recon: gm_ge_headgear_beret_crew_blk {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_red_supply: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_red_supply: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR
};
class gm_ge_headgear_beret_crew_red_signals: gm_ge_headgear_beret_base {
class gm_ge_headgear_beret_crew_red_signals: gm_ge_headgear_beret_crew_red {
HEARING_PROTECTION_PELTOR
};
};