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

Removed event handlers

Browse Source
This commit is contained in:
lambdatiger 2024-07-16 21:07:50 -05:00
parent d6adfb717c
commit a6cfcbf697
5 changed files with 15 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/frag/CfgAmmo.hpp
View File

@ -1,22 +1,6 @@
#define BASE_DRAG -0.01
#define HD_MULT 5
#define BASE_DRAG_HD (BASE_DRAG * HD_MULT)
#define ACE_FRAG_INIT_CODE _this call FUNC(initRound)
#define ACE_FRAG_RM_EH class EventHandlers: EventHandlers {\
class ADDON {\
delete init;\
};\
}
#define ACE_FRAG_ADD_EH_BASE class EventHandlers {\
class ADDON {\
init = QUOTE(ACE_FRAG_INIT_CODE);\
};\
}
#define ACE_FRAG_ADD_EH class EventHandlers: EventHandlers {\
class ADDON {\
init = QUOTE(ACE_FRAG_INIT_CODE);\
};\
}
class CfgAmmo {
@ -31,7 +15,7 @@ class CfgAmmo {
typicalSpeed = 800;
maxSpeed = 1500;
deflecting = 65;
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
class GVAR(tiny): GVAR(base) {

46
addons/frag/CfgAmmoBaseEH.hpp
View File

@ -1,38 +1,25 @@
// We need this since autocannons generally inherit from BulletBase
class BulletCore;
class BulletBase: BulletCore {
ACE_FRAG_ADD_EH_BASE;
};
class BulletBase: BulletCore;
class GrenadeCore;
class GrenadeBase: GrenadeCore {
ACE_FRAG_ADD_EH_BASE;
};
class GrenadeBase: GrenadeCore;
class LaserBombCore;
class ammo_Bomb_LaserGuidedBase: LaserBombCore {
ACE_FRAG_ADD_EH_BASE;
};
class ammo_Bomb_LaserGuidedBase: LaserBombCore;
class MissileCore;
class MissileBase: MissileCore {
ACE_FRAG_ADD_EH_BASE;
};
class MissileBase: MissileCore;
class RocketCore;
class RocketBase: RocketCore {
ACE_FRAG_ADD_EH_BASE;
GVAR(skip) = 1;
};
class ArtilleryRocketCore: RocketCore {
ACE_FRAG_ADD_EH_BASE;
};
class ArtilleryRocketCore: RocketCore;
class ShellCore;
class ShellBase: ShellCore {
ACE_FRAG_ADD_EH_BASE;
};
class ShellBase: ShellCore;
class ShotDeployCore;
class ShotDeployBase: ShotDeployCore {
@ -40,32 +27,21 @@ class ShotDeployBase: ShotDeployCore {
};
class ShotgunCore;
class ShotgunBase: ShotgunCore {
ACE_FRAG_ADD_EH_BASE;
};
class ShotgunBase: ShotgunCore;
class SubmunitionCore;
class SubmunitionBase: SubmunitionCore {
ACE_FRAG_ADD_EH_BASE;
GVAR(skip) = 1;
};
class BoundingMineCore;
class BoundingMineBase: BoundingMineCore {
ACE_FRAG_ADD_EH_BASE;
};
class BoundingMineBase: BoundingMineCore;
class PipeBombCore;
class PipeBombBase: PipeBombCore {
ACE_FRAG_ADD_EH_BASE;
};
class PipeBombBase: PipeBombCore;
class DirectionalBombCore;
class DirectionalBombBase: DirectionalBombCore {
ACE_FRAG_ADD_EH_BASE;
};
class DirectionalBombBase: DirectionalBombCore;
class MineCore;
class MineBase: MineCore {
ACE_FRAG_ADD_EH_BASE;
};
class MineBase: MineCore;

25
addons/frag/CfgAmmoFragParameters.hpp
View File

@ -111,7 +111,6 @@ class B_40mm_GPR: B_30mm_HE {
GVAR(gurney_k) = "1/2";
};
class UnderwaterMine_Range_Ammo: MineBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
@ -158,7 +157,6 @@ class ammo_Bomb_SmallDiameterBase: ammo_Bomb_LaserGuidedBase {
class BombCore;
class Bo_Mk82: BombCore {
ACE_FRAG_ADD_EH_BASE;
GVAR(classes)[] = {QGVAR(large), QGVAR(large), QGVAR(large_HD), QGVAR(large), QGVAR(huge), QGVAR(huge_HD), QGVAR(huge)};
GVAR(fragCount) = 17500;
GVAR(metal) = 140000;
@ -198,7 +196,6 @@ class Mo_cluster_Bomb_03_F: Mo_cluster_Bomb_01_F { // idk, @lambda.tiger on the
// ~~~~ Grenades:
class Grenade;
class GrenadeHand: Grenade {
ACE_FRAG_ADD_EH_BASE;
GVAR(skip) = 0;
GVAR(force) = 1;
/*
@ -219,11 +216,9 @@ class mini_Grenade: GrenadeHand {
GVAR(charge) = 36;
};
class GrenadeHand_stone: GrenadeHand {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
class SmokeShell: GrenadeHand {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
class G_40mm_HE: GrenadeBase {
@ -264,7 +259,6 @@ class ACE_G_40mm_HE: G_40mm_HE {
class EventHandlers: EventHandlers {};
};
class ACE_G_40mm_Practice: ACE_G_40mm_HE {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
GVAR(force) = 0;
EGVAR(vehicle_damage,incendiary) = 0;
@ -272,7 +266,6 @@ class ACE_G_40mm_Practice: ACE_G_40mm_HE {
// ~~~~ Mines & UXO
class ATMine_Range_Ammo: MineBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
@ -304,7 +297,6 @@ class TrainingMine_Ammo: APERSMine_Range_Ammo {
};
class SLAMDirectionalMine_Wire_Ammo: DirectionalBombBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
@ -377,26 +369,20 @@ class UXO2_Ammo_Base_F: UXO1_Ammo_Base_F {
};
class APERSMineDispenser_Mine_Ammo: APERSMine_Range_Ammo {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
class UXO_deploy_base_f: SubmunitionBase {
ACE_FRAG_RM_EH;
};
class UXO_deploy_base_f: SubmunitionBase;
class ClaymoreDirectionalMine_Remote_Ammo: DirectionalBombBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
class SatchelCharge_Remote_Ammo: PipeBombBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
class DemoCharge_Remote_Ammo: PipeBombBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
@ -409,7 +395,6 @@ class BombDemine_01_Ammo_F: BombCore {
};
class BombDemine_01_SubAmmo_F: ShellBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
@ -426,11 +411,9 @@ class R_PG7_F: RocketBase {
};
class R_PG32V_F: RocketBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
class R_TBG32V_F: R_PG32V_F { // Thermobaric
ACE_FRAG_ADD_EH;
GVAR(skip) = 0;
GVAR(fragCount) = 200;
GVAR(metal) = 400;
@ -635,7 +618,6 @@ class ammo_missile_cruise_01: ammo_Missile_CruiseBase {
GVAR(gurney_k) = "3/5";
};
class ammo_Missile_Cruise_01_Cluster: ammo_missile_cruise_01 {
ACE_FRAG_RM_EH;
};
class ammo_Missile_AntiRadiationBase: MissileBase {
@ -777,7 +759,6 @@ class M_127mm_Firefist_AT: RocketBase { // HOT missile
};
class M_NLAW_AT_F: MissileBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
@ -873,7 +854,6 @@ class ammo_Penetrator_Base: ShellBase {
// ~~~~ Special
class ProbingBeam_01_F: BulletBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
@ -894,16 +874,13 @@ class FuelExplosion: Default {
};
class HelicopterExploSmall: ShellBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
class LightningBolt: ShellBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};
class M_Mo_82mm_AT: MissileBase {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
};

2
addons/frag/CfgAmmoFragSpawner.hpp
View File

@ -37,7 +37,7 @@ class GVAR(DOUBLES(TRIPLES(random,size,count),top)): GVAR(spawnbase) {\
}
class GVAR(spawnbase): B_65x39_Caseless {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
deleteParentWhenTriggered = 1;
explosionEffects = "";
submunitionConeType[] = {"random", 25};

2
addons/frag/CfgAmmoSpall.hpp
View File

@ -1,5 +1,5 @@
class GVAR(spallBase): B_65x39_Caseless {
ACE_FRAG_RM_EH;
GVAR(skip) = 1;
submunitionAmmo[] = {QGVAR(small),4,QGVAR(medium),3,QGVAR(large),2,QGVAR(huge),1};
submunitionConeType[] = {"random", 20};
submunitionConeAngle = 40;