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

Roll back to old dayz_objectUID2

Browse Source 
1.8.7 dayz_objectUID2 seems to generate keys that are too long for the
Epoch hive. So, we will keep the old method for now.
This commit is contained in:
ebaydayz
2016-04-13 18:41:36 -04:00
parent 3d4b15517c
commit 577892c40e
6 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SQF/dayz_code/actions/gather_zparts.sqf
View File

@@ -5,7 +5,7 @@ DZE_ActionInProgress = true;
_item = _this select 3;
_type = typeOf _item;
_hasHarvested = _item getVariable ["meatHarvested",false];
_config = configFile >> "CfgSurvival" >> "Meat" >> _type;
//_config = configFile >> "CfgSurvival" >> "Meat" >> _type;
_knifeArray = [];
player removeAction s_player_butcher;
s_player_butcher = -1;
@@ -27,7 +27,7 @@ if ((count _knifeArray > 0) && !_hasHarvested) then {
_activeKnife = _knifeArray call BIS_fnc_selectRandom;
//Get Zombie Type
_isListed = isClass _config;
//_isListed = isClass _config;
_text = getText (configFile >> "CfgVehicles" >> _type >> "displayName");
player playActionNow "Medic";
@@ -37,11 +37,11 @@ if ((count _knifeArray > 0) && !_hasHarvested) then {
_item setVariable ["meatHarvested",true,true];
_qty = if (_isListed) then {getNumber (_config >> "yield")} else {2};
_qty = 2;
if (_activeKnife == "ItemKnifeBlunt") then { _qty = round(_qty / 2); };
if (local _item) then {
[_item,_qty] spawn local_gutObject; //leave as spawn (sleeping in loops will work but can freeze the script)
[_item,_qty] spawn local_gutObjectZ; //leave as spawn (sleeping in loops will work but can freeze the script)
} else {
PVDZE_plr_GutBodyZ = [_item,_qty];
publicVariable "PVDZE_plr_GutBodyZ";

2
SQF/dayz_code/compile/local_gutObject.sqf
View File

@@ -7,7 +7,7 @@ if (local _animalbody) then {
_animalbody addMagazine _rawfoodtype;
};
if (typeOf _animalbody == "Hen") then {
if (typeOf _animalbody in ["Cock","Hen"]) then {
_amount = (floor (random 4)) + 2;
for "_x" from 1 to _amount do {
_animalbody addMagazine "equip_feathers";

4
SQF/dayz_server/compile/server_onPlayerDisconnect.sqf
View File

@@ -45,12 +45,12 @@ if (_characterID != "?") exitWith {
//Punish combat log
_timeout = _playerObj getVariable["combattimeout",0];
if ((_timeout - diag_tickTime) > 0) then {
if (_timeout >= diag_tickTime) then {
_playerObj setVariable ["NORRN_unconscious",true,true]; // Set status to unconscious
_playerObj setVariable ["unconsciousTime",150,true]; // Set knock out timer to 150 seconds
//_playerObj setVariable ["USEC_injured",true]; // Set status to bleeding
//_playerObj setVariable ["USEC_BloodQty",3000]; // Set blood to 3000
diag_log format["PLAYER COMBAT LOGGED: %1(%4) (timeout: %2) at location %3",_playerName,_timeout,_playerPos,_playerUID];
diag_log format["PLAYER COMBAT LOGGED: %1(%4) (with %2s combat time remaining) at location %3",_playerName,(_timeout - diag_tickTime),_playerPos,_playerUID];
_message = format["PLAYER COMBAT LOGGED: %1",_playerName];
[nil, nil, rTitleText, _message, "PLAIN"] call RE; // Message whole server
};

20
SQF/dayz_server/init/server_functions.sqf
View File

@@ -167,16 +167,18 @@ server_getDiff2 = {
_result
};
// 1.8.7 dayz_objectUID2 seems to generate keys that are too long for Epoch hive. Keep old method for now.
dayz_objectUID2 = {
private ["_p","_d","_key"];
_d = _this select 0;
_p = _this select 1;
_key = format ["%1%2%3%4",
abs round(10 * (_p select 0)),
abs round(10 * (_p select 1)),
abs round(100 * (_p select 2)),
abs round((_d * diag_tickTime) % 1000)
];
private["_position","_dir","_key"];
_dir = _this select 0;
_key = "";
_position = _this select 1;
{
_x = _x * 10;
if (_x < 0) then { _x = _x * -10 };
_key = _key + str(round(_x));
} count _position;
_key = _key + str(round(_dir));
// Make sure the generated key is not a duplicate
while {true} do {
if !(_key in currentObjectUIDs) exitWith {currentObjectUIDs set [count currentObjectUIDs,_key];};