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

Medical - fix the Enoch pilot uniform not taking damage, fix hitpoints test (#7527)

Browse Source 
* fix the medical hitpoints test

* fix the Enoch pilot

* readd optional test for all units

* Run test at preStart

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
This commit is contained in:
commy2 2020-02-17 01:34:46 +01:00 committed by GitHub
parent 85709d51b3
commit 5a4487f1ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/medical/XEH_preStart.sqf
View File

@ -1,3 +1,5 @@
#include "script_component.hpp" #include "script_component.hpp"
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
[false] call compile preprocessFileLineNumbers QPATHTOF(dev\test_hitpointConfigs.sqf);

22
addons/medical/dev/test_hitpointConfigs.sqf
View File

@ -1,12 +1,22 @@
// PabstMirror // PabstMirror, commy2
// ["medicalHitpoints"] call ace_common_fnc_runTests; // ["medicalHitpoints"] call ace_common_fnc_runTests;
// execVM "\z\ace\addons\medical\dev\test_hitpointConfigs.sqf" // call compile preprocessFileLineNumbers "\z\ace\addons\medical\dev\test_hitpointConfigs.sqf"
#include "\z\ace\addons\medical\script_component.hpp" #include "\z\ace\addons\medical\script_component.hpp"
// UAV-AI should get filtered by scope check // UAV-AI should get filtered by scope check
private _mans = configProperties [configFile >> "CfgVehicles", "(isClass _x) && {(getNumber (_x >> 'scope')) == 2} && {configName _x isKindOf 'CAManBase'}", true];
INFO_1("Checking mans for medical hitpoints [%1 mans]",count _mans); private _cfgWeapons = configFile >> "CfgWeapons";
private _cfgVehicles = configFile >> "CfgVehicles";
private _uniforms = "getNumber (_x >> 'scope') == 2 && {configName _x isKindOf ['Uniform_Base', _cfgWeapons]}" configClasses _cfgWeapons;
private _units = _uniforms apply {_cfgVehicles >> getText (_x >> "ItemInfo" >> "uniformClass")};
if (param [0, false]) then { // Check all units (if naked)
INFO("checking ALL units");
_units append ((configProperties [configFile >> "CfgVehicles", "(isClass _x) && {(getNumber (_x >> 'scope')) == 2} && {configName _x isKindOf 'CAManBase'}", true]));
};
INFO_1("Checking uniforms for correct medical hitpoints [%1 units]",count _units);
private _testPass = true; private _testPass = true;
{ {
@ -22,12 +32,12 @@ private _testPass = true;
_testPass = false; _testPass = false;
}; };
if (((_hitpoints findIf {_x == "HitLeftArm"}) == -1) || {(_hitpoints findIf {_x == "HitLeftArm"}) == -1} if (((_hitpoints findIf {_x == "HitLeftArm"}) == -1) || {(_hitpoints findIf {_x == "HitRightArm"}) == -1}
|| {(_hitpoints findIf {_x == "HitLeftLeg"}) == -1} || {(_hitpoints findIf {_x == "HitRightLeg"}) == -1} || {(_hitpoints findIf {_x == "HitLeftLeg"}) == -1} || {(_hitpoints findIf {_x == "HitRightLeg"}) == -1}
|| {(_hitpoints findIf {_x == "HitHead"}) == -1} || {(_hitpoints findIf {_x == "HitBody"}) == -1}) then { || {(_hitpoints findIf {_x == "HitHead"}) == -1} || {(_hitpoints findIf {_x == "HitBody"}) == -1}) then {
WARNING_2("%1 missing ace hitpoints: %2",_typeOf,_hitpoints); WARNING_2("%1 missing ace hitpoints: %2",_typeOf,_hitpoints);
_testPass = false; _testPass = false;
}; };
} forEach _mans; } forEach _units;
_testPass _testPass

8
addons/medical_engine/CfgVehicles.hpp
View File

@ -113,4 +113,12 @@ class CfgVehicles {
ADD_ACE_HITPOINTS(3,3); ADD_ACE_HITPOINTS(3,3);
}; };
}; };
// Enoch
class I_E_Man_Base_F;
class I_E_Uniform_01_coveralls_F: I_E_Man_Base_F {
class HitPoints {
ADD_ACE_HITPOINTS(2,2);
};
};
}; };