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

fixes

Browse Source
This commit is contained in:
vbawol
2013-04-10 18:32:31 -05:00
parent dd20524793
commit 844c814cfe
4 changed files with 151 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dayz_server/compile/server_updateObject.sqf
View File

@@ -1,7 +1,7 @@
/*
[_object,_type] spawn server_updateObject;
*/
private ["_object","_type","_objectID","_uid","_lastUpdate","_needUpdate","_object_position","_object_inventory","_object_damage","_isNotOk"];
private ["_object","_type","_objectID","_uid","_lastUpdate","_needUpdate","_object_position","_object_inventory","_object_damage","_isNotOk","_counter","_removeCounter","_parachuteWest","_firstTime","_object_killed","_object_repair"];
_object = _this select 0;
_type = _this select 1;
@@ -9,6 +9,8 @@ _parachuteWest = typeOf _object == "ParachuteWest";
_isNotOk = false;
_firstTime = false;
_removeCounter = 0;
_objectID = _object getVariable ["ObjectID","0"];
_uid = _object getVariable ["ObjectUID","0"];
@@ -23,18 +25,18 @@ if (!_parachuteWest) then {
if (_objectID == "0" && _uid == "0") then
{
_object_position = getPosATL _object;
diag_log(format["Deleting object %1 with invalid ID at pos [%2,%3,%4]",
typeOf _object,
_object_position select 0,
_object_position select 1,
_object_position select 2]);
_isNotOk = true;
diag_log(format["Deleting object %1 with invalid ID at pos [%2,%3,%4]",
typeOf _object,
_object_position select 0,
_object_position select 1,
_object_position select 2]);
_isNotOk = true;
// Loop to wait it out
_counter = _object getVariable ["markedForRemoval","0"];
// Loop to wait it out
_counter = _object getVariable ["markedForRemoval","0"];
_removeCounter = _counter + 1;
_object setVariable ["markedForRemoval",(_counter + 1)];
_removeCounter = _counter + 1;
_object setVariable ["markedForRemoval",(_counter + 1)];
};
};

29
dayz_server/init/server_functions.sqf
View File

@@ -260,6 +260,8 @@ spawn_vehicles = {
_allCfgLoots = [] + (getArray (configFile >> "cfgLoot"));
_num = floor(random 4);
diag_log("DEBUG: spawing loot inside vehicle " + str(_allCfgLoots));
for "_x" from 1 to _num do {
_iClass = _allCfgLoots call BIS_fnc_selectRandom;
@@ -271,7 +273,8 @@ spawn_vehicles = {
_index = floor(random _cntWeights);
_index = _weights select _index;
_itemType = _itemTypes select _index;
_item addMagazineCargoGlobal [_itemType,1];
_veh addMagazineCargoGlobal [_itemType,1];
diag_log("DEBUG: spawed loot inside vehicle " + str(_itemType));
};
[_veh,[_dir,_objPosition],_vehicle,true,"0"] call server_publishVeh;
@@ -297,7 +300,6 @@ spawn_roadblocks = {
if ((count _position) == 2) then {
// Get position with ground
_istoomany = _position nearObjects ["All",5];
if((count _istoomany) > 0) exitWith { diag_log("DEBUG: Too many at " + str(_position)); };
@@ -307,24 +309,21 @@ spawn_roadblocks = {
_marker setMarkerShape "ICON";
_marker setMarkerType "DOT";
};
waitUntil{!isNil "BIS_fnc_selectRandom"};
_spawnveh = _WreckList call BIS_fnc_selectRandom;
if(_spawnveh == "HMMWVWreck" or _spawnveh == "UralWreck" or _spawnveh == "UAZWreck") then {
_spawnloot = "DynamicDebris";
if((_spawnveh == "HMMWVWreck") or (_spawnveh == "UralWreck") or (_spawnveh == "UAZWreck")) then {
_spawnloot = "DynamicDebrisMilitary";
} else {
_spawnloot = "DynamicDebris";
};
diag_log("DEBUG: Spawning a crashed " + _spawnveh + " with " + _spawnloot + " at " + str(_position));
_veh = createVehicle [_spawnveh,_position, [], 0, "CAN_COLLIDE"];
// Randomize placement a bit
_veh setDir round(random 360);
_veh setpos _position;
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_veh];
_veh setVariable ["ObjectID",1,true];
@@ -368,19 +367,19 @@ if(isnil "DynamicVehicleDamageHigh") then {
// Damage generator function
generate_new_damage = {
private ["_damage"];
_damage = (random ((DynamicVehicleDamageHigh-DynamicVehicleDamageLow)+DynamicVehicleDamageLow))/100;
_damage = (random(DynamicVehicleDamageHigh-DynamicVehicleDamageLow)+DynamicVehicleDamageLow) / 100;
_damage;
};
// Damage generator fuction
generate_exp_damage = {
private ["_damage"];
_damage = (random ((DynamicVehicleDamageHigh-DynamicVehicleDamageLow)+DynamicVehicleDamageLow))/100;
_damage = (random(DynamicVehicleDamageHigh-DynamicVehicleDamageLow)+DynamicVehicleDamageLow) / 100;
// limit this to 85% since vehicle would blow up otherwise.
if(_damage >= 0.85) then {
_damage = 0.85;
};
//if(_damage >= 0.85) then {
// _damage = 0.85;
//};
_damage;
};