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

Jump to bottom

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

Merged
merged 3 commits into from
Aug 11, 2019
Merged

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

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
96be1b0
Advanced Throwing - Call muzzle EH and fix RHS inheritance
PabstMirror Mar 18, 2019
e52cd29
Merge branch 'master' into throwMuzzleEH
PabstMirror Aug 11, 2019
8aabd05
UBC for rhs
PabstMirror Aug 11, 2019
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
5 changes: 5 additions & 0 deletions addons/advanced_throwing/functions/fnc_throwFiredXEH.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@ TRACE_1("Fired",_this);
{
_this call _x;
} 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]);
20 changes: 3 additions & 17 deletions optionals/compat_rhs_afrf3/CfgAmmo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,25 +153,11 @@ class CfgAmmo {
ace_frag_skip = 0;
ace_frag_force = 1;
};
class rhs_ammo_rgn_base: 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";
class rhs_ammo_rgn: rhs_ammo_rgd5 {
ace_frag_enabled = 0;
ace_frag_skip = 1;
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 {
ace_frag_enabled = 0;
ace_frag_skip = 1;
Expand Down Expand Up @@ -205,7 +191,7 @@ class CfgAmmo {
ace_frag_skip = 1;
ace_frag_force = 0;
};

class G_40mm_HE;
class rhs_g_vog25: G_40mm_HE {};
class rhs_g_vg40tb: rhs_g_vog25 { //Thermobaric
Expand All @@ -220,5 +206,5 @@ class CfgAmmo {
class rhs_g_vg40md_white: rhs_g_vog25 { //Smoke
ace_frag_force = 0;
};

};
6 changes: 3 additions & 3 deletions optionals/compat_rhs_afrf3/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

class CfgWeapons {

class NVGoggles;
class rhs_1PN138: NVGoggles { // Monocular
modelOptics = "";
EGVAR(nightvision,border) = QPATHTOEF(nightvision,data\nvg_mask_4096.paa);
EGVAR(nightvision,bluRadius) = 0.13;
};

class hgun_Rook40_F;
class rhs_weap_pya: hgun_Rook40_F {
ACE_barrelTwist = 254.0;
Expand Down Expand Up @@ -86,7 +86,7 @@ class CfgWeapons {
ACE_ScopeAdjust_VerticalIncrement = 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_ScopeAdjust_Vertical[] = {0, 0};
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
Expand Down
2 changes: 1 addition & 1 deletion optionals/compat_rhs_usf3/CfgMagazines.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_Placeable = 1;
ace_explosives_SetupObject = "ACE_Explosives_Place_rhsusf_m112x4_DemoCharge";
Expand Down