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

0.67

Browse Source
This commit is contained in:
A Clark
2013-01-15 17:06:31 -06:00
parent 2735183a45
commit ed3b78384b
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dayz_code/system/player_monitor.fsm
View File

@@ -1087,7 +1087,7 @@ class FSM
"_world = toUpper(worldName); //toUpper(getText (configFile >> ""CfgWorlds"" >> (worldName) >> ""description""));" \n "_world = toUpper(worldName); //toUpper(getText (configFile >> ""CfgWorlds"" >> (worldName) >> ""description""));" \n
"_nearestCity = (nearestLocations [getPos player, [""NameCityCapital"",""NameCity"",""NameVillage"",""NameLocal""],1000] select 0);" \n "_nearestCity = (nearestLocations [getPos player, [""NameCityCapital"",""NameCity"",""NameVillage"",""NameLocal""],1000] select 0);" \n
"_town = ""Wilderness"";" \n "_town = ""Wilderness"";" \n
"if (!isNil _nearestCity) then {_town = text _nearestCity};" \n "if (!isNil ""_nearestCity"") then {_town = text _nearestCity};" \n
"" \n "" \n
"_strTime = call curTimeStr;" \n "_strTime = call curTimeStr;" \n
"_strDate = date;" \n "_strDate = date;" \n

19
dayz_server/compile/server_publishVehicle.sqf
View File

@@ -73,11 +73,11 @@ _key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, _da
diag_log ("HIVE: WRITE: "+ str(_key)); diag_log ("HIVE: WRITE: "+ str(_key));
_key call server_hiveWrite; _key call server_hiveWrite;
/*
_done = false; _done = false;
_retry = 0; _retry = 0;
// TODO: Needs major overhaul // TODO: Needs major overhaul
while {_retry < 99} do { while {_retry < 15} do {
// GET DB ID // GET DB ID
_key = format["CHILD:388:%1:",_uid]; _key = format["CHILD:388:%1:",_uid];
@@ -98,17 +98,18 @@ while {_retry < 99} do {
}; };
}; };
if(!_done) exitWith { deleteVehicle _object; diag_log("CUSTOM: failed to get id for : " + str(_uid)); }; if(!_done) exitWith { deleteVehicle _object; diag_log("CUSTOM: failed to get id for : " + str(_uid)); };
*/
// disable marker later // disable marker later
_marker = createMarker [str(_location) , _location]; //_marker = createMarker [str(_location) , _location];
_marker setMarkerShape "ICON"; //_marker setMarkerShape "ICON";
_marker setMarkerType "DOT"; //_marker setMarkerType "DOT";
_marker setMarkerText (typeOf _object); //_marker setMarkerText (typeOf _object);
_marker setMarkerColor "ColorBlue"; //_marker setMarkerColor "ColorBlue";
// try this instead of commented out ID code above // try this instead of commented out ID code above
_object setVariable ["ObjectUID", _uid, true]; // worked except vehicle pos was not saved
// _object setVariable ["ObjectUID", _uid, true];
_object setVariable ["lastUpdate",time]; _object setVariable ["lastUpdate",time];
_object setVariable ["CharacterID", _characterID, true]; _object setVariable ["CharacterID", _characterID, true];

13
dayz_server/init/server_functions.sqf
View File

@@ -322,13 +322,10 @@ spawn_roadblocks = {
if((count _istoomany) > 0) exitWith { diag_log("DEBUG: Too many at " + str(_position)); }; if((count _istoomany) > 0) exitWith { diag_log("DEBUG: Too many at " + str(_position)); };
//_isRoad = isOnRoad _position; //_marker = createMarker [str(_position) , _position];
//_marker setMarkerShape "ICON";
_marker = createMarker [str(_position) , _position]; //_marker setMarkerType "DOT";
_marker setMarkerShape "ICON"; //_marker setMarkerText "ON";
_marker setMarkerType "DOT";
_marker setMarkerText "ON";
waitUntil{!isNil "BIS_fnc_selectRandom"}; waitUntil{!isNil "BIS_fnc_selectRandom"};
_spawnveh = _WreckList call BIS_fnc_selectRandom; _spawnveh = _WreckList call BIS_fnc_selectRandom;
@@ -346,7 +343,7 @@ spawn_roadblocks = {
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_veh]; dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_veh];
_veh setVariable ["ObjectID",1,true]; _veh setVariable ["ObjectID",1,true];
_num = round(random 3) + 1; _num = round(random 3);
_config = configFile >> "CfgBuildingLoot" >> _spawnloot; _config = configFile >> "CfgBuildingLoot" >> _spawnloot;
_itemType = [] + getArray (_config >> "itemType"); _itemType = [] + getArray (_config >> "itemType");
_itemChance = [] + getArray (_config >> "itemChance"); _itemChance = [] + getArray (_config >> "itemChance");