From c284754aceceb88f55eccfd11dc5ef7792be7c04 Mon Sep 17 00:00:00 2001 From: Skaronator Date: Sun, 23 Feb 2014 01:20:42 +0100 Subject: [PATCH 1/3] Less Scripts + Fix RPT Error if nothing is nearby --- SQF/dayz_code/compile/object_removeNearby.sqf | 15 +++++++++++++++ SQF/dayz_code/compile/object_removeNet.sqf | 13 ------------- SQF/dayz_code/compile/object_removeTankTrap.sqf | 13 ------------- SQF/dayz_code/init/compiles.sqf | 15 +++++++++------ 4 files changed, 24 insertions(+), 32 deletions(-) create mode 100644 SQF/dayz_code/compile/object_removeNearby.sqf delete mode 100644 SQF/dayz_code/compile/object_removeNet.sqf delete mode 100644 SQF/dayz_code/compile/object_removeTankTrap.sqf diff --git a/SQF/dayz_code/compile/object_removeNearby.sqf b/SQF/dayz_code/compile/object_removeNearby.sqf new file mode 100644 index 000000000..f4c4d2edc --- /dev/null +++ b/SQF/dayz_code/compile/object_removeNearby.sqf @@ -0,0 +1,15 @@ +private ["_nearByObjects","_targetObject"]; + +_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; +_canDo = (!r_drag_sqf and !r_player_unconscious and !_onLadder); + +_nearByObjects = nearestObjects _this; + +if (count _nearByObjects == 0) exitWith { + cutText [(localize "str_epoch_player_8"), "PLAIN DOWN"]; +}; + +_targetObject = _nearByObjects select 0; +if (!isNull _targetObject and _canDo) then { + [0,1,2,_targetObject] spawn player_removeObject; +}; diff --git a/SQF/dayz_code/compile/object_removeNet.sqf b/SQF/dayz_code/compile/object_removeNet.sqf deleted file mode 100644 index 26d9b0ff7..000000000 --- a/SQF/dayz_code/compile/object_removeNet.sqf +++ /dev/null @@ -1,13 +0,0 @@ -private ["_nearNets","_nearNet"]; - -_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -_canDo = (!r_drag_sqf and !r_player_unconscious and !_onLadder); - -_nearNets = nearestObjects [player, ["DesertLargeCamoNet","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ"], 5]; -_nearNet = _nearNets select 0; - -if (!isNull _nearNet and _canDo) then { - [0,1,2,_nearNet] spawn player_removeObject; -} else { - cutText [(localize "str_epoch_player_8"), "PLAIN DOWN"]; -}; diff --git a/SQF/dayz_code/compile/object_removeTankTrap.sqf b/SQF/dayz_code/compile/object_removeTankTrap.sqf deleted file mode 100644 index 5e4086930..000000000 --- a/SQF/dayz_code/compile/object_removeTankTrap.sqf +++ /dev/null @@ -1,13 +0,0 @@ -private ["_nearTankTraps","_nearTankTrap"]; - -_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -_canDo = (!r_drag_sqf and !r_player_unconscious and !_onLadder); - -_nearTankTraps = nearestObjects [player, ["Hedgehog_DZ"], 1]; -_nearTankTrap = _nearTankTraps select 0; - - if (!isNull _nearTankTrap and _canDo) then { - [0,1,2,_nearTankTrap] spawn player_removeObject; - } else { - cutText [(localize "STR_EPOCH_ACTIONS_14"), "PLAIN DOWN"]; - }; diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 2d5be8356..09d038553 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -33,8 +33,15 @@ if (!isDedicated) then { player_unlockVault = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockVault.sqf"; player_removeObject = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\remove.sqf"; - player_removeNet = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_removeNet.sqf"; - player_removeTankTrap = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_removeTankTrap.sqf"; + player_removeNearby = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_removeNearby.sqf"; + + player_removeTankTrap = { + [player, ["Hedgehog_DZ"], 1] call player_removeNearby; + }; + player_removeNet = { + [player, ["DesertLargeCamoNet","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ"], 5] call player_removeNearby; + }; + player_unlockDoor = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockDoor.sqf"; player_changeCombo = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_changeCombo.sqf"; @@ -43,10 +50,6 @@ if (!isDedicated) then { // control_zombieAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\control_zombieAgent.sqf"; player_updateGui = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_updateGui.sqf"; player_crossbowBolt = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_crossbowBolt.sqf"; - //spawn_flies = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\spawn_flies.sqf"; - // stream_locationFill = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\stream_locationFill.sqf"; - // stream_locationDel = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\stream_locationDel.sqf"; - // stream_locationCheck = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\stream_locationCheck.sqf"; player_music = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_music.sqf"; //Used to generate ambient music player_login = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_login.sqf"; //Used to generate ambient music player_death = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_death.sqf"; From 61e86abe4c39b793df44e773907702bba2680b84 Mon Sep 17 00:00:00 2001 From: Skaronator Date: Sun, 23 Feb 2014 01:29:56 +0100 Subject: [PATCH 2/3] Cleanup Compiles a bit --- .../compile/building_spawnZombies.sqf | 3 +- SQF/dayz_code/compile/local_setFuel.sqf | 5 -- SQF/dayz_code/compile/player_spawnCheck.sqf | 1 - SQF/dayz_code/compile/zombie_initialize.sqf | 5 +- SQF/dayz_code/init/compiles.sqf | 90 ++++++++----------- 5 files changed, 39 insertions(+), 65 deletions(-) delete mode 100644 SQF/dayz_code/compile/local_setFuel.sqf diff --git a/SQF/dayz_code/compile/building_spawnZombies.sqf b/SQF/dayz_code/compile/building_spawnZombies.sqf index 0c9298ae7..376e978fe 100644 --- a/SQF/dayz_code/compile/building_spawnZombies.sqf +++ b/SQF/dayz_code/compile/building_spawnZombies.sqf @@ -59,5 +59,4 @@ if (_canLoot) then { }; dayz_buildingMonitor set [count dayz_buildingMonitor,_obj]; -}; -//["building_spawnZombies.sqf",(diag_tickTime - _t1)] call fnc_dump; \ No newline at end of file +}; \ No newline at end of file diff --git a/SQF/dayz_code/compile/local_setFuel.sqf b/SQF/dayz_code/compile/local_setFuel.sqf deleted file mode 100644 index d6f48903e..000000000 --- a/SQF/dayz_code/compile/local_setFuel.sqf +++ /dev/null @@ -1,5 +0,0 @@ -private["_qty","_vehicle"]; -_vehicle = _this select 0; -_qty = _this select 1; - -_vehicle setFuel _qty; \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_spawnCheck.sqf b/SQF/dayz_code/compile/player_spawnCheck.sqf index 02144ffb6..97959c369 100644 --- a/SQF/dayz_code/compile/player_spawnCheck.sqf +++ b/SQF/dayz_code/compile/player_spawnCheck.sqf @@ -152,4 +152,3 @@ if (_nearbyCount < 1) exitwith }; }; } forEach _nearby; -// ["player_spawnCheck.sqf",(diag_tickTime - _t1)] call fnc_dump; diff --git a/SQF/dayz_code/compile/zombie_initialize.sqf b/SQF/dayz_code/compile/zombie_initialize.sqf index 520062f4a..6f147f61c 100644 --- a/SQF/dayz_code/compile/zombie_initialize.sqf +++ b/SQF/dayz_code/compile/zombie_initialize.sqf @@ -1,8 +1,9 @@ private ["_unit","_position"]; _unit = _this select 0; -if (isServer) then { +if (isServer) exitWith { _unit addEventHandler ["local", {_this call zombie_findOwner}]; -} else { +/*} else { _position = getPosATL _unit; _unit addEventHandler ["local", {_this call eh_zombieInit}]; +*/ }; \ No newline at end of file diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 09d038553..f4925eea0 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -44,46 +44,46 @@ if (!isDedicated) then { player_unlockDoor = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockDoor.sqf"; - player_changeCombo = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_changeCombo.sqf"; + player_changeCombo = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_changeCombo.sqf"; player_lockVault = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_lockVault.sqf"; - // control_zombieAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\control_zombieAgent.sqf"; + // control_zombieAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\control_zombieAgent.sqf"; player_updateGui = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_updateGui.sqf"; - player_crossbowBolt = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_crossbowBolt.sqf"; + player_crossbowBolt = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_crossbowBolt.sqf"; player_music = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_music.sqf"; //Used to generate ambient music player_login = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_login.sqf"; //Used to generate ambient music player_death = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_death.sqf"; - player_switchModel = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_switchModel.sqf"; - player_checkStealth = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_checkStealth.sqf"; + player_switchModel = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_switchModel.sqf"; + player_checkStealth = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_checkStealth.sqf"; world_sunRise = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_sunRise.sqf"; - world_surfaceNoise = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_surfaceNoise.sqf"; - player_humanityMorph = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_humanityMorph.sqf"; - player_throwObject = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_throwObject.sqf"; - player_alertZombies = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_alertZombies.sqf"; - player_fireMonitor = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\fire_monitor.sqf"; + world_surfaceNoise = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_surfaceNoise.sqf"; + player_humanityMorph = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_humanityMorph.sqf"; + player_throwObject = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_throwObject.sqf"; + player_alertZombies = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_alertZombies.sqf"; + player_fireMonitor = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\fire_monitor.sqf"; fn_gearMenuChecks = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_gearMenuChecks.sqf"; //Objects object_roadFlare = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_roadFlare.sqf"; object_setpitchbank = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_setpitchbank.sqf"; - object_monitorGear = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_monitorGear.sqf"; + object_monitorGear = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_monitorGear.sqf"; local_roadDebris = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_roadDebris.sqf"; //Zombies - zombie_findTargetAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_findTargetAgent.sqf"; + zombie_findTargetAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_findTargetAgent.sqf"; zombie_loiter = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_loiter.sqf"; //Server compile, used for loiter behaviour zombie_generate = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_generate.sqf"; //Server compile, used for loiter behaviour - wild_spawnZombies = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\wild_spawnZombies.sqf"; //Server compile, used for loiter behaviour + wild_spawnZombies = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\wild_spawnZombies.sqf"; //Server compile, used for loiter behaviour pz_attack = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\pzombie\pz_attack.sqf"; // - dog_findTargetAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\dog_findTargetAgent.sqf"; + dog_findTargetAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\dog_findTargetAgent.sqf"; //actions - player_countmagazines = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_countmagazines.sqf"; - player_addToolbelt = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_addToolbelt.sqf"; + player_countmagazines = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_countmagazines.sqf"; + player_addToolbelt = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_addToolbelt.sqf"; player_copyKey = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_copyKey.sqf"; player_reloadMag = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_reloadMags.sqf"; player_loadCrate = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_loadCrate.sqf"; @@ -96,28 +96,28 @@ if (!isDedicated) then { player_fillWater = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\water_fill.sqf"; player_makeFire = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_makefire.sqf"; //player_chopWood = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_chopWood.sqf"; - player_harvestPlant = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_harvestPlant.sqf"; + player_harvestPlant = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_harvestPlant.sqf"; player_goFishing = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_goFishing.sqf"; player_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build.sqf"; - player_wearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_wearClothes.sqf"; + player_wearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_wearClothes.sqf"; //player_dropWeapon = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_dropWeapon.sqf"; //playerpip_setTrap = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_setTrap.sqf"; object_pickup = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_pickup.sqf"; - player_flipvehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_flipvehicle.sqf"; + player_flipvehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_flipvehicle.sqf"; player_sleep = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_sleep.sqf"; //player_mineOre = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_mineOre.sqf"; player_antiWall = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_antiWall.sqf"; player_deathBoard = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\list_playerDeathsAlt.sqf"; - player_plotPreview = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_showPlotRadius.sqf"; - player_upgradeVehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_upgradeVehicle.sqf"; + player_plotPreview = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_showPlotRadius.sqf"; + player_upgradeVehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_upgradeVehicle.sqf"; //ui player_selectSlot = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\ui_selectSlot.sqf"; player_gearSync = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_gearSync.sqf"; player_gearSet = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_gearSet.sqf"; ui_changeDisplay = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\ui_changeDisplay.sqf"; - ui_gear_sound = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\ui_gear_sound.sqf"; + ui_gear_sound = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\ui_gear_sound.sqf"; //System player_monitor = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\player_monitor.sqf"; @@ -146,6 +146,10 @@ if (!isDedicated) then { _b }; + dayz_HungerThirst = { + dayz_hunger = dayz_hunger + (_this select 0); + dayz_thirst = dayz_thirst + (_this select 1); + }; epoch_totalCurrency = { // total currency @@ -179,24 +183,6 @@ if (!isDedicated) then { epoch_returnChange = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\epoch_returnChange.sqf"; // usage [["partinclassname",4]] call epoch_returnChange; - - - - // - RunTime = 0; - TotalRuns = 0; - - fnc_dump = { - private["_code","_benchmark","_averageRunTime"]; - _code = _this select 0; - _benchmark = _this select 1; - - RunTime = RunTime + _benchmark; - TotalRuns = TotalRuns + 1; - _averageRunTime = RunTime/TotalRuns; - - diag_log format["%1 - %2 (%3 / %4)",_code,_benchmark,_averageRunTime,TotalRuns]; - }; dayz_losChance = { private["_agent","_maxDis","_dis","_val","_maxExp","_myExp"]; _agent = _this select 0; @@ -258,13 +244,6 @@ if (!isDedicated) then { _cantSee }; - eh_zombieInit = { - private["_unit","_pos"]; - //_unit = _this select 0; - //_pos = getPosATL _unit; - //_id = [_pos,_unit] execFSM "\z\AddOns\dayz_code\system\zombie_agent.fsm"; - }; - dayz_equipCheck = { private ["_empty", "_needed","_diff","_success"]; _config = _this; @@ -496,15 +475,14 @@ if (!isDedicated) then { //fnc_vehicleEventHandler = compile preprocessFileLineNumbers "\z\addons\dayz_code\init\vehicle_init.sqf"; //Initialize vehicle fnc_inString = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_inString.sqf"; fnc_isInsideBuilding = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_isInsideBuilding.sqf"; //_isInside = [_unit,_building] call fnc_isInsideBuilding; - fnc_isInsideBuilding2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_isInsideBuilding2.sqf"; //_isInside = [_unit,_building] call fnc_isInsideBuilding; - fnc_isInsideBuilding3 = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_isInsideBuilding3.sqf"; //_isInside = [_unit,_building] call fnc_isInsideBuilding; + fnc_isInsideBuilding2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_isInsideBuilding2.sqf"; //_isInside = [_unit,_building] call fnc_isInsideBuilding2; + fnc_isInsideBuilding3 = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_isInsideBuilding3.sqf"; //_isInside = [_unit,_building] call fnc_isInsideBuilding3; dayz_zombieSpeak = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_speak.sqf"; //Used to generate random speech for a unit vehicle_getHitpoints = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\vehicle_getHitpoints.sqf"; local_gutObject = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_gutObject.sqf"; //Generated on the server (or local to unit) when gutting an object local_lockUnlock = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_lockUnlock.sqf"; //When vehicle is local to unit perform locking vehicle local_gutObjectZ = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_gutObjectZ.sqf"; //Generated on the server (or local to unit) when gutting an object local_zombieDamage = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_damageHandlerZ.sqf"; //Generated by the client who created a zombie to track damage - local_setFuel = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_setFuel.sqf"; //Generated when someone refuels a vehicle local_eventKill = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_eventKill.sqf"; //Generated when something is killed //player_weaponCheck = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_weaponCheck.sqf"; //Run by the player or server to monitor whether they have picked up a new weapon curTimeStr = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_curTimeStr.sqf"; @@ -520,11 +498,13 @@ if (!isDedicated) then { spawn_loot = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\spawn_loot.sqf"; // player_projectileNear = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_projectileNear.sqf"; - dayz_HungerThirst = { - dayz_hunger = dayz_hunger + (_this select 0); - dayz_thirst = dayz_thirst + (_this select 1); + local_setFuel = { + private["_qty","_vehicle"]; + _vehicle = ; + _qty = _this select 1; + _vehicle setFuel _qty; }; - + // better item counting by maca134 - https://github.com/vbawol/DayZ-Epoch/issues/916 MC_item_spaces = { private ["_unit", "_item", "_slotsEmpty", "_slotsItem", "_slotsAfterAdd", "_c", "_space"]; @@ -597,4 +577,4 @@ if (!isDedicated) then { eh_localCleanup = {}; }; -initialized = true; +initialized = true; \ No newline at end of file From 0b1779baeffd17692ba603aaffd78fb7530f0b8c Mon Sep 17 00:00:00 2001 From: Skaronator Date: Sun, 23 Feb 2014 01:33:17 +0100 Subject: [PATCH 3/3] Cleanup some scripts --- SQF/dayz_code/compile/player_login.sqf | 6 ------ SQF/dayz_code/compile/spawn_flies.sqf | 6 ------ SQF/dayz_code/compile/zombie_initialize.sqf | 9 --------- SQF/dayz_code/init/compiles.sqf | 20 +++++++++++++++++--- 4 files changed, 17 insertions(+), 24 deletions(-) delete mode 100644 SQF/dayz_code/compile/player_login.sqf delete mode 100644 SQF/dayz_code/compile/spawn_flies.sqf delete mode 100644 SQF/dayz_code/compile/zombie_initialize.sqf diff --git a/SQF/dayz_code/compile/player_login.sqf b/SQF/dayz_code/compile/player_login.sqf deleted file mode 100644 index 7259e6775..000000000 --- a/SQF/dayz_code/compile/player_login.sqf +++ /dev/null @@ -1,6 +0,0 @@ -private ["_unit","_detail"]; -_unit = _this select 0; -_detail = _this select 1; -if(_unit == getPlayerUID player) then { - player setVariable["publish",_detail]; -}; \ No newline at end of file diff --git a/SQF/dayz_code/compile/spawn_flies.sqf b/SQF/dayz_code/compile/spawn_flies.sqf deleted file mode 100644 index 641ca1c91..000000000 --- a/SQF/dayz_code/compile/spawn_flies.sqf +++ /dev/null @@ -1,6 +0,0 @@ -private["_body","_id","_position"]; -_body = _this; -_position = getPosATL _body; -_id = [_position,0.1,1.5] call bis_fnc_flies; -//_id setVariable ["body",_body]; -//dayz_flyMonitor set[count dayz_flyMonitor, _id]; \ No newline at end of file diff --git a/SQF/dayz_code/compile/zombie_initialize.sqf b/SQF/dayz_code/compile/zombie_initialize.sqf deleted file mode 100644 index 6f147f61c..000000000 --- a/SQF/dayz_code/compile/zombie_initialize.sqf +++ /dev/null @@ -1,9 +0,0 @@ -private ["_unit","_position"]; -_unit = _this select 0; -if (isServer) exitWith { - _unit addEventHandler ["local", {_this call zombie_findOwner}]; -/*} else { - _position = getPosATL _unit; - _unit addEventHandler ["local", {_this call eh_zombieInit}]; -*/ -}; \ No newline at end of file diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index f4925eea0..32eb022be 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -42,6 +42,14 @@ if (!isDedicated) then { [player, ["DesertLargeCamoNet","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ"], 5] call player_removeNearby; }; + player_login = { + private ["_unit","_detail"]; + _unit = _this select 0; + _detail = _this select 1; + if(_unit == getPlayerUID player) then { + player setVariable["publish",_detail]; + }; + }; player_unlockDoor = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockDoor.sqf"; player_changeCombo = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_changeCombo.sqf"; @@ -51,7 +59,6 @@ if (!isDedicated) then { player_updateGui = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_updateGui.sqf"; player_crossbowBolt = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_crossbowBolt.sqf"; player_music = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_music.sqf"; //Used to generate ambient music - player_login = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_login.sqf"; //Used to generate ambient music player_death = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_death.sqf"; player_switchModel = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_switchModel.sqf"; player_checkStealth = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_checkStealth.sqf"; @@ -458,7 +465,7 @@ if (!isDedicated) then { fnc_buildWeightedArray = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_buildWeightedArray.sqf"; //Checks which actions for nearby casualty fnc_usec_damageVehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_damageHandlerVehicle.sqf"; //Event handler run on damage - zombie_initialize = compile preprocessFileLineNumbers "\z\addons\dayz_code\init\zombie_init.sqf"; + // object_vehicleKilled = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_vehicleKilled.sqf"; //Event handler run on damage object_setHitServer = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_setHitServer.sqf"; //process the hit as a NORMAL damage (useful for persistent vehicles) object_setFixServer = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_setFixServer.sqf"; //process the hit as a NORMAL damage (useful for persistent vehicles) @@ -504,7 +511,14 @@ if (!isDedicated) then { _qty = _this select 1; _vehicle setFuel _qty; }; - + zombie_initialize = { + private ["_unit","_position"]; + _unit = _this select 0; + if (isServer) then { + _unit addEventHandler ["local", {_this call zombie_findOwner}]; + }; + }; + // better item counting by maca134 - https://github.com/vbawol/DayZ-Epoch/issues/916 MC_item_spaces = { private ["_unit", "_item", "_slotsEmpty", "_slotsItem", "_slotsAfterAdd", "_c", "_space"];