W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +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:
Zac Surplice
2013-11-26 11:32:56 +11:00
parent e61d925e61 f777294485
commit 0f920fd1bc
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ _vehiclePos = aimpos _vehicle;
_playerPos = visiblePositionASL player; _playerPos = visiblePositionASL player;
// ignore if distance is too far // ignore if distance is too far
if((_playerPos distance _vehiclePos) < 10) exitWith {}; if((_playerPos distance _vehiclePos) > 10) exitWith {};
// Important! without this we looking at the players feet this gets us torso area // Important! without this we looking at the players feet this gets us torso area
_playerPos set [2,(_playerPos select 2)+1]; _playerPos set [2,(_playerPos select 2)+1];

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

@@ -18,6 +18,8 @@ dayz_combat = 1;
if (_ammo isKindOf "Melee") exitWith { if (_ammo isKindOf "Melee") exitWith {
_unit playActionNow "GestureSwing"; _unit playActionNow "GestureSwing";
[1,1] call dayz_HungerThirst;
// harvest wood check // harvest wood check
_id = _this spawn player_harvest; _id = _this spawn player_harvest;
}; };

2
SQF/dayz_server/compile/server_playerSync.sqf
View File

@@ -197,7 +197,7 @@ if (_characterID != "0") then {
if (vehicle _character != _character) then { if (vehicle _character != _character) then {
//[vehicle _character, "position"] call server_updateObject; //[vehicle _character, "position"] call server_updateObject;
if (!(vehicle _character in needUpdate_objects)) then { if (!(vehicle _character in needUpdate_objects)) then {
diag_log format["DEBUG: Added to NeedUpdate=%1",vehicle _character]; //diag_log format["DEBUG: Added to NeedUpdate=%1",vehicle _character];
needUpdate_objects set [count needUpdate_objects, vehicle _character]; needUpdate_objects set [count needUpdate_objects, vehicle _character];
}; };
}; };

2
SQF/dayz_server/missions/DayZ_Epoch_11.Chernarus/mission.sqf
View File

@@ -1121,7 +1121,7 @@ if (true) then
_this = _group_2 createUnit ["GUE_Soldier_MG", [1623.1722, 7797.7886, 0.25734121], [], 0, "CAN_COLLIDE"]; _this = _group_2 createUnit ["GUE_Soldier_MG", [1623.1722, 7797.7886, 0.25734121], [], 0, "CAN_COLLIDE"];
_unit_108 = _this; _unit_108 = _this;
_this setDir 274.59872; _this setDir 274.59872;
_this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0; "; _this setVehicleInit "this allowDammage false; this disableAI 'FSM'; this disableAI 'MOVE'; this disableAI 'AUTOTARGET'; this disableAI 'TARGET'; this setBehaviour 'CARELESS'; this forceSpeed 0;";
_this setUnitAbility 0.60000002; _this setUnitAbility 0.60000002;
_this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour 'CARELESS'; _this forceSpeed 0;_this enableSimulation false;}; _this allowDammage false; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour 'CARELESS'; _this forceSpeed 0;_this enableSimulation false;};