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

Update public variables

Browse Source 
It makes no sense to rename the identical DayZ PVs to have an E in their
name. I don't see any good reason it was done in the first place. All it
accomplishes is breaking script compatibility between the two mods and
requiring different publicvariable.txt filters. The only time it makes
sense is for custom Epoch variables that aren't used in vanilla.

All admins have to do to update custom scripts is swap the names
according to the change log.

Note I've submitted a pull request to replace PVDZ_veh_Save with
PVDZ_obj_Save in official too because they are duplicates.
This commit is contained in:
ebaydayz
2016-03-18 21:39:22 -04:00
parent 6a6db58291
commit 4bd9a9aa0b
95 changed files with 420 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
SQF/dayz_server/NOTE.txt
View File

@@ -5,9 +5,6 @@ NEW VARS IN SENDTOCLIENT:
OpenTarget
PVCDZ_OpenTarget_Reset
GutBody
PVCDZ_obj_GutBody
SetEngineState
PVCDZ_veh_engineSwitch
@@ -17,23 +14,5 @@ PVCDZ_plr_Legs
Antibiotics
PVCDZ_hlt_AntiB
dayzSetDate
dayzSetDate
Transfuse_completed
PVCDZ_hlt_Transfuse_completed
CHANGE NEW VAR/PV NAMES --> OLD
PVCDZ_veh_SH --> PVCDZE_vehSH
SetFuel --> SFuel
PVCDZ_veh_SetFuel --> PVDZE_veh_SFuel
PVCDZ_obj_HideBody --> PVDZE_plr_HideBody
PVCDZ_plr_Humanity --> PVDZE_plr_HumanityChange
PVCDZ_hlt_Transfuse --> usecTransfuse
PVCDZ_hlt_PainK--> usecPainK
PVCDZ_hlt_Morphine --> usecMorphine
PVCDZ_hlt_Epi --> usecEpi
PVCDZ_hlt_Bandage --> usecBandage
dayzPlayerLogin --> PVCDZ_plr_PlayerAccepted
PVCDZ_plr_PlayerAccepted --> PVCDZE_plr_PlayerAccepted
PVCDZ_hlt_Transfuse_completed

1
SQF/dayz_server/compile/server_playerLogin.sqf
View File

@@ -186,7 +186,6 @@ if (worldName == "chernarus") then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
//dayzPlayerLogin = [_charID,_inventory,_backpack,_survival,_isNew,dayz_versionNo,_model,_isHiveOk,_newPlayer,_isInfected];
PVCDZ_plr_Login = [_charID,_inventory,_backpack,_survival,_isNew,dayz_versionNo,_model,_isHiveOk,_newPlayer,_isInfected];
#ifdef DZE_SERVER_DEBUG
diag_log format["%1, %2, %3, %4, %5, %6, %7, %8, %9, %10",_charID,_inventory,_backpack,_survival,_isNew,dayz_versionNo,_model,_isHiveOk,_newPlayer,_isInfected];

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

@@ -289,5 +289,5 @@ _playerObj setVariable ["lastTime",time];
//diag_log ("LOGIN PUBLISHING: " + str(_playerObj) + " Type: " + (typeOf _playerObj));
PVDZE_plr_Login = null;
PVDZ_plr_Login1 = null;
PVDZ_plr_Login2 = null;

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

@@ -192,7 +192,7 @@ if (_characterID != "0") then {
_currentState = [[_currentWpn,_currentAnim,_temp],_Achievements];
if(DZE_FriendlySaving) then {
// save only last/most recent 5 entrys as we only have 200 chars in db field && weapon + animation names are sometimes really long 60-70 chars.
// save only last/most recent 5 entrys as we only have 200 chars in db field and weapon + animation names are sometimes really long 60-70 chars.
_friendlies = [(_character getVariable ["friendlies",[]]),5] call array_reduceSizeReverse;
_currentState set [(count _currentState),_friendlies];
};

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

@@ -103,7 +103,7 @@ PVDZE_serverObjectMonitor set [count PVDZE_serverObjectMonitor,_object];
_selection = _x select 0;
_dam = _x select 1;
if (_selection in dayZ_explosiveParts && _dam > 0.8) then {_dam = 0.8};
[_object,_selection,_dam] call object_setFixServer;
[_object,_selection,_dam] call fnc_veh_handleRepair;
} count _array;
_object setFuel _fuel;

6
SQF/dayz_server/compile/server_spawnCrashSite.sqf
View File

@@ -88,9 +88,9 @@ while {1 == 1} do {
};
if (_spawnFire) then {
//["PVDZE_obj_Fire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll;
PVDZE_obj_Fire = [_crash,2,time,false,_fadeFire];
publicVariable "PVDZE_obj_Fire";
//["PVDZ_obj_Fire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll;
PVDZ_obj_Fire = [_crash,2,time,false,_fadeFire];
publicVariable "PVDZ_obj_Fire";
_crash setvariable ["fadeFire",_fadeFire,true];
};

62
SQF/dayz_server/eventHandlers/server_sendToClient.sqf
View File

@@ -22,14 +22,14 @@ switch (_variable) do {
};
};
case "SFuel": {
case "SetFuel": {
_vehicle = _arraytosend select 0;
_qty = _arraytosend select 1;
if (local _vehicle) then {
_vehicle setFuel _qty;
} else {
PVCDZE_veh_SetFuel = _arraytosend;
_owner publicVariableClient "PVCDZE_veh_SetFuel";
PVCDZ_veh_SetFuel = _arraytosend;
_owner publicVariableClient "PVCDZ_veh_SetFuel";
};
};
@@ -47,23 +47,23 @@ switch (_variable) do {
};
case "GutBody": {
PVCDZE_obj_GutBody = _arraytosend;
_owner publicVariableClient "PVCDZE_obj_GutBody";
PVCDZ_obj_GutBody = _arraytosend;
_owner publicVariableClient "PVCDZ_obj_GutBody";
};
case "HideBody": {
PVCDZE_plr_HideBody = _arraytosend select 0;
_owner publicVariableClient "PVCDZE_plr_HideBody";
PVCDZ_obj_HideBody = _arraytosend select 0;
_owner publicVariableClient "PVCDZ_obj_HideBody";
};
case "Humanity": {
PVDZE_plr_HumanityChange = _arraytosend;
_owner publicVariableClient "PVDZE_plr_HumanityChange";
PVCDZ_plr_Humanity = _arraytosend;
_owner publicVariableClient "PVCDZ_plr_Humanity";
};
case "PZ_BreakLegs": {
usecBreakLegs = _arraytosend;
_owner publicVariableClient "usecBreakLegs";
PVCDZ_plr_Legs = _arraytosend;
_owner publicVariableClient "PVCDZ_plr_Legs";
};
case "Bleed": {
@@ -71,26 +71,21 @@ switch (_variable) do {
_owner publicVariableClient "PVDZ_hlt_Bleed";
};
case "PVDZE_plr_SetDate": {
PVDZE_plr_SetDate = dayz_storeTimeDate;
_owner publicVariableClient "PVDZE_plr_SetDate";
case "dayzSetDate": {
dayzSetDate = dayz_storeTimeDate;
_owner publicVariableClient "dayzSetDate";
//diag_log ("Time and date: " +str (dayz_storeTimeDate));
};
case "HideObj": {
PVDZE_obj_Hide = _arraytosend select 0;
_owner publicVariableClient "PVDZE_obj_Hide";
};
case "RoadFlare": {
PVDZE_obj_RoadFlare = _arraytosend;
_owner publicVariableClient "PVDZE_obj_RoadFlare";
PVDZ_obj_RoadFlare = _arraytosend;
_owner publicVariableClient "PVDZ_obj_RoadFlare";
};
case "Transfuse": {
usecTransfuse = _arraytosend;
_owner publicVariableClient "usecTransfuse";
PVCDZ_hlt_Transfuse = _arraytosend;
_owner publicVariableClient "PVCDZ_hlt_Transfuse";
_unit setVariable["medForceUpdate",true];
};
@@ -101,29 +96,32 @@ switch (_variable) do {
};
case "Painkiller": {
usecPainK = _arraytosend;
_owner publicVariableClient "usecPainK";
PVCDZ_hlt_PainK = _arraytosend;
_owner publicVariableClient "PVCDZ_hlt_PainK";
_unit setVariable["medForceUpdate",true];
};
case "Morphine": {
usecMorphine = _arraytosend;
_owner publicVariableClient "usecMorphine";
PVCDZ_hlt_Morphine = _arraytosend;
_owner publicVariableClient "PVCDZ_hlt_Morphine";
_unit setVariable ["hit_legs",0,false];
_unit setVariable ["hit_hands",0,false];
_unit setVariable["medForceUpdate",true];
};
case "Epinephrine": {
usecEpi = _arraytosend;
_owner publicVariableClient "usecEpi";
PVCDZ_hlt_Epi = _arraytosend;
_owner publicVariableClient "PVCDZ_hlt_Epi";
_unit setVariable["medForceUpdate",true];
};
case "Bandage": {
usecBandage = _arraytosend;
_owner publicVariableClient "usecBandage";
PVCDZ_hlt_Bandage = _arraytosend;
_owner publicVariableClient "PVCDZ_hlt_Bandage";
_unit setVariable["medForceUpdate",true];
//diag_log ("Bandage: " +str(PVCDZ_hlt_Bandage));
};
case "Antibiotics": {

9
SQF/dayz_server/init/Epoch_Init.sqf
View File

@@ -8,11 +8,6 @@ server_updateNearbyObjects = {
} count nearestObjects [_pos, dayz_updateObjects, 10];
}; */
server_handleZedSpawn = {
private["_zed"];
_zed = _this select 0;
_zed enableSimulation false;
};
/*
zombie_findOwner = {
private["_unit"];
@@ -671,8 +666,8 @@ server_timeSync = {
_date = [2012,8,2,_hour,_minute];
};
setDate _date;
PVDZE_plr_SetDate = _date;
publicVariable "PVDZE_plr_SetDate";
dayzSetDate = _date;
publicVariable "dayzSetDate";
diag_log ("TIME SYNC: Local Time set to " + str(_date));
};
};

6
SQF/dayz_server/modules/crash_spawner.sqf
View File

@@ -69,9 +69,9 @@ _num = _num * 2;
};
if (_spawnFire) then {
//["PVDZE_obj_Fire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll;
PVDZE_obj_Fire = [_crash,2,time,false,_fadeFire];
publicVariable "PVDZE_obj_Fire";
//["PVDZ_obj_Fire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll;
PVDZ_obj_Fire = [_crash,2,time,false,_fadeFire];
publicVariable "PVDZ_obj_Fire";
_crash setvariable ["fadeFire",_fadeFire,true];
};

4
SQF/dayz_server/system/scheduler/sched_sync.sqf
View File

@@ -16,8 +16,8 @@ sched_sync = {
};
setDate _date;
PVDZE_plr_SetDate = _date;
publicVariable "PVDZE_plr_SetDate";
dayzSetDate = _date;
publicVariable "dayzSetDate";
diag_log [ __FILE__, "TIME SYNC: Local Time set to:", _date, "Fullmoon:",dayz_ForcefullmoonNights, "Date given by HiveExt.dll:", _result select 1];
};

6
SQF/dayz_server/system/server_monitor.sqf
View File

@@ -35,8 +35,8 @@ if(_outcome == "PASS") then {
};
diag_log [ "TIME SYNC: Local Time set to:", _date, "Fullmoon:",dayz_ForcefullmoonNights, "Date given by HiveExt.dll:", _result select 1];
setDate _date;
PVDZE_plr_SetDate = _date;
publicVariable "PVDZE_plr_SetDate";
dayzSetDate = _date;
publicVariable "dayzSetDate";
};
// Custom Configs
@@ -263,7 +263,7 @@ if (isServer && isNil "sm_done") then {
_selection = _x select 0;
_dam = _x select 1;
if (_selection in dayZ_explosiveParts && _dam > 0.8) then {_dam = 0.8};
[_object,_selection,_dam] call object_setFixServer;
[_object,_selection,_dam] call fnc_veh_handleRepair;
} count _hitpoints;
_object setFuel _fuel;