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

synced events implemented into litter.

Browse Source
This commit is contained in:
jaynus 2015-04-17 19:33:07 -07:00
parent 93d03b404f
commit 32df4a2adc
4 changed files with 127 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/medical/XEH_postInit.sqf
View File

@ -265,3 +265,7 @@ if (USE_WOUND_EVENT_SYNC) then {
["playerInventoryChanged", {
[ACE_player] call FUNC(itemCheck);
}] call EFUNC(common,addEventHandler);
// Synchronized litter creation
[QGVAR(createLitter), FUNC(_handleCreateLitter)] call EFUNC(common,addEventHandler);

5
addons/medical/XEH_preInit.sqf
View File

@ -21,7 +21,6 @@ PREP(adjustPainLevel);
PREP(canAccessMedicalEquipment);
PREP(canTreat);
PREP(canTreatCached);
PREP(createLitter);
PREP(determineIfFatal);
PREP(getBloodLoss);
PREP(getBloodPressure);
@ -98,6 +97,10 @@ PREP(moduleTreatmentConfiguration);
PREP(copyDeadBody);
PREP(requestWoundSync);
// Litter handling functionality test
PREP(createLitter);
PREP(_handleCreateLitter);
GVAR(injuredUnitCollection) = [];
GVAR(IVBags) = [];

115
addons/medical/functions/fnc__handleCreateLitter.sqf Normal file
View File

@ -0,0 +1,115 @@
/*
* Author: Glowbal
* Spawns litter for the treatment action on the ground around the target
*
* Arguments:
* 0: The target <OBJECT>
* 1: The treatment classname <STRING>
*
* Return Value:
*
*
* Public: No
*/
#include "script_component.hpp"
#define MIN_ENTRIES_LITTER_CONFIG 3
if(hasInterface) then {
private ["_config", "_litter", "_createLitter", "_litterObject", "_position", "_createdLitter"];
PARAMS_6(_caller,_target,_selectionName,_className,_usersOfItems);
_caller = _this select 0;
_target = _this select 1;
_selectionName = _this select 2;
_className = _this select 3;
_usersOfItems = _this select 5;
if !(GVAR(allowLitterCreation)) exitwith {};
if (vehicle _caller != _caller || vehicle _target != _target) exitwith {};
_config = (configFile >> "ACE_Medical_Actions" >> "Basic" >> _className);
if (GVAR(level) >= 2) then {
_config = (configFile >> "ACE_Medical_Actions" >> "Advanced" >> _className);
};
if !(isClass _config) exitwith {false};
if !(isArray (_config >> "litter")) exitwith {};
_litter = getArray (_config >> "litter");
_createLitter = {
_position = getPos (_this select 0);
_litterClass = _this select 1;
_litterObject = createVehicle [_litterClass, _position, [], 0, "NONE"];
if (random(1) >= 0.5) then {
_litterObject setPos [(_position select 0) + random 2, (_position select 1) + random 2, _position select 2];
} else {
_litterObject setPos [(_position select 0) - random 2, (_position select 1) - random 2, _position select 2];
};
_litterObject setDir (random 360);
_litterObject;
};
if (isnil QGVAR(allCreatedLitter)) then {
GVAR(allCreatedLitter) = [];
GVAR(litterPFHRunning) = false;
};
_createdLitter = [];
{
if (typeName _x == "ARRAY") then {
if (count _x < MIN_ENTRIES_LITTER_CONFIG) exitwith {};
private ["_selection", "_litterCondition", "_litterOptions"];
_selection = _x select 0;
if (toLower _selection in [toLower _selectionName, "all"]) then { // in is case sensitve. We can be forgiving here, so lets use toLower.
_litterCondition = _x select 1;
_litterOptions = _x select 2;
if (isnil _litterCondition) then {
_litterCondition = if (_litterCondition != "") then {compile _litterCondition} else {{true}};
} else {
_litterCondition = missionNamespace getvariable _litterCondition;
};
if !([_caller, _target, _selectionName, _className, _usersOfItems] call _litterCondition) exitwith {};
if (typeName _litterOptions == "ARRAY") then {
// Loop through through the litter options and place the litter
{
if (typeName _x == "ARRAY" && {(count _x > 0)}) then {
_createdLitter pushback ([_target, _x select (floor(random(count _x)))] call _createLitter);
};
if (typeName _x == "STRING") then {
_createdLitter pushback ([_target, _x] call _createLitter);
};
}foreach _litterOptions;
};
};
};
}foreach _litter;
if (GVAR(litterCleanUpDelay) >= 0) then {
GVAR(allCreatedLitter) pushback [time, GVAR(litterCleanUpDelay), _createdLitter];
};
if !(GVAR(litterPFHRunning)) then {
GVAR(litterPFHRunning) = true;
[{
{
if (time - (_x select 0) >= (_x select 1)) then {
{
deleteVehicle _x;
}foreach (_this select 2);
GVAR(allCreatedLitter) set[_foreachIndex, objNull];
};
}foreach GVAR(allCreatedLitter);
GVAR(allCreatedLitter) = GVAR(allCreatedLitter) - [objNull];
if (count GVAR(allCreatedLitter) == 0) exitwith {
GVAR(litterPFHRunning) = false;
[_this select 1] call CBA_fnc_removePerFrameHandler;
};
}, 30, []] call CBA_fnc_addPerFrameHandler;
};
};

103
addons/medical/functions/fnc_createLitter.sqf
View File

@ -1,10 +1,8 @@
/*
* Author: Glowbal
* Spawns litter for the treatment action on the ground around the target
* Author: jaynus
*
* Arguments:
* 0: The target <OBJECT>
* 1: The treatment classname <STRING>
*
*
* Return Value:
*
@ -14,98 +12,5 @@
#include "script_component.hpp"
#define MIN_ENTRIES_LITTER_CONFIG 3
private ["_target", "_className", "_config", "_litter", "_createLitter", "_litterObject", "_position", "_createdLitter"];
_caller = _this select 0;
_target = _this select 1;
_selectionName = _this select 2;
_className = _this select 3;
_usersOfItems = _this select 5;
if !(GVAR(allowLitterCreation)) exitwith {};
if (vehicle _caller != _caller || vehicle _target != _target) exitwith {};
_config = (configFile >> "ACE_Medical_Actions" >> "Basic" >> _className);
if (GVAR(level) >= 2) then {
_config = (configFile >> "ACE_Medical_Actions" >> "Advanced" >> _className);
};
if !(isClass _config) exitwith {false};
if !(isArray (_config >> "litter")) exitwith {};
_litter = getArray (_config >> "litter");
_createLitter = {
_position = getPos (_this select 0);
_litterClass = _this select 1;
_litterObject = createVehicle [_litterClass, _position, [], 0, "NONE"];
if (random(1) >= 0.5) then {
_litterObject setPos [(_position select 0) + random 2, (_position select 1) + random 2, _position select 2];
} else {
_litterObject setPos [(_position select 0) - random 2, (_position select 1) - random 2, _position select 2];
};
_litterObject setDir (random 360);
_litterObject;
};
if (isnil QGVAR(allCreatedLitter)) then {
GVAR(allCreatedLitter) = [];
GVAR(litterPFHRunning) = false;
};
_createdLitter = [];
{
if (typeName _x == "ARRAY") then {
if (count _x < MIN_ENTRIES_LITTER_CONFIG) exitwith {};
private ["_selection", "_litterCondition", "_litterOptions"];
_selection = _x select 0;
if (toLower _selection in [toLower _selectionName, "all"]) then { // in is case sensitve. We can be forgiving here, so lets use toLower.
_litterCondition = _x select 1;
_litterOptions = _x select 2;
if (isnil _litterCondition) then {
_litterCondition = if (_litterCondition != "") then {compile _litterCondition} else {{true}};
} else {
_litterCondition = missionNamespace getvariable _litterCondition;
};
if !([_caller, _target, _selectionName, _className, _usersOfItems] call _litterCondition) exitwith {};
if (typeName _litterOptions == "ARRAY") then {
// Loop through through the litter options and place the litter
{
if (typeName _x == "ARRAY" && {(count _x > 0)}) then {
_createdLitter pushback ([_target, _x select (floor(random(count _x)))] call _createLitter);
};
if (typeName _x == "STRING") then {
_createdLitter pushback ([_target, _x] call _createLitter);
};
}foreach _litterOptions;
};
};
};
}foreach _litter;
if (GVAR(litterCleanUpDelay) >= 0) then {
GVAR(allCreatedLitter) pushback [time, GVAR(litterCleanUpDelay), _createdLitter];
};
if !(GVAR(litterPFHRunning)) then {
GVAR(litterPFHRunning) = true;
[{
{
if (time - (_x select 0) >= (_x select 1)) then {
{
deleteVehicle _x;
}foreach (_this select 2);
GVAR(allCreatedLitter) set[_foreachIndex, objNull];
};
}foreach GVAR(allCreatedLitter);
GVAR(allCreatedLitter) = GVAR(allCreatedLitter) - [objNull];
if (count GVAR(allCreatedLitter) == 0) exitwith {
GVAR(litterPFHRunning) = false;
[_this select 1] call CBA_fnc_removePerFrameHandler;
};
}, 30, []] call CBA_fnc_addPerFrameHandler;
};
// Create a synchronized, 30 second TTL event for litter
[QGVAR(createLitter), _this, 30] call EFUNC(common,syncedEvent);