diff --git a/SQF/dayz_code/actions/maintain_area.sqf b/SQF/dayz_code/actions/maintain_area.sqf
new file mode 100644
index 000000000..fad7b0b6c
--- /dev/null
+++ b/SQF/dayz_code/actions/maintain_area.sqf
@@ -0,0 +1,139 @@
+//Code developed by Axe Cop for use in DayZ Epoch Mod.
+private ["_missing","_missingQty","_proceed","_itemIn","_countIn","_qty","_num_removed","_removed","_removed_total","_tobe_removed_total","_obj","_objectID","_objectUID","_classname","_location","_dir","_objectCharacterID","_object","_temp_removed_array","_textMissing","_target","_objectClasses","_range","_objects","_requirements","_count","_cost","_itemText","_option"];
+
+if (TradeInprogress) exitWith { cutText ["Maintenance already in progress." , "PLAIN DOWN"]; };
+TradeInprogress = true;
+
+player removeAction s_player_maintain_area;
+s_player_maintain_area = 1;
+player removeAction s_player_maintain_area_preview;
+s_player_maintain_area_preview = 1;
+
+_target = cursorTarget; // Plastic_Pole_EP1_DZ
+_objectClasses = ["ModularItems", "DZE_Housebase"];
+_range = 50; // set the max range for the maintain area
+_objects = nearestObjects [_target, _objectClasses, _range];
+
+// TODO dynamic requirements based on used building parts?
+_count = count _objects;
+_requirements = [];
+switch true do {
+ case (_count <= 20): {_requirements = [["ItemGoldBar10oz",2]]};
+ case (_count <= 50): {_requirements = [["ItemGoldBar10oz",4]]};
+ case (_count <= 100): {_requirements = [["ItemBriefcase100oz",1]]};
+ case (_count <= 200): {_requirements = [["ItemBriefcase100oz",2]]};
+ case (_count <= 300): {_requirements = [["ItemBriefcase100oz",3]]};
+ case (_count <= 400): {_requirements = [["ItemBriefcase100oz",4]]};
+ case (_count > 400): {_requirements = [["ItemBriefcase100oz",5]]};
+};
+
+_option = _this select 3;
+switch _option do {
+ case "maintain": {
+ _missing = "";
+ _missingQty = 0;
+ _proceed = true;
+ {
+ _itemIn = _x select 0;
+ _countIn = _x select 1;
+ _qty = { (_x == _itemIn) || (configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn) } count magazines player;
+ if (_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
+ } forEach _requirements;
+
+ if (_proceed) then {
+ player playActionNow "Medic";
+ [player,_range,true,(getPosATL player)] spawn player_alertZombies;
+
+ _temp_removed_array = [];
+ _removed_total = 0;
+ _tobe_removed_total = 0;
+
+ {
+ _removed = 0;
+ _itemIn = _x select 0;
+ _countIn = _x select 1;
+ _tobe_removed_total = _tobe_removed_total + _countIn;
+
+ {
+ if ((_removed < _countIn) && ((_x == _itemIn) || configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn)) then {
+ _num_removed = ([player,_x] call BIS_fnc_invRemove);
+ _removed = _removed + _num_removed;
+ _removed_total = _removed_total + _num_removed;
+ if (_num_removed >= 1) then {
+ _temp_removed_array set [count _temp_removed_array,_x];
+ };
+ };
+ } forEach magazines player;
+ } forEach _requirements;
+
+ // all required items removed from player gear
+ if (_tobe_removed_total == _removed_total) then {
+ {
+ _obj = _x;
+
+ // Find objectID
+ _objectID = _obj getVariable ["ObjectID","0"];
+
+ // Find objectUID
+ _objectUID = _obj getVariable ["ObjectUID","0"];
+
+ if (_objectID == "0" && _objectUID == "0") exitWith { cutText ["At least one building part is not setup yet.", "PLAIN DOWN"];};
+
+ // Get classname
+ _classname = typeOf _obj;
+
+ // Get position
+ _location = _obj getVariable["OEMPos",(getposATL _obj)];
+
+ // Get direction
+ _dir = getDir _obj;
+
+ // Find CharacterID
+ _objectCharacterID = _obj getVariable ["CharacterID","0"];
+
+ // Create new object
+ _object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"];
+
+ // Set direction
+ _object setDir _dir;
+
+ // Set location
+ _object setPosATL _location;
+
+ PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location],_classname,_obj,_objectID,_objectUID];
+ publicVariableServer "PVDZE_obj_Swap";
+
+ player reveal _object;
+ } forEach _objects;
+
+ cutText [format["You have maintained %1 building parts.", _count], "PLAIN DOWN", 5];
+ // uncomment the next 2 lines if you want logging of area maintenance to the server report file (Arma2OAserver.RPT)
+ maintainArea_log = [player, _target, _count];
+ publicVariableServer "maintainArea_log";
+ } else {
+ {player addMagazine _x;} forEach _temp_removed_array;
+ cutText [format["Missing Parts after first check Item: %1 / %2",_removed_total,_tobe_removed_total], "PLAIN DOWN"];
+ };
+ } else {
+ _textMissing = getText(configFile >> "CfgMagazines" >> _missing >> "displayName");
+ cutText [format["Missing %1 more of %2", _missingQty, _textMissing], "PLAIN DOWN"];
+ };
+ };
+ case "preview": {
+ _cost = "";
+ {
+ _itemIn = _x select 0;
+ _countIn = _x select 1;
+ _itemText = getText(configFile >> "CfgMagazines" >> _itemIn >> "displayName");
+ if (_cost != "") then {
+ _cost = _cost + " and ";
+ };
+ _cost = _cost + (str(_countIn) + " of " + _itemText);
+ } forEach _requirements;
+ cutText [format["%1 building parts in range, maintenance would cost %2.", _count, _cost], "PLAIN DOWN"];
+ };
+};
+
+TradeInprogress = false;
+s_player_maintain_area = -1;
+s_player_maintain_area_preview = -1;
diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf
index 63102af22..357ecbe37 100644
--- a/SQF/dayz_code/compile/fn_selfActions.sqf
+++ b/SQF/dayz_code/compile/fn_selfActions.sqf
@@ -15,6 +15,20 @@ _inVehicle = (_vehicle != player);
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
_canDo = (!r_drag_sqf and !r_player_unconscious and !_onLadder);
+// ---------------------------------------Maintain Area Start------------------------------------
+ if (_canDo && (speed player <= 1) && (cursorTarget isKindOf "Plastic_Pole_EP1_DZ")) then {
+ if (s_player_maintain_area < 0) then {
+ s_player_maintain_area = player addAction ["Maintain Area", "\z\addons\dayz_code\actions\maintain_area.sqf", "maintain", 5, false];
+ s_player_maintain_area_preview = player addAction ["Maintain Area Preview", "\z\addons\dayz_code\actions\maintain_area.sqf", "preview", 5, false];
+ };
+ } else {
+ player removeAction s_player_maintain_area;
+ s_player_maintain_area = -1;
+ player removeAction s_player_maintain_area_preview;
+ s_player_maintain_area_preview = -1;
+ };
+// ---------------------------------------Maintain Area End------------------------------------
+
_nearLight = nearestObject [player,"LitObject"];
_canPickLight = false;
if (!isNull _nearLight) then {
diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf
index 94d447ddd..ae900a567 100644
--- a/SQF/dayz_code/init/publicEH.sqf
+++ b/SQF/dayz_code/init/publicEH.sqf
@@ -54,6 +54,19 @@ if (isServer) then {
"PVDZE_obj_Trade" addPublicVariableEventHandler {(_this select 1) spawn server_tradeObj};
"PVDZE_plr_TradeMenu" addPublicVariableEventHandler {(_this select 1) spawn server_traders};
"PVDZE_plr_DeathB" addPublicVariableEventHandler {(_this select 1) spawn server_deaths};
+
+
+ //Area Maintenance
+ "maintainArea_log" addPublicVariableEventHandler {
+ _val = _this select 1;
+ _player = _val select 0;
+ _playerName = name _player;
+ _playerID = getPlayerUID _player;
+ _target = _val select 1;
+ _position = position _target;
+ _count = _val select 2;
+ diag_log format["MAINTAIN_AREA: Player %1 (%2) has maintained %3 building parts at position %4", _playerName, _playerID, _count, _position];
+ };
};
//Client only
@@ -70,4 +83,4 @@ if (!isDedicated) then {
"norrnRaDrag" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\publicEH\animDrag.sqf"};
"norrnRnoAnim" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\publicEH\noAnim.sqf"};
-};
\ No newline at end of file
+};
diff --git a/SQF/dayz_code/system/BIS_Effects/killed.sqf b/SQF/dayz_code/system/BIS_Effects/killed.sqf
index d481efcae..48d502548 100644
--- a/SQF/dayz_code/system/BIS_Effects/killed.sqf
+++ b/SQF/dayz_code/system/BIS_Effects/killed.sqf
@@ -1,15 +1,15 @@
private ["_v","_int","_t","_b"];
_v=_this select 0;
-if(_v iskindof"helicopter"||_v iskindof"plane")then{
+if(_v iskindof "helicopter"||_v iskindof "plane")then{
["AirDestruction",_v]call BIS_Effects_globalEvent;
};
-if(_v iskindof"tank")then{
+if(_v iskindof "tank")then{
_int=(fuel _v)*(2+random 2);
_t=time;
[_v,_int]spawn BIS_Effects_Secondaries;
};
-if(_v iskindof"car"||_v iskindof"ship")then{
+if(_v iskindof "car"||_v iskindof "ship")then{
_int=(fuel _v)*(2+random 1);
_t=time;
[_v,_int]spawn BIS_Effects_Secondaries;
diff --git a/Server Files/mysql/1_0_3_Updates.sql b/Server Files/mysql/1_0_3_Updates.sql
index c7c9ef113..aaa07e3f5 100644
--- a/Server Files/mysql/1_0_3_Updates.sql
+++ b/Server Files/mysql/1_0_3_Updates.sql
@@ -99,62 +99,6 @@ INSERT INTO `trader_items` VALUES(NULL, 'PartPlankPack', 1, 'Wholesale Crates',
-- -------------------------------------------------------------------------------------------------------------
-- Adding building supplies to Wholesalers
-- -------------------------------------------------------------------------------------------------------------
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 56, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 56, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 56, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 56, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 61, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 61, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 61, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 61, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 62, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 62, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 62, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 62, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 69, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 69, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 69, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 69, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 84, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 84, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 84, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 84, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 127, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 127, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 127, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 127, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 183, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 183, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 183, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 183, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 184, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 184, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 184, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 184, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 256, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 256, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 256, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 256, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 296, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 296, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 296, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 296, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 359, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 359, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 359, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 359, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 360, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 360, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 360, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 360, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 390, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 390, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 390, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 390, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 441, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 441, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 441, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlankPack",1]', 200, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 441, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(NULL, '["CinderBlocks",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 555, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(NULL, '["PartPlywoodPack",1]', 200, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 555, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(NULL, '["MortarBucket",1]', 50, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 555, 'trade_items');