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

develop #24

Merged
hizumi merged 13 commits from develop into main 2024-02-08 19:05:41 -06:00
Conversation 0 Commits 13 Files Changed 35 +20 -9
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 442cb0b0b2 - Show all commits

1
framework/init/functions/fn_initClient.sqf
View File

@@ -24,7 +24,6 @@ EGVAR(common,diaryRecords) = createHashMap;
// initialize other modules // initialize other modules
call EFUNC(mapcopy,initClient); call EFUNC(mapcopy,initClient);
call EFUNC(rasptools,initClient);
call EFUNC(reinsert,initClient); call EFUNC(reinsert,initClient);
call EFUNC(resupply,initClient); call EFUNC(resupply,initClient);
call EFUNC(triageIcons,initClient); call EFUNC(triageIcons,initClient);

5
framework/resupply/functions/fn_addArsenalObjectSpawnBoxActions.sqf
View File

@@ -44,13 +44,16 @@ private _supplyCrateTypesCfgs = _supplyCratesCfg call BIS_fnc_returnChildren;
configName _supplyCrateCfg, configName _supplyCrateCfg,
getPos _target getPos _target
] call FUNC(createBox); ] call FUNC(createBox);
// log action use in server RPT // log action use in server RPT
private _supplyCrateDisplayName = (_supplyCrateCfg >> "displayName") call BIS_fnc_getCfgData;
[ [
LEVEL_INFO, LEVEL_INFO,
QUOTE(COMPONENT), QUOTE(COMPONENT),
"Supply crate spawned", "Supply crate spawned",
[player, [ [player, [
["supplyCrateType", _supplyCrateDisplayName], ["supplyCrateDisplayName", _supplyCrateDisplayName],
["supplyCrateCfgName", configName _supplyCrateCfg],
["position", getPos _target] ["position", getPos _target]
]] call EFUNC(common,addPlayerInfoToArray) ]] call EFUNC(common,addPlayerInfoToArray)
] remoteExec [QEFUNC(common,log), 2]; ] remoteExec [QEFUNC(common,log), 2];

4
framework/vehicleFlags/functions/fn_initClient.sqf
View File

@@ -1,7 +1,7 @@
if (!hasInterface) exitWith {};
#include "..\script_component.hpp" #include "..\script_component.hpp"
if (!hasInterface) exitWith {};
private _vehicleFlagsCfg = call FUNC(getVehicleFlagsCfg); private _vehicleFlagsCfg = call FUNC(getVehicleFlagsCfg);
if (!isClass _vehicleFlagsCfg) exitWith { if (!isClass _vehicleFlagsCfg) exitWith {

19
framework/vehicleFlags/functions/fn_isClassExcluded.sqf
View File

@@ -6,21 +6,30 @@
Parameter(s): Parameter(s):
0: STRING - Classname of the vehicle to check 0: STRING - Classname of the vehicle to check
*/ */
#include "..\script_component.hpp"
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
params [["_className", "", [""]]]; params [["_className", "", [""]]];
if (_className == "") exitWith {false}; if (_className == "") exitWith {false};
private _vehicleFlagsCfg = call milsim_vehicleFlags_fnc_getVehicleFlagsCfg; private _vehicleFlagsCfg = call FUNC(getVehicleFlagsCfg);
private _excludedVehiclesClass = (_vehicleFlagsCfg >> "ExcludedVehicles"); private _excludedVehiclesClass = (_vehicleFlagsCfg >> "ExcludedVehicles");
private _exclusionGroups = configProperties [_vehicleFlagsCfg >> "ExcludedVehicles"]; private _exclusionGroups = configProperties [_vehicleFlagsCfg >> "ExcludedVehicles"];
private _isExcluded = false;
{ {
// Check if the class doesn't have a flag proxy // Check if the class is directly excluded
private _excludedClasses = _x call BIS_fnc_getCfgDataArray; private _excludedClasses = _x call BIS_fnc_getCfgDataArray;
if (_className in _excludedClasses) exitWith {true}; if (_className in _excludedClasses) exitWith {
_isExcluded = true;
};
{
if (_className isKindOf _x) exitWith {
_isExcluded = true;
};
} forEach _excludedClasses;
if (_isExcluded) exitWith {};
} forEach _exclusionGroups; } forEach _exclusionGroups;
false; _isExcluded;