W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-04 15:22:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch

Browse Source
This commit is contained in:
[VB]AWOL
2014-02-06 12:38:00 -06:00
parent 59d5fcd87f ef0901a1f9
commit f03a46ea8b
5 changed files with 200 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGE LOG 1.0.4.1.txt
View File

@@ -1,6 +1,7 @@
[NEW] Base Building Godmode is now included. Use DZE_GodModeBase = true; to enable it. (Disabled by Default) @Skaronator [NEW] Base Building Godmode is now included. Use DZE_GodModeBase = true; to enable it. (Disabled by Default) @Skaronator
[NEW] Config based trader setup option that is more performant, however does not track inventory. DZE_ConfigTrader = true; and #include "\dayz_epoch_b\CfgServerTrader\cfgServerTrader.hpp" in description.ext @Fank @Skaronator @vbawol [NEW] Config based trader setup option that is more performant, however does not track inventory. DZE_ConfigTrader = true; and #include "\dayz_epoch_b\CfgServerTrader\cfgServerTrader.hpp" in description.ext @Fank @Skaronator @vbawol
[ADDED] Static build construction count will force the constructioncount to number set by DZE_StaticConstructionCount = # in init.sqf. @Fank
[ADDED] Stacking of 10oz silver bars into briefcases, also traders now give this as change if return is 2-9 10oz silver bars. @vbawol [ADDED] Stacking of 10oz silver bars into briefcases, also traders now give this as change if return is 2-9 10oz silver bars. @vbawol
[ADDED] Variable DZE_DamageBeforeMaint to control what damage level is needed for the maintain option to appear. @vbawol [ADDED] Variable DZE_DamageBeforeMaint to control what damage level is needed for the maintain option to appear. @vbawol
[ADDED] Keep safe/lockbox vars server side. This should help with performance. @maca134 @Skaronator [ADDED] Keep safe/lockbox vars server side. This should help with performance. @maca134 @Skaronator
@@ -27,6 +28,7 @@
[FIXED] DZE_MissionLootTable - Some things are missing. @vbawol @Skaronator [FIXED] DZE_MissionLootTable - Some things are missing. @vbawol @Skaronator
[FIXED] General cleanup and fixes. @Fank @Skaronator @icomrade @vbawol [FIXED] General cleanup and fixes. @Fank @Skaronator @icomrade @vbawol
[CHANGED] Selling vehicle will now remove the key if you have it on your toolbelt. @Fank
[CHANGED] R3F weight now in Kg for every language except english. @VeryBigBro [CHANGED] R3F weight now in Kg for every language except english. @VeryBigBro
[CHANGED] Increased trader prices for Armed vehicles and pipebombs. @vbawol [CHANGED] Increased trader prices for Armed vehicles and pipebombs. @vbawol
[CHANGED] Added BAF_Merlin_DZE and MH60S_DZE to traders. @vbawol [CHANGED] Added BAF_Merlin_DZE and MH60S_DZE to traders. @vbawol

93
SQF/dayz_code/actions/player_build.sqf
View File

@@ -56,7 +56,7 @@ _needNear = getArray (configFile >> "CfgMagazines" >> _item >> "ItemActions" >>
case "fire": case "fire":
{ {
_isNear = {inflamed _x} count (getPosATL player nearObjects _distance); _isNear = {inflamed _x} count (getPosATL player nearObjects _distance);
if(_isNear == 0) then { if(_isNear == 0) then {
_abort = true; _abort = true;
_reason = "fire"; _reason = "fire";
}; };
@@ -64,7 +64,7 @@ _needNear = getArray (configFile >> "CfgMagazines" >> _item >> "ItemActions" >>
case "workshop": case "workshop":
{ {
_isNear = count (nearestObjects [player, ["Wooden_shed_DZ","WoodShack_DZ","WorkBench_DZ"], _distance]); _isNear = count (nearestObjects [player, ["Wooden_shed_DZ","WoodShack_DZ","WorkBench_DZ"], _distance]);
if(_isNear == 0) then { if(_isNear == 0) then {
_abort = true; _abort = true;
_reason = "workshop"; _reason = "workshop";
}; };
@@ -72,7 +72,7 @@ _needNear = getArray (configFile >> "CfgMagazines" >> _item >> "ItemActions" >>
case "fueltank": case "fueltank":
{ {
_isNear = count (nearestObjects [player, dayz_fuelsources, _distance]); _isNear = count (nearestObjects [player, dayz_fuelsources, _distance]);
if(_isNear == 0) then { if(_isNear == 0) then {
_abort = true; _abort = true;
_reason = "fuel tank"; _reason = "fuel tank";
_distance = 30; _distance = 30;
@@ -147,11 +147,11 @@ if(_IsNearPlot == 0) then {
} else { } else {
// Since there are plots nearby we check for ownership and then for friend status // Since there are plots nearby we check for ownership and then for friend status
// check nearby plots ownership and then for friend status // check nearby plots ownership and then for friend status
_nearestPole = _findNearestPole select 0; _nearestPole = _findNearestPole select 0;
// Find owner // Find owner
_ownerID = _nearestPole getVariable["CharacterID","0"]; _ownerID = _nearestPole getVariable["CharacterID","0"];
// diag_log format["DEBUG BUILDING: %1 = %2", dayz_characterID, _ownerID]; // diag_log format["DEBUG BUILDING: %1 = %2", dayz_characterID, _ownerID];
@@ -160,7 +160,7 @@ if(_IsNearPlot == 0) then {
if(dayz_characterID == _ownerID) then { //Keep ownership if(dayz_characterID == _ownerID) then { //Keep ownership
// owner can build anything within his plot except other plots // owner can build anything within his plot except other plots
if(!_isPole) then { if(!_isPole) then {
_canBuildOnPlot = true; _canBuildOnPlot = true;
}; };
} else { } else {
@@ -204,21 +204,21 @@ if (_hasrequireditem) then {
}; };
_object = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; _object = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
_object attachTo [player,_offset]; _object attachTo [player,_offset];
_position = getPosATL _object; _position = getPosATL _object;
cutText [(localize "str_epoch_player_45"), "PLAIN DOWN"]; cutText [(localize "str_epoch_player_45"), "PLAIN DOWN"];
_objHDiff = 0; _objHDiff = 0;
while {_isOk} do { while {_isOk} do {
_zheightchanged = false; _zheightchanged = false;
_zheightdirection = ""; _zheightdirection = "";
_rotate = false; _rotate = false;
if (DZE_Q) then { if (DZE_Q) then {
DZE_Q = false; DZE_Q = false;
_zheightdirection = "up"; _zheightdirection = "up";
@@ -227,7 +227,7 @@ if (_hasrequireditem) then {
if (DZE_Z) then { if (DZE_Z) then {
DZE_Z = false; DZE_Z = false;
_zheightdirection = "down"; _zheightdirection = "down";
_zheightchanged = true; _zheightchanged = true;
}; };
if (DZE_Q_alt) then { if (DZE_Q_alt) then {
DZE_Q_alt = false; DZE_Q_alt = false;
@@ -259,7 +259,7 @@ if (_hasrequireditem) then {
DZE_6 = false; DZE_6 = false;
_dir = 0; _dir = 0;
}; };
if(_rotate) then { if(_rotate) then {
_object setDir _dir; _object setDir _dir;
_object setPosATL _position; _object setPosATL _position;
@@ -297,7 +297,7 @@ if (_hasrequireditem) then {
_position set [2,((_position select 2)-0.01)]; _position set [2,((_position select 2)-0.01)];
_objHDiff = _objHDiff - 0.01; _objHDiff = _objHDiff - 0.01;
}; };
_object setDir (getDir _object); _object setDir (getDir _object);
if((_isAllowedUnderGround == 0) and ((_position select 2) < 0)) then { if((_isAllowedUnderGround == 0) and ((_position select 2) < 0)) then {
@@ -305,13 +305,13 @@ if (_hasrequireditem) then {
}; };
_object setPosATL _position; _object setPosATL _position;
//diag_log format["DEBUG Change BUILDING POS: %1", _position]; //diag_log format["DEBUG Change BUILDING POS: %1", _position];
_object attachTo [player]; _object attachTo [player];
}; };
sleep 0.5; sleep 0.5;
_location2 = getPosATL player; _location2 = getPosATL player;
@@ -324,19 +324,19 @@ if (_hasrequireditem) then {
//diag_log format["DEBUG BUILDING POS: %1", _position]; //diag_log format["DEBUG BUILDING POS: %1", _position];
deleteVehicle _object; deleteVehicle _object;
}; };
if(_location1 distance _location2 > 5) exitWith { if(_location1 distance _location2 > 5) exitWith {
_isOk = false; _isOk = false;
_cancel = true; _cancel = true;
_reason = "You've moved to far away from where you started building (within 5 meters)"; _reason = "You've moved to far away from where you started building (within 5 meters)";
detach _object; detach _object;
deleteVehicle _object; deleteVehicle _object;
}; };
if(abs(_objHDiff) > 5) exitWith { if(abs(_objHDiff) > 5) exitWith {
_isOk = false; _isOk = false;
_cancel = true; _cancel = true;
_reason = "Cannot move up or down more than 5 meters"; _reason = "Cannot move up or down more than 5 meters";
detach _object; detach _object;
deleteVehicle _object; deleteVehicle _object;
}; };
@@ -371,49 +371,54 @@ if (_hasrequireditem) then {
_classname = _classnametmp; _classname = _classnametmp;
// Start Build // Start Build
_tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; _tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
_tmpbuilt setdir _dir; _tmpbuilt setdir _dir;
// Get position based on object // Get position based on object
_location = _position; _location = _position;
if((_isAllowedUnderGround == 0) and ((_location select 2) < 0)) then { if((_isAllowedUnderGround == 0) and ((_location select 2) < 0)) then {
_location set [2,0]; _location set [2,0];
}; };
_tmpbuilt setPosATL _location; _tmpbuilt setPosATL _location;
cutText [format[(localize "str_epoch_player_138"),_text], "PLAIN DOWN"]; cutText [format[(localize "str_epoch_player_138"),_text], "PLAIN DOWN"];
_limit = 3; _limit = 3;
if(isNumber (configFile >> "CfgVehicles" >> _classname >> "constructioncount")) then { if (DZE_StaticConstructionCount > 0) then {
_limit = getNumber(configFile >> "CfgVehicles" >> _classname >> "constructioncount"); _limit = DZE_StaticConstructionCount;
}
else {
if (isNumber (configFile >> "CfgVehicles" >> _classname >> "constructioncount")) then {
_limit = getNumber(configFile >> "CfgVehicles" >> _classname >> "constructioncount");
};
}; };
_isOk = true; _isOk = true;
_proceed = false; _proceed = false;
_counter = 0; _counter = 0;
while {_isOk} do { while {_isOk} do {
[10,10] call dayz_HungerThirst; [10,10] call dayz_HungerThirst;
player playActionNow "Medic"; player playActionNow "Medic";
_dis=20; _dis=20;
_sfx = "repair"; _sfx = "repair";
[player,_sfx,0,false,_dis] call dayz_zombieSpeak; [player,_sfx,0,false,_dis] call dayz_zombieSpeak;
[player,_dis,true,(getPosATL player)] spawn player_alertZombies; [player,_dis,true,(getPosATL player)] spawn player_alertZombies;
r_interrupt = false; r_interrupt = false;
_animState = animationState player; _animState = animationState player;
r_doLoop = true; r_doLoop = true;
_started = false; _started = false;
_finished = false; _finished = false;
while {r_doLoop} do { while {r_doLoop} do {
_animState = animationState player; _animState = animationState player;
_isMedic = ["medic",_animState] call fnc_inString; _isMedic = ["medic",_animState] call fnc_inString;
@@ -450,16 +455,16 @@ if (_hasrequireditem) then {
_isOk = false; _isOk = false;
_proceed = true; _proceed = true;
}; };
}; };
if (_proceed) then { if (_proceed) then {
_num_removed = ([player,_item] call BIS_fnc_invRemove); _num_removed = ([player,_item] call BIS_fnc_invRemove);
if(_num_removed == 1) then { if(_num_removed == 1) then {
cutText [format[localize "str_build_01",_text], "PLAIN DOWN"]; cutText [format[localize "str_build_01",_text], "PLAIN DOWN"];
if (_isPole) then { if (_isPole) then {
[] spawn player_plotPreview; [] spawn player_plotPreview;
}; };
@@ -467,11 +472,11 @@ if (_hasrequireditem) then {
_tmpbuilt setVariable ["OEMPos",_location,true]; _tmpbuilt setVariable ["OEMPos",_location,true];
if(_lockable > 1) then { if(_lockable > 1) then {
_combinationDisplay = ""; _combinationDisplay = "";
switch (_lockable) do { switch (_lockable) do {
case 2: { // 2 lockbox case 2: { // 2 lockbox
_combination_1 = (floor(random 3)) + 100; // 100=red,101=green,102=blue _combination_1 = (floor(random 3)) + 100; // 100=red,101=green,102=blue
_combination_2 = floor(random 10); _combination_2 = floor(random 10);
@@ -489,7 +494,7 @@ if (_hasrequireditem) then {
}; };
_combinationDisplay = format["%1%2%3",_combination_1_Display,_combination_2,_combination_3]; _combinationDisplay = format["%1%2%3",_combination_1_Display,_combination_2,_combination_3];
}; };
case 3: { // 3 combolock case 3: { // 3 combolock
_combination_1 = floor(random 10); _combination_1 = floor(random 10);
_combination_2 = floor(random 10); _combination_2 = floor(random 10);
@@ -498,7 +503,7 @@ if (_hasrequireditem) then {
dayz_combination = _combination; dayz_combination = _combination;
_combinationDisplay = _combination; _combinationDisplay = _combination;
}; };
case 4: { // 4 safe case 4: { // 4 safe
_combination_1 = floor(random 10); _combination_1 = floor(random 10);
_combination_2 = floor(random 10); _combination_2 = floor(random 10);
@@ -511,17 +516,17 @@ if (_hasrequireditem) then {
}; };
_tmpbuilt setVariable ["CharacterID",_combination,true]; _tmpbuilt setVariable ["CharacterID",_combination,true];
PVDZE_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],_classname]; PVDZE_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],_classname];
publicVariableServer "PVDZE_obj_Publish"; publicVariableServer "PVDZE_obj_Publish";
cutText [format[(localize "str_epoch_player_140"),_combinationDisplay,_text], "PLAIN DOWN", 5]; cutText [format[(localize "str_epoch_player_140"),_combinationDisplay,_text], "PLAIN DOWN", 5];
} else { } else {
_tmpbuilt setVariable ["CharacterID",dayz_characterID,true]; _tmpbuilt setVariable ["CharacterID",dayz_characterID,true];
// fire? // fire?
if(_tmpbuilt isKindOf "Land_Fire_DZ") then { if(_tmpbuilt isKindOf "Land_Fire_DZ") then {
_tmpbuilt spawn player_fireMonitor; _tmpbuilt spawn player_fireMonitor;

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

@@ -27,7 +27,7 @@ _isOk = true;
_proceed = false; _proceed = false;
_objType = typeOf _obj; _objType = typeOf _obj;
// Chance to break tools // Chance to break tools
_isDestructable = _obj isKindOf "BuiltItems"; _isDestructable = _obj isKindOf "BuiltItems";
_isWreck = _objType in DZE_isWreck; _isWreck = _objType in DZE_isWreck;
_isRemovable = _objType in DZE_isRemovable; _isRemovable = _objType in DZE_isRemovable;
@@ -36,8 +36,13 @@ _isMine = _objType in ["Land_iron_vein_wreck","Land_silver_vein_wreck","Land_gol
_isModular = _obj isKindOf "ModularItems"; _isModular = _obj isKindOf "ModularItems";
_limit = 3; _limit = 3;
if(isNumber (configFile >> "CfgVehicles" >> _objType >> "constructioncount")) then { if (DZE_StaticConstructionCount > 0) then {
_limit = getNumber(configFile >> "CfgVehicles" >> _objType >> "constructioncount"); _limit = DZE_StaticConstructionCount;
}
else {
if (isNumber (configFile >> "CfgVehicles" >> _objType >> "constructioncount")) then {
_limit = getNumber(configFile >> "_objType" >> _classname >> "constructioncount");
};
}; };
_findNearestPoles = nearestObjects[player, ["Plastic_Pole_EP1_DZ"], 30]; _findNearestPoles = nearestObjects[player, ["Plastic_Pole_EP1_DZ"], 30];
@@ -50,12 +55,12 @@ if(_IsNearPlot >= 1) then {
_nearestPole = _findNearestPole select 0; _nearestPole = _findNearestPole select 0;
// Find owner // Find owner
_ownerID = _nearestPole getVariable["CharacterID","0"]; _ownerID = _nearestPole getVariable["CharacterID","0"];
// check if friendly to owner // check if friendly to owner
if(dayz_characterID != _ownerID) then { if(dayz_characterID != _ownerID) then {
_friendlies = player getVariable ["friendlyTo",[]]; _friendlies = player getVariable ["friendlyTo",[]];
// check if friendly to owner // check if friendly to owner
if(!(_ownerID in _friendlies)) then { if(!(_ownerID in _friendlies)) then {
@@ -91,7 +96,7 @@ while {_isOk} do {
player playActionNow "Medic"; player playActionNow "Medic";
_dis=20; _dis=20;
[player,_dis,true,(getPosATL player)] spawn player_alertZombies; [player,_dis,true,(getPosATL player)] spawn player_alertZombies;
r_interrupt = false; r_interrupt = false;
_animState = animationState player; _animState = animationState player;
r_doLoop = true; r_doLoop = true;
@@ -113,9 +118,9 @@ while {_isOk} do {
if (r_interrupt) then { if (r_interrupt) then {
r_doLoop = false; r_doLoop = false;
}; };
sleep 0.1; sleep 0.1;
}; };
if(!_finished) exitWith { if(!_finished) exitWith {
@@ -143,7 +148,7 @@ while {_isOk} do {
_isOk = false; _isOk = false;
_proceed = true; _proceed = true;
}; };
}; };
@@ -161,21 +166,21 @@ if(_brokenTool) then {
// Remove only if player waited // Remove only if player waited
if (_proceed) then { if (_proceed) then {
// Double check that object is not null // Double check that object is not null
if(!isNull(_obj)) then { if(!isNull(_obj)) then {
_ipos = getPosATL _obj; _ipos = getPosATL _obj;
deleteVehicle _obj; deleteVehicle _obj;
if(!_isWreck) then { if(!_isWreck) then {
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer]; PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete"; publicVariableServer "PVDZE_obj_Delete";
}; };
cutText [format[(localize "str_epoch_player_165"),_nameVehicle], "PLAIN DOWN"]; cutText [format[(localize "str_epoch_player_165"),_nameVehicle], "PLAIN DOWN"];
_preventRefund = false; _preventRefund = false;
_selectedRemoveOutput = []; _selectedRemoveOutput = [];
@@ -189,10 +194,10 @@ if (_proceed) then {
} else { } else {
_selectedRemoveOutput = getArray (configFile >> "CfgVehicles" >> _objType >> "removeoutput"); _selectedRemoveOutput = getArray (configFile >> "CfgVehicles" >> _objType >> "removeoutput");
_preventRefund = (_objectID == "0" && _objectUID == "0"); _preventRefund = (_objectID == "0" && _objectUID == "0");
}; };
}; };
if((count _selectedRemoveOutput) <= 0) then { if((count _selectedRemoveOutput) <= 0) then {
cutText [(localize "str_epoch_player_90"), "PLAIN DOWN"]; cutText [(localize "str_epoch_player_90"), "PLAIN DOWN"];
}; };
@@ -220,7 +225,7 @@ if (_proceed) then {
if (typeName _countOut == "ARRAY") then { if (typeName _countOut == "ARRAY") then {
_countOut = round((random (_countOut select 1)) + (_countOut select 0)); _countOut = round((random (_countOut select 1)) + (_countOut select 0));
}; };
_item addMagazineCargoGlobal [_itemOut,_countOut]; _item addMagazineCargoGlobal [_itemOut,_countOut];
} forEach _selectedRemoveOutput; } forEach _selectedRemoveOutput;
_item setposATL _iPos; _item setposATL _iPos;

78
SQF/dayz_code/actions/trade_any_vehicle.sqf
View File

@@ -1,4 +1,4 @@
private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_canAfford","_trade_total","_total_currency","_return_change","_done"]; private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_temp_keys","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_canAfford","_trade_total","_total_currency","_return_change","_done"];
if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; };
DZE_ActionInProgress = true; DZE_ActionInProgress = true;
@@ -26,9 +26,9 @@ if(_buy_o_sell == "sell") then {
}; };
cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"];
[1,1] call dayz_HungerThirst; [1,1] call dayz_HungerThirst;
// force animation // force animation
player playActionNow "Medic"; player playActionNow "Medic";
r_interrupt = false; r_interrupt = false;
@@ -36,7 +36,7 @@ _animState = animationState player;
r_doLoop = true; r_doLoop = true;
_started = false; _started = false;
_finished = false; _finished = false;
while {r_doLoop} do { while {r_doLoop} do {
_animState = animationState player; _animState = animationState player;
_isMedic = ["medic",_animState] call fnc_inString; _isMedic = ["medic",_animState] call fnc_inString;
@@ -54,7 +54,7 @@ while {r_doLoop} do {
}; };
r_doLoop = false; r_doLoop = false;
if (!_finished) exitWith { if (!_finished) exitWith {
r_interrupt = false; r_interrupt = false;
if (vehicle player == player) then { if (vehicle player == player) then {
[objNull, player, rSwitchMove,""] call RE; [objNull, player, rSwitchMove,""] call RE;
@@ -68,7 +68,7 @@ if (_finished) then {
_canAfford = false; _canAfford = false;
if(_bos == 1) then { if(_bos == 1) then {
_distance = dayz_sellDistance_vehicle; _distance = dayz_sellDistance_vehicle;
if (_part_in isKindOf "Air") then { if (_part_in isKindOf "Air") then {
_distance = dayz_sellDistance_air; _distance = dayz_sellDistance_air;
@@ -83,11 +83,11 @@ if (_finished) then {
diag_log format["DEBUG vehicle sell count: %1", _count]; diag_log format["DEBUG vehicle sell count: %1", _count];
} else { } else {
//buy //buy
_trade_total = [[_part_in,_qty_in]] call epoch_itemCost; _trade_total = [[_part_in,_qty_in]] call epoch_itemCost;
_total_currency = call epoch_totalCurrency; _total_currency = call epoch_totalCurrency;
_return_change = _total_currency - _trade_total; _return_change = _total_currency - _trade_total;
if (_return_change >= 0) then { if (_return_change >= 0) then {
_canAfford = true; _canAfford = true;
}; };
@@ -107,10 +107,10 @@ if (_finished) then {
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_out,inTraderCity,_part_in,_qty_in]; PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_out,inTraderCity,_part_in,_qty_in];
}; };
publicVariableServer "PVDZE_obj_Trade"; publicVariableServer "PVDZE_obj_Trade";
//diag_log format["DEBUG Starting to wait for answer: %1", PVDZE_obj_Trade]; //diag_log format["DEBUG Starting to wait for answer: %1", PVDZE_obj_Trade];
if(_buy_o_sell == "buy") then { if(_buy_o_sell == "buy") then {
waitUntil {!isNil "dayzTradeResult"}; waitUntil {!isNil "dayzTradeResult"};
@@ -125,19 +125,19 @@ if (_finished) then {
_keyNumber = (floor(random 2500)) + 1; _keyNumber = (floor(random 2500)) + 1;
// Combine to key (eg.ItemKeyYellow2494) classname // Combine to key (eg.ItemKeyYellow2494) classname
_keySelected = format[("ItemKey%1%2"),_keyColor,_keyNumber]; _keySelected = format[("ItemKey%1%2"),_keyColor,_keyNumber];
_isKeyOK = isClass(configFile >> "CfgWeapons" >> _keySelected); _isKeyOK = isClass(configFile >> "CfgWeapons" >> _keySelected);
_config = _keySelected; _config = _keySelected;
_isOk = [player,_config] call BIS_fnc_invAdd; _isOk = [player,_config] call BIS_fnc_invAdd;
waitUntil {!isNil "_isOk"}; waitUntil {!isNil "_isOk"};
if (_isOk and _isKeyOK) then { if (_isOk and _isKeyOK) then {
_done = [[[_part_in,_qty_in]],0] call epoch_returnChange; _done = [[[_part_in,_qty_in]],0] call epoch_returnChange;
if (_done) then { if (_done) then {
// spawn vehicle // spawn vehicle
_dir = round(random 360); _dir = round(random 360);
@@ -148,7 +148,7 @@ if (_finished) then {
} else { } else {
_location = [(position player),0,20,1,0,2000,0] call BIS_fnc_findSafePos; _location = [(position player),0,20,1,0,2000,0] call BIS_fnc_findSafePos;
}; };
//place vehicle spawn marker (local) //place vehicle spawn marker (local)
_veh = createVehicle ["Sign_arrow_down_large_EP1", _location, [], 0, "CAN_COLLIDE"]; _veh = createVehicle ["Sign_arrow_down_large_EP1", _location, [], 0, "CAN_COLLIDE"];
@@ -157,7 +157,7 @@ if (_finished) then {
//["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure; //["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure;
PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer]; PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer];
publicVariableServer "PVDZE_veh_Publish2"; publicVariableServer "PVDZE_veh_Publish2";
cutText [format[(localize "STR_EPOCH_ACTIONS_11"),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"]; cutText [format[(localize "STR_EPOCH_ACTIONS_11"),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"];
}; };
} else { } else {
@@ -168,7 +168,7 @@ if (_finished) then {
cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"]; cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"];
}; };
} else { } else {
//sell //sell
_distance = dayz_sellDistance_vehicle; _distance = dayz_sellDistance_vehicle;
if (_part_in isKindOf "Air") then { if (_part_in isKindOf "Air") then {
@@ -177,7 +177,7 @@ if (_finished) then {
if (_part_in isKindOf "Ship") then { if (_part_in isKindOf "Ship") then {
_distance = dayz_sellDistance_boat; _distance = dayz_sellDistance_boat;
}; };
_objects = nearestObjects [(getPosATL player), [_part_in], _distance]; _objects = nearestObjects [(getPosATL player), [_part_in], _distance];
diag_log format["DEBUG vehicle sell objects: %1", _objects]; diag_log format["DEBUG vehicle sell objects: %1", _objects];
@@ -193,14 +193,14 @@ if (_finished) then {
_okToSell = true; _okToSell = true;
// count parts // count parts
_tires = 0; _tires = 0;
// total damage // total damage
_tireDmg = 0; _tireDmg = 0;
_damage = 0; _damage = 0;
{ {
if(["Wheel",_x,false] call fnc_inString) then { if(["Wheel",_x,false] call fnc_inString) then {
_damage = [_obj,_x] call object_getHit; _damage = [_obj,_x] call object_getHit;
_tireDmg = _tireDmg + _damage; _tireDmg = _tireDmg + _damage;
_tires = _tires + 1; _tires = _tires + 1;
@@ -214,8 +214,9 @@ if (_finished) then {
}; };
}; };
_objectID = _obj getVariable ["ObjectID","0"]; _objectID = _obj getVariable ["ObjectID","0"];
_objectUID = _obj getVariable ["ObjectUID","0"]; _objectUID = _obj getVariable ["ObjectUID","0"];
_objectCharacterId = _obj getVariable ["CharacterID","0"];
_notSetup = (_objectID == "0" && _objectUID == "0"); _notSetup = (_objectID == "0" && _objectUID == "0");
@@ -223,21 +224,30 @@ if (_finished) then {
if(_okToSell) then { if(_okToSell) then {
//if(_objectID != "0" && _objectUID != "0") then { //if(_objectID != "0" && _objectUID != "0") then {
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer]; PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete"; publicVariableServer "PVDZE_obj_Delete";
deleteVehicle _obj; deleteVehicle _obj;
// payout // remove Key
_temp_keys = [];
_keyColor = ["ItemKeyYellow","ItemKeyBlue","ItemKeyRed","ItemKeyGreen","ItemKeyBlack"];
{
if (configName(inheritsFrom(configFile >> "CfgWeapons" >> _x)) in _key_colors) then {
if (getNumber(configFile >> "CfgWeapons" >> _x >> "keyid") == _objectCharacterId) then {
[_activatingPlayer,_x] call BIS_fnc_invRemove;
};
};
} forEach (items _activatingPlayer);
// payout
_canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange; _canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange;
cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
} else { } else {
cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"]; cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"];
}; };
@@ -254,7 +264,7 @@ if (_finished) then {
cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"]; cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"];
} else { } else {
cutText [format[(localize "str_epoch_player_185"),_textPartIn] , "PLAIN DOWN"]; cutText [format[(localize "str_epoch_player_185"),_textPartIn] , "PLAIN DOWN"];
}; };
}; };
}; };
DZE_ActionInProgress = false; DZE_ActionInProgress = false;

165
SQF/dayz_code/init/variables.sqf
View File

@@ -18,26 +18,26 @@ AllPlayers = ["Survivor2_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","Survivor
//Cooking //Cooking
meatraw = [ meatraw = [
"FoodSteakRaw", "FoodSteakRaw",
"FoodmeatRaw", "FoodmeatRaw",
"FoodbeefRaw", "FoodbeefRaw",
"FoodmuttonRaw", "FoodmuttonRaw",
"FoodchickenRaw", "FoodchickenRaw",
"FoodrabbitRaw", "FoodrabbitRaw",
"FoodbaconRaw", "FoodbaconRaw",
"ItemTrout", "ItemTrout",
"ItemSeaBass", "ItemSeaBass",
"ItemTuna" "ItemTuna"
]; ];
exceptionsraw = ["ItemTuna"]; exceptionsraw = ["ItemTuna"];
meatcooked = [ meatcooked = [
"FoodSteakCooked", "FoodSteakCooked",
"FoodmeatCooked", "FoodmeatCooked",
"FoodbeefCooked", "FoodbeefCooked",
"FoodmuttonCooked", "FoodmuttonCooked",
"FoodchickenCooked", "FoodchickenCooked",
"FoodrabbitCooked", "FoodrabbitCooked",
"FoodbaconCooked", "FoodbaconCooked",
"ItemTroutCooked", "ItemTroutCooked",
"ItemSeaBassCooked", "ItemSeaBassCooked",
"ItemTunaCooked" "ItemTunaCooked"
@@ -49,10 +49,10 @@ no_output_food = ["FoodMRE", "FoodPistachio", "FoodNutmix","FoodBioMeat"]+meatco
badfood = ["FoodBioMeat","FoodCanUnlabeled"]; badfood = ["FoodBioMeat","FoodCanUnlabeled"];
food_with_output=[ food_with_output=[
"FoodCanBakedBeans", "FoodCanBakedBeans",
"FoodCanSardines", "FoodCanSardines",
"FoodCanFrankBeans", "FoodCanFrankBeans",
"FoodCanPasta", "FoodCanPasta",
"FoodCanGriff", "FoodCanGriff",
"FoodCanBadguy", "FoodCanBadguy",
"FoodCanBoneboy", "FoodCanBoneboy",
@@ -68,10 +68,10 @@ food_with_output=[
]; ];
food_output = [ food_output = [
"TrashTinCan", "TrashTinCan",
"TrashTinCan", "TrashTinCan",
"TrashTinCan", "TrashTinCan",
"TrashTinCan", "TrashTinCan",
"FoodCanGriffEmpty", "FoodCanGriffEmpty",
"FoodCanBadguyEmpty", "FoodCanBadguyEmpty",
"FoodCanBoneboyEmpty", "FoodCanBoneboyEmpty",
@@ -88,41 +88,41 @@ food_output = [
//Drinking //Drinking
no_output_drink = ["ItemWaterbottle", "ItemWaterbottleBoiled"]; no_output_drink = ["ItemWaterbottle", "ItemWaterbottleBoiled"];
drink_with_output = [ drink_with_output = [
"ItemSoda", //just to define item for ItemSodaEmpty "ItemSoda", //just to define item for ItemSodaEmpty
"ItemSodaRbull", "ItemSodaRbull",
"ItemSodaOrangeSherbet", "ItemSodaOrangeSherbet",
"ItemSodaCoke", "ItemSodaCoke",
"ItemSodaPepsi", "ItemSodaPepsi",
"ItemSodaMdew", "ItemSodaMdew",
"ItemSodaMtngreen", "ItemSodaMtngreen",
"ItemSodaR4z0r", "ItemSodaR4z0r",
"ItemSodaClays", "ItemSodaClays",
"ItemSodaSmasht", "ItemSodaSmasht",
"ItemSodaDrwaste", "ItemSodaDrwaste",
"ItemSodaLemonade", "ItemSodaLemonade",
"ItemSodaLvg", "ItemSodaLvg",
"ItemSodaMzly", "ItemSodaMzly",
"ItemSodaRabbit" "ItemSodaRabbit"
]; ];
drink_output = [ drink_output = [
"ItemSodaEmpty", "ItemSodaEmpty",
"ItemSodaEmpty", "ItemSodaEmpty",
"ItemSodaEmpty", "ItemSodaEmpty",
"ItemSodaCokeEmpty", "ItemSodaCokeEmpty",
"ItemSodaPepsiEmpty", "ItemSodaPepsiEmpty",
"ItemSodaMdewEmpty", "ItemSodaMdewEmpty",
"ItemSodaMtngreenEmpty", "ItemSodaMtngreenEmpty",
"ItemSodaR4z0rEmpty", "ItemSodaR4z0rEmpty",
"ItemSodaClaysEmpty", "ItemSodaClaysEmpty",
"ItemSodaSmashtEmpty", "ItemSodaSmashtEmpty",
"ItemSodaDrwasteEmpty", "ItemSodaDrwasteEmpty",
"ItemSodaLemonadeEmpty", "ItemSodaLemonadeEmpty",
"ItemSodaLvgEmpty", "ItemSodaLvgEmpty",
"ItemSodaMzlyEmpty", "ItemSodaMzlyEmpty",
"ItemSodaRabbitEmpty" "ItemSodaRabbitEmpty"
]; ];
boil_tin_cans = [ boil_tin_cans = [
"TrashTinCan", "TrashTinCan",
"FoodCanGriffEmpty", "FoodCanGriffEmpty",
"FoodCanBadguyEmpty", "FoodCanBadguyEmpty",
"FoodCanBoneboyEmpty", "FoodCanBoneboyEmpty",
@@ -135,19 +135,19 @@ boil_tin_cans = [
"FoodCanPowellEmpty", "FoodCanPowellEmpty",
"FoodCanTylersEmpty", "FoodCanTylersEmpty",
"FoodCanUnlabeledEmpty", "FoodCanUnlabeledEmpty",
"ItemSodaEmpty", "ItemSodaEmpty",
"ItemSodaCokeEmpty", "ItemSodaCokeEmpty",
"ItemSodaPepsiEmpty", "ItemSodaPepsiEmpty",
"ItemSodaMdewEmpty", "ItemSodaMdewEmpty",
"ItemSodaMtngreenEmpty", "ItemSodaMtngreenEmpty",
"ItemSodaR4z0rEmpty", "ItemSodaR4z0rEmpty",
"ItemSodaClaysEmpty", "ItemSodaClaysEmpty",
"ItemSodaSmashtEmpty", "ItemSodaSmashtEmpty",
"ItemSodaDrwasteEmpty", "ItemSodaDrwasteEmpty",
"ItemSodaLemonadeEmpty", "ItemSodaLemonadeEmpty",
"ItemSodaLvgEmpty", "ItemSodaLvgEmpty",
"ItemSodaMzlyEmpty", "ItemSodaMzlyEmpty",
"ItemSodaRabbitEmpty" "ItemSodaRabbitEmpty"
]; ];
dayz_combination = ""; dayz_combination = "";
@@ -245,7 +245,7 @@ dayz_resetSelfActions = {
s_halo_action = -1; s_halo_action = -1;
s_player_SurrenderedGear = -1; s_player_SurrenderedGear = -1;
s_player_maintain_area = -1; s_player_maintain_area = -1;
s_player_maintain_area_preview = -1; s_player_maintain_area_preview = -1;
s_player_heli_lift = -1; s_player_heli_lift = -1;
s_player_heli_detach = -1; s_player_heli_detach = -1;
}; };
@@ -256,7 +256,7 @@ s_player_lastTarget = [objNull,objNull,objNull,objNull,objNull];
s_player_repairActions = []; s_player_repairActions = [];
s_player_lockunlock = []; s_player_lockunlock = [];
// Custom // Custom
s_player_madsci = []; s_player_madsci = [];
s_player_parts = []; s_player_parts = [];
s_player_combi = []; s_player_combi = [];
@@ -417,7 +417,7 @@ dayz_selectedDoor = objNull;
PVDZE_veh_Publish = []; // for vehicle traders PVDZE_veh_Publish = []; // for vehicle traders
PVDZE_obj_Trade = []; // For all traders increment qty PVDZE_obj_Trade = []; // For all traders increment qty
PVDZE_plr_TradeMenu = []; // For all traders PVDZE_plr_TradeMenu = []; // For all traders
PVDZE_plr_DeathB = []; PVDZE_plr_DeathB = [];
//DayZ settings //DayZ settings
@@ -505,6 +505,9 @@ if(isNil "DZE_HeliLift") then {
if(isNil "DZE_DamageBeforeMaint") then { if(isNil "DZE_DamageBeforeMaint") then {
DZE_DamageBeforeMaint = 0.09; DZE_DamageBeforeMaint = 0.09;
}; };
if(isNil "DZE_StaticConstructionCount") then {
DZE_StaticConstructionCount = 0;
};
// needed on server // needed on server
@@ -563,7 +566,7 @@ if(isServer) then {
dayz_players = []; dayz_players = [];
dead_bodyCleanup = []; dead_bodyCleanup = [];
needUpdate_objects = []; needUpdate_objects = [];
DZE_DYN_AntiStuck = 0; DZE_DYN_AntiStuck = 0;
DZE_DYN_AntiStuck2nd = 0; DZE_DYN_AntiStuck2nd = 0;
DZE_DYN_AntiStuck3rd = 0; DZE_DYN_AntiStuck3rd = 0;
@@ -581,38 +584,38 @@ if(isServer) then {
if(isNil "DZE_BackpackGuard") then { if(isNil "DZE_BackpackGuard") then {
DZE_BackpackGuard = true; DZE_BackpackGuard = true;
}; };
if(isNil "DZE_CleanNull") then { if(isNil "DZE_CleanNull") then {
DZE_CleanNull = false; DZE_CleanNull = false;
}; };
DZE_safeVehicle = ["ParachuteWest","ParachuteC"]; DZE_safeVehicle = ["ParachuteWest","ParachuteC"];
}; };
if(!isDedicated) then { if(!isDedicated) then {
dayz_spawnPos = getPosATL player; dayz_spawnPos = getPosATL player;
dayz_buildingMonitor = []; //Buildings to check dayz_buildingMonitor = []; //Buildings to check
dayz_bodyMonitor = []; dayz_bodyMonitor = [];
// weather control var // weather control var
zeroPreviousWeather = [0,0,[0,0],0]; zeroPreviousWeather = [0,0,[0,0],0];
zeroCurrentWeather = [0,0,[0,0],0]; zeroCurrentWeather = [0,0,[0,0],0];
if (DZE_MissionLootTable) then { if (DZE_MissionLootTable) then {
dayz_baseTypes = getArray (missionConfigFile >> "CfgBuildingLoot" >> "Default" >> "zombieClass"); dayz_baseTypes = getArray (missionConfigFile >> "CfgBuildingLoot" >> "Default" >> "zombieClass");
} else { } else {
dayz_baseTypes = getArray (configFile >> "CfgBuildingLoot" >> "Default" >> "zombieClass"); dayz_baseTypes = getArray (configFile >> "CfgBuildingLoot" >> "Default" >> "zombieClass");
}; };
//temperature variables //temperature variables
dayz_temperatur = 36; //TeeChange dayz_temperatur = 36; //TeeChange
dayz_temperaturnormal = 36; //TeeChange dayz_temperaturnormal = 36; //TeeChange
dayz_temperaturmax = 42; //TeeChange dayz_temperaturmax = 42; //TeeChange
dayz_temperaturmin = 27; //TeeChange dayz_temperaturmin = 27; //TeeChange
//player special variables //player special variables
dayZ_lastPlayerUpdate = 0; dayZ_lastPlayerUpdate = 0;
dayZ_everyonesTents = []; dayZ_everyonesTents = [];
@@ -689,7 +692,7 @@ if(!isDedicated) then {
if(isNil "DZE_HaloJump") then { if(isNil "DZE_HaloJump") then {
DZE_HaloJump = true; DZE_HaloJump = true;
}; };
if(isNil "DZE_AntiWallLimit") then { if(isNil "DZE_AntiWallLimit") then {
DZE_AntiWallLimit = 1; DZE_AntiWallLimit = 1;
}; };
@@ -699,14 +702,14 @@ if(!isDedicated) then {
if(isNil "DZE_R3F_WEIGHT") then { if(isNil "DZE_R3F_WEIGHT") then {
DZE_R3F_WEIGHT = true; DZE_R3F_WEIGHT = true;
}; };
DZE_AntiWallCounter = 0; DZE_AntiWallCounter = 0;
DZE_FreshSpawn = false; DZE_FreshSpawn = false;
DZE_myHaloVehicle = objNull; DZE_myHaloVehicle = objNull;
DZE_Friends = []; DZE_Friends = [];
DZE_CanPickup = true; DZE_CanPickup = true;