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

Fix PostRepairDamage and toolkit consumtion setting

Browse Source 
Fix #2982
This commit is contained in:
PabstMirror 2015-12-08 20:31:40 -06:00
parent 0599b35fc6
commit e964b2c135
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/repair/ACE_Repair.hpp
View File

@ -34,10 +34,11 @@ class ACE_Repair {
displayName = CSTRING(Repairing); // let's make empty string an auto generated string
displayNameProgress = CSTRING(RepairingHitPoint);
condition = QUOTE(call FUNC(canMiscRepair));
requiredEngineer = 0;
requiredEngineer = QGVAR(engineerSetting_Repair);
repairingTime = 15;
callbackSuccess = QUOTE(call FUNC(doRepair));
items[] = {"ToolKit"};
itemConsumed = QGVAR(consumeItem_ToolKit);
claimObjects[] = {};
};
class RepairTrack: MiscRepair {
@ -47,6 +48,7 @@ class ACE_Repair {
callbackSuccess = QUOTE(call FUNC(doRepairTrack));
requiredEngineer = QGVAR(engineerSetting_Wheel);
claimObjects[] = {{"ACE_Track"}};
itemConsumed = 0;
};
class RemoveTrack: MiscRepair {
displayName = CSTRING(RemoveTrack);
@ -54,6 +56,7 @@ class ACE_Repair {
condition = QUOTE(call FUNC(canRemove));
callbackSuccess = QUOTE(call FUNC(doRemoveTrack));
requiredEngineer = QGVAR(engineerSetting_Wheel);
itemConsumed = 0;
};
class ReplaceTrack: RemoveTrack {
displayName = CSTRING(ReplaceTrack);
@ -71,6 +74,7 @@ class ACE_Repair {
repairingTime = 30;
condition = "damage _target > 0";
callbackSuccess = QUOTE(call FUNC(doFullRepair));
itemConsumed = 0;
};
};
};

2
addons/repair/ACE_Settings.hpp
View File

@ -41,7 +41,7 @@ class ACE_Settings {
displayName = CSTRING(consumeItem_ToolKit_name);
description = CSTRING(consumeItem_ToolKit_description);
typeName = "SCALAR";
value = 1;
value = 0;
values[] = {ECSTRING(common,No), ECSTRING(common,Yes)};
category = ECSTRING(OptionsMenu,CategoryLogistics);
};

13
addons/repair/functions/fnc_getPostRepairDamage.sqf
View File

@ -17,10 +17,15 @@
params ["_unit"];
TRACE_1("params",_unit);
// TODO when near repair station, full repair?
//If in facility or near vehicle then complete repair of hitpoint:
if (([_unit] call FUNC(isInRepairFacility) || {[_unit] call FUNC(isNearRepairVehicle)})) exitWith {0};
if ([_unit, GVAR(engineerSetting_Repair) + 1] call FUNC(isEngineer)) exitWith {GVAR(repairDamageThreshold_Engineer)};
if ([_unit, GVAR(engineerSetting_Repair)] call FUNC(isEngineer)) exitWith {GVAR(repairDamageThreshold)};
0.3;
private _class = _unit getVariable ["ACE_IsEngineer", getNumber (configFile >> "CfgVehicles" >> typeOf _unit >> "engineer")];
//If specialist or more qualified than min, then use engineer threshold:
if ((_class isEqualTo 2) || {[_unit, GVAR(engineerSetting_Repair) + 1] call FUNC(isEngineer)}) exitWith {
(GVAR(repairDamageThreshold_Engineer) min GVAR(repairDamageThreshold))
};
//Return default threshold:
GVAR(repairDamageThreshold)

2
addons/repair/functions/fnc_isEngineer.sqf
View File

@ -26,4 +26,4 @@ _class = _unit getVariable ["ACE_IsEngineer", getNumber (configFile >> "CfgVehic
// We cannot move this function to common because we require the GVAR(engineerSetting_Repair), which only makes sense to include in the repair module.
if (_class isEqualType false) then {_class = [0, 1] select _class};
_class >= (_engineerN min GVAR(engineerSetting_Repair));
_class >= _engineerN;

2
addons/repair/functions/fnc_repair.sqf
View File

@ -128,7 +128,7 @@ _consumeItems = if (isNumber (_config >> "itemConsumed")) then {
_usersOfItems = [];
if (_consumeItems > 0) then {
_usersOfItems = ([_caller, _target, _items] call FUNC(useItems)) select 1;
_usersOfItems = ([_caller, _items] call FUNC(useItems)) select 1;
};
// Parse the config for the progress callback