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

RC6

Browse Source
This commit is contained in:
[VB]AWOL
2013-10-13 13:15:27 -05:00
parent 2a38e3fdd0
commit c12818f6f9
10 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/Configs/CfgVehicles/LAND/Gaz_Vodnik.hpp
View File

@@ -855,7 +855,7 @@ class AnimationSources : AnimationSources
class GAZ_Vodnik_DZE : GAZ_Vodnik_HMG
{
model = "\ca\wheeled2\GAZ39371\GAZ39371_Vodnik.p3d";
displayname = "Vodnik (2xPK) DZ";
displayname = "Vodnik (2xPK) AL";
picture = "\Ca\wheeled2\data\UI\Picture_GAZ39371_CA.paa";
Icon = "\Ca\wheeled2\data\UI\Icon_GAZ39371_CA.paa";
mapSize = 6.5;

2
SQF/dayz_code/Configs/CfgVehicles/LAND/LandRover.hpp
View File

@@ -374,7 +374,7 @@ class LandRover_Special_CZ_EP1_DZE: LandRover_Base
crew = "";
typicalCargo[] = {};
model = "\ca\wheeled_E\LR\LR_Special";
displayname = "Military Offroad Special DZ";
displayname = "Military Offroad Special AL";
Picture = "\CA\wheeled_e\Data\UI\Picture_lr_special_CA.paa";
Icon = "\CA\wheeled_e\Data\UI\Icon_lr_special_CA.paa";
transportSoldier = 2;

2
SQF/dayz_code/Configs/CfgVehicles/LAND/Offroad_DSHKM.hpp
View File

@@ -298,7 +298,7 @@ class Offroad_DSHKM_Gue_DZE: Offroad_DSHKM_base
side = 2;
faction = "GUE";
crew = "";
typicalCargo[] = {""};
typicalCargo[] = {};
displayName = "Off-road (DShKM) AL";
hiddenSelectionsTextures[] = {"\ca\wheeled\hilux_armed\data\coyota_trup4_CO.paa"};
class Damage

1
SQF/dayz_code/Configs/cfgVehicles.hpp
View File

@@ -444,6 +444,7 @@ class CfgVehicles {
#include "CfgVehicles\LAND\Gaz_Vodnik.hpp"
#include "CfgVehicles\LAND\ArmoredSUV.hpp"
#include "CfgVehicles\LAND\Pickup_PK.hpp"
#include "CfgVehicles\LAND\Offroad_DSHKM.hpp"
// SEA
// #include "CfgVehicles\SEA\RHIB.hpp"

2
SQF/dayz_code/init/variables.sqf
View File

@@ -510,6 +510,8 @@ if(isServer) then {
dayz_flyMonitor = []; //used for monitor flies
DZE_FlyWorkingSet = [];
DZE_safeVehicle = ["ParachuteWest","ParachuteC"];
};

BIN
SQF/dayz_epoch/models/debug_box.p3d
View File

Binary file not shown.

8
SQF/dayz_server/compile/server_playerSetup.sqf
View File

@@ -1,6 +1,6 @@
private ["_characterID","_playerObj","_playerID","_dummy","_worldspace","_state","_doLoop","_key","_primary","_medical","_stats","_humanity","_lastinstance","_friendlies","_randomSpot","_position","_debug","_distance","_hit","_fractures","_score","_findSpot","_pos","_isIsland","_w","_clientID","_spawnMC"];
diag_log ("SETUP: attempted with " + str(_this));
//diag_log ("SETUP: attempted with " + str(_this));
_characterID = _this select 0;
_playerObj = _this select 1;
@@ -52,7 +52,7 @@ if (isNull _playerObj or !isPlayer _playerObj) exitWith {
};
//Wait for HIVE to be free
diag_log ("SETUP: RESULT: Successful with " + str(_primary));
//diag_log ("SETUP: RESULT: Successful with " + str(_primary));
_medical = _primary select 1;
_stats = _primary select 2;
@@ -95,7 +95,7 @@ if (count _worldspace > 0) then {
_randomSpot = true;
};
diag_log ("LOGIN: Location: " + str(_worldspace) + " doRnd?: " + str(_randomSpot));
//diag_log ("LOGIN: Location: " + str(_worldspace) + " doRnd?: " + str(_randomSpot));
//set medical values
if (count _medical > 0) then {
@@ -248,7 +248,7 @@ _clientID publicVariableClient "dayzPlayerLogin2";
_playerObj setVariable ["lastTime",time];
//_playerObj setVariable ["model_CHK",typeOf _playerObj];
diag_log ("LOGIN PUBLISHING: " + str(_playerObj) + " Type: " + (typeOf _playerObj));
//diag_log ("LOGIN PUBLISHING: " + str(_playerObj) + " Type: " + (typeOf _playerObj));
PVDZE_plr_Login = null;
PVDZE_plr_Login2 = null;

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

@@ -21,7 +21,7 @@ _isInVehicle = vehicle _character != _character;
_timeSince = 0;
_humanity = 0;
diag_log ("DW_DEBUG: (isnil _characterID): " + str(isnil "_characterID"));
//diag_log ("DW_DEBUG: (isnil _characterID): " + str(isnil "_characterID"));
if (_character isKindOf "Animal") exitWith {
diag_log ("ERROR: Cannot Sync Character " + (name _character) + " is an Animal class");
@@ -182,7 +182,7 @@ if (_characterID != "0") then {
//Wait for HIVE to be free
//Send request
_key = format["CHILD:201:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:",_characterID,_playerPos,_playerGear,_playerBackp,_medical,false,false,_kills,_headShots,_distanceFoot,_timeSince,_currentState,_killsH,_killsB,_currentModel,_humanity];
diag_log ("HIVE: WRITE: "+ str(_key) + " / " + _characterID);
//diag_log ("HIVE: WRITE: "+ str(_key) + " / " + _characterID);
_key call server_hiveWrite;
};
};

2
SQF/dayz_server/system/server_cleanup.fsm
View File

@@ -295,7 +295,7 @@ class FSM
"" \n
"//Check for hackers" \n
" {" \n
" if(vehicle _x != _x && !(vehicle _x in _safety) && (isPlayer _x) && ((typeOf vehicle _x) != ""ParachuteWest"") or (typeOf vehicle _x) != ""ParachuteC"")) then {" \n
" if(vehicle _x != _x && !(vehicle _x in _safety) && (isPlayer _x) && !((typeOf vehicle _x) in DZE_safeVehicle)) then {" \n
" diag_log (""CLEANUP: KILLING A HACKER "" + (name _x) + "" "" + str(_x) + "" IN "" + (typeOf vehicle _x));" \n
" (vehicle _x) setDamage 1;" \n
" _x setDamage 1;" \n

2
Server Files/Battleye/remoteexec.txt
View File

@@ -1,4 +1,4 @@
5 "" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" !="[this] spawn BIS_Effects_AirDestruction" !="spawn BIS_Effects_AirDestructionStage2" !="_this spawn fnc_plyrHit;"
5 "" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" !="[this] spawn BIS_Effects_AirDestruction" !="spawn BIS_Effects_AirDestructionStage2" !="]spawn BIS_Effects_AirDestructionStage2" !="_this spawn fnc_plyrHit;"
1="[this] spawn BIS_Effects_AirDestruction"
// ban for empty patterns, such: