W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-16 13:12:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1977 from oiad/patch-8

Browse Source 
Allow modular buildables to refund defined parts
This commit is contained in:
icomrade
2017-09-08 10:07:28 -04:00
committed by GitHub
parent 26da25bf42 cdd0db805f
commit a21f4f797d
3 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
SQF/dayz_code/actions/remove.sqf
View File

@@ -22,7 +22,7 @@ if (DZE_permanentPlot) then {
};
if (_obj getVariable ["GeneratorRunning", false]) exitWith {dayz_actionInProgress = false; localize "str_epoch_player_89" call dayz_rollingMessages;};
_objectID = _obj getVariable ["ObjectID","0"];
_objectUID = _obj getVariable ["ObjectUID","0"];
@@ -71,7 +71,7 @@ _nameVehicle = getText(configFile >> "CfgVehicles" >> _objType >> "displayName")
format[localize "str_epoch_player_162",_nameVehicle] call dayz_rollingMessages;
if (_isModular) then {
if (_isModular && {_objType in _x} count DZE_modularConfig == 0) then {
localize "STR_EPOCH_ACTIONS_21" call dayz_rollingMessages;
};
@@ -138,7 +138,7 @@ if (_brokenTool) then {
} else {
if (([player,_removeTool,1] call BIS_fnc_invRemove) > 0) then {_success = true;};
};
if (_success) then {
format[localize "str_epoch_player_164",getText(configFile >> "CfgWeapons" >> _removeTool >> "displayName"),_nameVehicle] call dayz_rollingMessages;
};
@@ -190,14 +190,27 @@ if (_proceed && _success) then {
default {_selectedRemoveOutput = getArray (configFile >> "CfgVehicles" >> _objType >> "removeoutput")};
};
} else {
_selectedRemoveOutput = getArray (configFile >> "CfgVehicles" >> _objType >> "removeoutput");
if ({_objType in _x} count DZE_modularConfig > 0) then {
{
private ["_class", "_refund"];
_class = _x select 0;
_refund = _x select 1;
if (_objType == _class) then {
{_selectedRemoveOutput set [count _selectedRemoveOutput,_x];} forEach _refund;
};
} count DZE_modularConfig;
} else {
_selectedRemoveOutput = getArray (configFile >> "CfgVehicles" >> _objType >> "removeoutput");
};
_preventRefund = (_objectID == "0" && _objectUID == "0");
};
};
if ((count _selectedRemoveOutput) <= 0) then {
localize "str_epoch_player_90" call dayz_rollingMessages;
[localize "str_epoch_player_90",1] call dayz_rollingMessages;
};
if (_ipos select 2 < 0) then {
@@ -214,9 +227,7 @@ if (_proceed && _success) then {
_gems set [(count _gems), (_x select 0)];
_weights set [(count _weights), (_x select 1)];
} count DZE_GemOccurance;
diag_log [_gems, _weights];
_gemSelected = [_gems, _weights] call BIS_fnc_selectRandomWeighted;
diag_log _gemSelected;
_selectedRemoveOutput set [(count _selectedRemoveOutput),[_gemSelected,1]];
};
};
@@ -228,7 +239,7 @@ if (_proceed && _success) then {
_itemOut = _x select 0;
_countOut = _x select 1;
if (typeName _countOut == "ARRAY") then {
_countOut = round((random (_countOut select 1)) + (_countOut select 0));
_countOut = round((random (_countOut select 1)) max (_countOut select 0));
};
if (count _x > 2) then {
switch (_x select 2) do {