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

Advanced Throwing - Call muzzle EH and fix RHS inheritance (Compat with RHS 0.4.9) (#6879)

Browse Source 
* Advanced Throwing - Call muzzle EH and fix RHS inheritance

* UBC for rhs
This commit is contained in:
PabstMirror 2019-08-11 17:59:05 -05:00 committed by GitHub
parent ebb1ef628f
commit 9ffca544a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/advanced_throwing/functions/fnc_throwFiredXEH.sqf
View File

@ -26,3 +26,8 @@ TRACE_1("Fired",_this);
{ {
_this call _x; _this call _x;
} forEach ((_this select 0) getVariable "cba_xeh_fired"); } forEach ((_this select 0) getVariable "cba_xeh_fired");
// Call muzzle fired EH
{
_this call compile getText (_x >> "fired");
} forEach (configProperties [configFile >> "CfgWeapons" >> "Throw" >> (_this select 2) >> "EventHandlers", "isClass _x", true]);

16
optionals/compat_rhs_afrf3/CfgAmmo.hpp
View File

@ -153,25 +153,11 @@ class CfgAmmo {
ace_frag_skip = 0; ace_frag_skip = 0;
ace_frag_force = 1; ace_frag_force = 1;
}; };
class rhs_ammo_rgn_base: rhs_ammo_rgd5 { class rhs_ammo_rgn: rhs_ammo_rgd5 {
ace_frag_enabled = 1;
ace_frag_metal = 193;
ace_frag_charge = 97;
ace_frag_gurney_c = 2800;
ace_frag_gurney_k = "3/5";
ace_frag_classes[] = {"ACE_frag_tiny_HD"};
ace_frag_skip = 0;
ace_frag_force = 1;
};
class rhs_ammo_rgn: rhs_ammo_rgn_base {
// RGN is scripted grenade that deletes itself, which will break advanced throwing, replace with it's base
ace_advanced_throwing_replaceWith = "rhs_ammo_rgn_base";
ace_frag_enabled = 0; ace_frag_enabled = 0;
ace_frag_skip = 1; ace_frag_skip = 1;
ace_frag_force = 0; ace_frag_force = 0;
}; };
class rhs_ammo_rgn_sub: rhs_ammo_rgn_base {};
class rhs_ammo_rgn_exp: rhs_ammo_rgn_base {};
class rhs_ammo_fakel: GrenadeHand { class rhs_ammo_fakel: GrenadeHand {
ace_frag_enabled = 0; ace_frag_enabled = 0;
ace_frag_skip = 1; ace_frag_skip = 1;

2
optionals/compat_rhs_afrf3/CfgWeapons.hpp
View File

@ -85,7 +85,7 @@ class CfgWeapons {
ACE_ScopeAdjust_VerticalIncrement = 0.5; ACE_ScopeAdjust_VerticalIncrement = 0.5;
ACE_ScopeAdjust_HorizontalIncrement = 0.5; ACE_ScopeAdjust_HorizontalIncrement = 0.5;
}; };
class rhs_acc_pso1m21: rhs_acc_sniper_base { class rhs_acc_pso1m21: rhs_acc_pso1m2 {
ACE_ScopeHeightAboveRail = 7.75566; ACE_ScopeHeightAboveRail = 7.75566;
ACE_ScopeAdjust_Vertical[] = {0, 0}; ACE_ScopeAdjust_Vertical[] = {0, 0};
ACE_ScopeAdjust_Horizontal[] = {-10, 10}; ACE_ScopeAdjust_Horizontal[] = {-10, 10};

2
optionals/compat_rhs_usf3/CfgMagazines.hpp
View File

@ -69,7 +69,7 @@ class cfgMagazines {
}; };
}; };
class rhsusf_m112x4_mag: CA_Magazine { class rhsusf_m112x4_mag: rhsusf_m112_mag {
ace_explosives_DelayTime = 1; ace_explosives_DelayTime = 1;
ace_explosives_Placeable = 1; ace_explosives_Placeable = 1;
ace_explosives_SetupObject = "ACE_Explosives_Place_rhsusf_m112x4_DemoCharge"; ace_explosives_SetupObject = "ACE_Explosives_Place_rhsusf_m112x4_DemoCharge";