17th-Ranger-Battalion-ORG/MissionTemplate
6
0
Fork 0
Code Issues 1 Pull Requests Actions Projects 1 Releases 16 Wiki Activity

Merge pull request 'add exclusion whitelist for known vehicle models w/out flag proxies' (#3) from bug/update-flag-exclusions into main

Browse Source 
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/3
This commit was merged in pull request #3.
This commit is contained in:
hizumi
2024-01-08 15:02:21 -06:00
parent 85e9af6a73 c912e730ac
commit 1f1552bd53
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
functions/client/fn_initVehicleFlags.sqf
View File

@@ -85,6 +85,16 @@ private _appliedParentClasses = [
"Helicopter" "Helicopter"
]; ];
private _modelsWithoutFlagProxies = [
"TF373_SOAR_MH47G_Base", // MH-47G Chinook
"RHS_MELB_base", // MELB AH-6M/MH-6M/H-6M Little Bird
"USAF_C17", // C17 Globemaster III
"USAF_C130J", // C130J Super Hercules
"USAF_AC130U", // AC130 Spooky II
"ej_UH60M_base", // UH-60M Black Hawk + DAP variants
"rhsusf_fmtv_base" // M1083A1P2 variants + SOV SOCOM variants
];
{ {
private _parentClass = _x; private _parentClass = _x;
[_parentClass, "InitPost", { [_parentClass, "InitPost", {
@@ -94,7 +104,22 @@ private _appliedParentClasses = [
"Set Vehicle Flag", // displayed title "Set Vehicle Flag", // displayed title
"\A3\ui_f\data\map\markers\flags\nato_ca.paa", // flag icon "\A3\ui_f\data\map\markers\flags\nato_ca.paa", // flag icon
{true}, // statement {true}, // statement
{true}, // condition {
params ["_target", "_player", "_params"];
private _modelsWithoutFlagProxies = _params select 1;
// check if hierarchy includes any of the models without flag proxies
private _excluded = false;
{
if (_excluded) exitWith {false};
_excluded = _target isKindOf _x;
} forEach _modelsWithoutFlagProxies;
if (_excluded) exitWith {false};
// check if vehicle is alive
alive _target;
}, // condition
{ {
params ["_target", "_player", "_params"]; params ["_target", "_player", "_params"];
private _flagActionID = _params#0; private _flagActionID = _params#0;
@@ -155,7 +180,7 @@ private _appliedParentClasses = [
_actions; _actions;
}, // child code }, // child code
[_flagActionID], // params [_flagActionID, _modelsWithoutFlagProxies], // params
nil, // position nil, // position
4, // distance 4, // distance
[false, false, false, false, false], // other params [false, false, false, false, false], // other params
@@ -180,7 +205,10 @@ private _appliedParentClasses = [
params ["_target", "_player", "_params"]; params ["_target", "_player", "_params"];
_target forceFlagTexture ""; _target forceFlagTexture "";
}, // statement }, // statement
{true}, // condition {
params ["_target", "_player", "_params"];
alive _target && getForcedFlagTexture _target != "";
}, // condition
nil // child code nil // child code
] call ace_interact_menu_fnc_createAction; ] call ace_interact_menu_fnc_createAction;