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

Inventory - Adjust for changes to medical (#7112)

Browse Source 
* Inventory - Adjust for changes to medical

* Add medical replacement items

* adjust for change to medical-replacementItems
This commit is contained in:
PabstMirror 2019-10-06 11:10:56 -05:00 committed by GitHub
parent ce0ccb2d1e
commit 99db6802bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/captives/functions/fnc_addLoadCaptiveActions.sqf
View File

@ -10,7 +10,7 @@
* Child actions <ARRAY> * Child actions <ARRAY>
* *
* Example: * Example:
* [kevin] call ace_medical_fnc_addLoadCaptiveActions * [kevin] call ace_captives_fnc_addLoadCaptiveActions
* *
* Public: No * Public: No
*/ */

2
addons/common/functions/fnc_disableUserInput.sqf
View File

@ -82,7 +82,7 @@ if (_state) then {
openMap true; openMap true;
}; };
if (isServer || {serverCommandAvailable "#kick"} || {player getVariable ["ACE_isUnconscious", false] && {(call FUNC(player)) getVariable [QEGVAR(medical,AllowChatWhileUnconscious), missionNamespace getVariable [QEGVAR(medical,AllowChatWhileUnconscious), false]]}}) then { if (isServer || {serverCommandAvailable "#kick"}) then {
if (!(_key in (actionKeys "DefaultAction" + actionKeys "Throw")) && {_key in (actionKeys "Chat" + actionKeys "PrevChannel" + actionKeys "NextChannel")}) then { if (!(_key in (actionKeys "DefaultAction" + actionKeys "Throw")) && {_key in (actionKeys "Chat" + actionKeys "PrevChannel" + actionKeys "NextChannel")}) then {
_key = 0; _key = 0;
}; };

2
addons/common/functions/fnc_watchVariable.sqf
View File

@ -20,7 +20,7 @@
* Example: * Example:
* ["CBA_missionTime"] call ace_common_fnc_watchVariable // Uses title as code * ["CBA_missionTime"] call ace_common_fnc_watchVariable // Uses title as code
* ["diag_frameNo", {diag_frameNo}, [false]] call ace_common_fnc_watchVariable // Won't show delta * ["diag_frameNo", {diag_frameNo}, [false]] call ace_common_fnc_watchVariable // Won't show delta
* ["blood", {player getVariable "ace_medical_bloodVolume"}, [true, 0, 100]] call ace_common_fnc_watchVariable // Shows slider * ["blood", {player getVariable "ace_medical_bloodVolume"}, [true, 0, 6]] call ace_common_fnc_watchVariable // Shows slider
* ["multiLine text", {"Line 1 <br/>Line 2"}, [2]] call ace_common_fnc_watchVariable * ["multiLine text", {"Line 1 <br/>Line 2"}, [2]] call ace_common_fnc_watchVariable
* ["player names", {allPlayers apply {name _x}}, [5]] call ace_common_fnc_watchVariable // handles any data types * ["player names", {allPlayers apply {name _x}}, [5]] call ace_common_fnc_watchVariable // handles any data types
* *

8
addons/inventory/XEH_preStart.sqf
View File

@ -36,14 +36,10 @@ _grenades_ItemList = _grenades_ItemList arrayIntersect _grenades_ItemList;
uiNamespace setVariable [QGVAR(Grenades_ItemList), _grenades_ItemList]; uiNamespace setVariable [QGVAR(Grenades_ItemList), _grenades_ItemList];
// generate list of medical items // generate list of medical items
private _medical_ItemList = []; private _medical_ItemList = ["FirstAidKit", "Medikit"];
{ {
_medical_ItemList append getArray (_x >> "items"); _medical_ItemList append getArray (_x >> "items");
} forEach ( } forEach ("true" configClasses (configFile >> QEGVAR(medical_treatment,Actions)));
("true" configClasses (configFile >> QEGVAR(Medical,Actions) >> "Basic")) +
("true" configClasses (configFile >> QEGVAR(Medical,Actions) >> "Advanced"))
);
// remove all numbers from list // remove all numbers from list
_medical_ItemList = _medical_ItemList select {_x isEqualType ""}; _medical_ItemList = _medical_ItemList select {_x isEqualType ""};