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

Fixed all inhertance issues

Browse Source
This commit is contained in:
lambdatiger 2024-01-12 22:21:56 -06:00
parent 6257dd3ee2
commit 735d04e248
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/frag/CfgAmmo.hpp
View File

@ -18,7 +18,8 @@
} }
class CfgAmmo { class CfgAmmo {
class B_65x39_Caseless; // break EventHandlers inheritance on purpose to get it out of the frag & spall types
class B_65x39_Caseless;
class GVAR(base): B_65x39_Caseless { class GVAR(base): B_65x39_Caseless {
ACE_damageType = "grenade"; // compatibility with medical_damage, shrapnel should produce grenade wounds ACE_damageType = "grenade"; // compatibility with medical_damage, shrapnel should produce grenade wounds

12
addons/frag/cfgAmmoFragParameters.hpp
View File

@ -178,9 +178,10 @@ class SmokeShell: GrenadeHand {
GVAR(skip) = 1; GVAR(skip) = 1;
}; };
class G_40mm_HE: GrenadeBase { class G_40mm_HE: GrenadeBase {
class EventHandlers: EventHandlers;
// Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M441 // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M441
GVAR(force) = 1; GVAR(skip) = 1;
GVAR(force) = 0;
GVAR(classes)[] = {QGVAR(small)}; GVAR(classes)[] = {QGVAR(small)};
GVAR(fragCount) = 800; // guess based on probability hit of 1% GVAR(fragCount) = 800; // guess based on probability hit of 1%
GVAR(metal) = 200; GVAR(metal) = 200;
@ -189,6 +190,7 @@ class G_40mm_HE: GrenadeBase {
GVAR(gurney_k) = "3/5"; // interior fragmenter/charge is a sphere GVAR(gurney_k) = "3/5"; // interior fragmenter/charge is a sphere
}; };
class G_40mm_HEDP: G_40mm_HE { class G_40mm_HEDP: G_40mm_HE {
class EventHandlers: EventHandlers;
// Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M433 // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M433
GVAR(classes)[] = {QGVAR(small_HD)}; GVAR(classes)[] = {QGVAR(small_HD)};
GVAR(fragCount) = 270; // seems to have greater framentation ability, but lower range per source GVAR(fragCount) = 270; // seems to have greater framentation ability, but lower range per source
@ -198,9 +200,11 @@ class G_40mm_HEDP: G_40mm_HE {
GVAR(gurney_k) = "1/2"; GVAR(gurney_k) = "1/2";
}; };
class ACE_G_40mm_HEDP: G_40mm_HEDP {}; class ACE_G_40mm_HEDP: G_40mm_HEDP {
class EventHandlers: EventHandlers;
};
class ACE_G_40mm_HE: G_40mm_HE { class ACE_G_40mm_HE: G_40mm_HE {
class EventHandlers; class EventHandlers: EventHandlers;
}; };
class ACE_G_40mm_Practice: ACE_G_40mm_HE { class ACE_G_40mm_Practice: ACE_G_40mm_HE {
ACE_FRAG_RM_EH; ACE_FRAG_RM_EH;