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

Compat RHS - Fix explosives compat (#9571)

Browse Source 
* fix RHS explosives

* fix clipboard

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Add dev script to test explosive mags

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
This commit is contained in:
Grim 2023-10-24 00:55:06 -04:00 committed by GitHub
parent 0372447650
commit e5c3470f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/compat_rhs_saf3/compat_rhs_saf3_explosives/config.cpp
View File

@ -20,3 +20,4 @@ class CfgPatches {
#include "CfgAmmo.hpp" #include "CfgAmmo.hpp"
#include "CfgMagazines.hpp" #include "CfgMagazines.hpp"
#include "CfgVehicles.hpp"

10
addons/compat_rhs_usf3/compat_rhs_usf3_explosives/CfgMagazines.hpp
View File

@ -24,7 +24,7 @@ class CfgMagazines {
class ATMine_Range_Mag; class ATMine_Range_Mag;
class rhs_mine_M19_mag: ATMine_Range_Mag { class rhs_mine_M19_mag: ATMine_Range_Mag {
EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhsusf_explosive_mine_M19); EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhsusf_mine_M19);
class ACE_Triggers { class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"}; SupportedTriggers[] = {"PressurePlate"};
class PressurePlate { class PressurePlate {
@ -34,7 +34,7 @@ class CfgMagazines {
}; };
class rhsusf_mine_m14_mag: ATMine_Range_Mag { class rhsusf_mine_m14_mag: ATMine_Range_Mag {
EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhsusf_explosive_mine_m14); EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhsusf_mine_m14);
class ACE_Triggers { class ACE_Triggers {
SupportedTriggers[] = {"PressurePlate"}; SupportedTriggers[] = {"PressurePlate"};
class PressurePlate { class PressurePlate {
@ -44,7 +44,7 @@ class CfgMagazines {
}; };
class rhsusf_mine_m49a1_3m_mag: ATMine_Range_Mag { class rhsusf_mine_m49a1_3m_mag: ATMine_Range_Mag {
EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhsusf_explosive_mine_m49a1_3m); EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhsusf_mine_m49a1_3m);
class ACE_Triggers { class ACE_Triggers {
SupportedTriggers[] = {"Tripwire"}; SupportedTriggers[] = {"Tripwire"};
class Tripwire { class Tripwire {
@ -54,10 +54,10 @@ class CfgMagazines {
}; };
class rhsusf_mine_m49a1_6m_mag: rhsusf_mine_m49a1_3m_mag { class rhsusf_mine_m49a1_6m_mag: rhsusf_mine_m49a1_3m_mag {
EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhsusf_explosive_mine_m49a1_6m); EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhsusf_mine_m49a1_6m);
}; };
class rhsusf_mine_m49a1_10m_mag: rhsusf_mine_m49a1_3m_mag { class rhsusf_mine_m49a1_10m_mag: rhsusf_mine_m49a1_3m_mag {
EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhsusf_explosive_mine_m49a1_10m); EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhsusf_mine_m49a1_10m);
}; };
}; };

24
addons/explosives/dev/test_magazines.sqf Normal file
View File

@ -0,0 +1,24 @@
#include "..\script_component.hpp"
// call compileScript ["z\ace\addons\explosives\dev\test_magazines.sqf"];
INFO("--- Checking Explosive Mags ---");
private _explosivesMags = compatibleMagazines "Put";
private _setupHash = createHashMap;
{
private _mag = _x;
private _cfg = configFile >> "CfgMagazines" >> _mag;
private _scope = getNumber (_cfg >> "scope");
private _setupObject = getText (_cfg >> QGVAR(SetupObject));
if (_setupObject == "") then {
WARNING_2("[%1](scope %2) has no setupObject",_mag,_scope);
continue
};
if (!isClass (configFile >> "CfgVehicles" >> _setupObject)) then {
ERROR_2("[%1](scope %2) has invalid setup object",_mag,_scope);
};
if ((((_setupHash getOrDefault [_setupObject, [], true]) pushBack _mag) > 0)) then {
INFO_2("[%1] setupObject has multiple mags %2",_setupObject,_setupHash get _setupObject);
};
} forEach _explosivesMags;