player_build.sqf Enhancements and PV renames

This commit is contained in:
Zac Surplice
2013-10-07 10:56:47 +11:00
parent 340d2d2437
commit d3f7e67647
68 changed files with 301 additions and 347 deletions

View File

@@ -8,10 +8,10 @@ diag_log ("HIVE: Player Death list Request by ClientID: "+ str(_clientID));
diag_log(PlayerDeaths);
#endif
dayzPlayerDeathsResult = PlayerDeaths;
PVDZE_plr_DeathBResult = PlayerDeaths;
if(!isNull _character) then {
_clientID publicVariableClient "dayzPlayerDeathsResult";
_clientID publicVariableClient "PVDZE_plr_DeathBResult";
};
PlayerDeaths

View File

@@ -250,5 +250,5 @@ _playerObj setVariable ["lastTime",time];
diag_log ("LOGIN PUBLISHING: " + str(_playerObj) + " Type: " + (typeOf _playerObj));
dayzLogin = null;
dayzLogin2 = null;
PVDZE_plr_Login = null;
PVDZE_plr_Login2 = null;

View File

@@ -26,6 +26,6 @@ _object addMPEventHandler ["MPKilled",{_this call object_handleServerKilled;}];
// Test disabling simulation server side on buildables only.
_object enableSimulation false;
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];
PVDZE_serverObjectMonitor set [count PVDZE_serverObjectMonitor,_object];
//diag_log ("PUBLISH: Created " + (_class) + " with ID " + _uid);

View File

@@ -56,7 +56,7 @@ _key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, _da
diag_log ("HIVE: WRITE: "+ str(_key));
_key call server_hiveWrite;
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];
PVDZE_serverObjectMonitor set [count PVDZE_serverObjectMonitor,_object];
// Switched to spawn so we can wait a bit for the ID
[_object,_uid,_fuel,_damage,_array,_characterID,_class] spawn {
@@ -115,8 +115,8 @@ dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];
_object call fnc_veh_ResetEH;
// testing - should make sure everyone has eventhandlers for vehicles was unused...
dayzVehicleInit = _object;
publicVariable "dayzVehicleInit";
PVDZE_veh_Init = _object;
publicVariable "PVDZE_veh_Init";
diag_log ("PUBLISH: Created " + (_class) + " with ID " + str(_uid));
};

View File

@@ -95,13 +95,13 @@ _key call server_hiveWrite;
deleteVehicle _object_para;
};
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];
PVDZE_serverObjectMonitor set [count PVDZE_serverObjectMonitor,_object];
_object call fnc_veh_ResetEH;
// for non JIP users this should make sure everyone has eventhandlers for vehicles.
dayzVehicleInit = _object;
publicVariable "dayzVehicleInit";
PVDZE_veh_Init = _object;
publicVariable "PVDZE_veh_Init";
diag_log ("PUBLISH: Created " + (_class) + " with ID " + str(_uid));
};

View File

@@ -75,7 +75,7 @@ while {true} do {
_crash setPos _adjustedPos;
// I don't think this is needed (you can't get "in" a crash), but it was in the original DayZ Crash logic
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_crash];
PVDZE_serverObjectMonitor set [count PVDZE_serverObjectMonitor,_crash];
_crash setVariable ["ObjectID","1",true];
@@ -90,9 +90,9 @@ while {true} do {
};
if (_spawnFire) then {
//["dayzFire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll;
dayzFire = [_crash,2,time,false,_fadeFire];
publicVariable "dayzFire";
//["PVDZE_obj_Fire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll;
PVDZE_obj_Fire = [_crash,2,time,false,_fadeFire];
publicVariable "PVDZE_obj_Fire";
_crash setvariable ["fadeFire",_fadeFire,true];
};

View File

@@ -45,6 +45,6 @@ _object addMPEventHandler ["MPKilled",{_this call object_handleServerKilled;}];
// Test disabling simulation server side on buildables only.
_object enableSimulation false;
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];
PVDZE_serverObjectMonitor set [count PVDZE_serverObjectMonitor,_object];
//diag_log ("PUBLISH: Created " + (_class) + " with ID " + _uid);

View File

@@ -39,7 +39,7 @@ if(isNil "_retrader") then {
};
// diag_log(_retrader);
dayzTraderMenuResult = _retrader;
PVDZE_plr_TradeMenuResult = _retrader;
if(!isNull _character) then {
_clientID publicVariableClient "dayzTraderMenuResult";
_clientID publicVariableClient "PVDZE_plr_TradeMenuResult";
};

View File

@@ -1,27 +0,0 @@
//register client->server rpc
registerServerRpc = {
if (isServer) then {
_this call registerBroadcastRpc;
};
};
["dayzDeath", { (_this select 1) call server_playerDied; } ] call registerServerRpc;
["dayzDiscoAdd", { dayz_disco set [count dayz_disco,(_this select 1)]; } ] call registerServerRpc;
["dayzDiscoRem", { dayz_disco = dayz_disco - [(_this select 1)]; } ] call registerServerRpc;
["dayzPlayerSave", { (_this select 1) call server_playerSync; } ] call registerServerRpc;
["dayzPublishObj", { (_this select 1) call server_publishObj; } ] call registerServerRpc;
["dayzUpdateVehicle", { (_this select 1) call server_updateObject; } ] call registerServerRpc;
["dayzDeleteObj", { (_this select 1) call server_deleteObj; } ] call registerServerRpc;
["dayzLogin", { (_this select 1) call server_playerLogin; } ] call registerServerRpc;
["dayzLogin2", { (_this select 1) call server_playerSetup; } ] call registerServerRpc;
//missing sqf for server_playerMorph
//["dayzPlayerMorph", { (_this select 1) call server_playerMorph; } ] call registerServerRpc;
["dayzLoginRecord", { (_this select 1) call dayz_recordLogin; } ] call registerServerRpc;
["dayzCharDisco", { (_this select 1) call server_characterSync; } ] call registerServerRpc;
["dayzSpawnZed", { (_this select 1) call server_handleZedSpawn; } ] call registerServerRpc;
// DayZ Epoch Custom
["dayzPublishVeh", { (_this select 1) spawn server_publishVeh; } ] call registerServerRpc;
["dayzTradeObject", { (_this select 1) spawn server_tradeObj; } ] call registerServerRpc;
["dayzTraderMenu", { (_this select 1) spawn server_traders; } ] call registerServerRpc;
["dayzPlayerDeaths", { (_this select 1) spawn server_deaths; } ] call registerServerRpc;

View File

@@ -47,7 +47,7 @@ if (_spawnRoll <= _spawnChance) then {
_crash setPos _adjustedPos;
// I don't think this is needed (you can't get "in" a crash), but it was in the original DayZ Crash logic
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_crash];
PVDZE_serverObjectMonitor set [count PVDZE_serverObjectMonitor,_crash];
_crash setVariable ["ObjectID","1",true];
@@ -62,9 +62,9 @@ if (_spawnRoll <= _spawnChance) then {
};
if (_spawnFire) then {
//["dayzFire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll;
dayzFire = [_crash,2,time,false,_fadeFire];
publicVariable "dayzFire";
//["PVDZE_obj_Fire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll;
PVDZE_obj_Fire = [_crash,2,time,false,_fadeFire];
publicVariable "PVDZE_obj_Fire";
_crash setvariable ["fadeFire",_fadeFire,true];
};

View File

@@ -27,7 +27,7 @@ if (_spawnRoll <= _spawnChance) then {
_crash setPos _position;
// I don't think this is needed (you can't get "in" a crash), but it was in the original DayZ Crash logic
//dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_crash];
//PVDZE_serverObjectMonitor set [count PVDZE_serverObjectMonitor,_crash];
//_crash setVariable ["ObjectID","1",true];

View File

@@ -160,8 +160,8 @@ class FSM
" };" \n
"" \n
" setDate _date;" \n
" dayzSetDate = _date;" \n
" publicVariable ""dayzSetDate"";" \n
" PVDZE_plr_SetDate = _date;" \n
" publicVariable ""PVDZE_plr_SetDate"";" \n
" diag_log (""TIME SYNC: Local Time set to "" + str(_date)); " \n
"};" \n
""/*%FSM</STATEINIT""">*/;
@@ -208,7 +208,7 @@ class FSM
name = "prepare";
init = /*%FSM<STATEINIT""">*/"diag_log (""CLEANUP: INITIALIZING CLEANUP SCRIPT"");" \n
"" \n
"_safety = dayz_serverObjectMonitor;" \n
"_safety = PVDZE_serverObjectMonitor;" \n
"//_dateNow = (DateToNumber date);" \n
"" \n
"_lastUpdate = diag_tickTime;" \n
@@ -291,7 +291,7 @@ class FSM
class vehicle_cleanup
{
name = "vehicle_cleanup";
init = /*%FSM<STATEINIT""">*/"_safety = dayz_serverObjectMonitor;" \n
init = /*%FSM<STATEINIT""">*/"_safety = PVDZE_serverObjectMonitor;" \n
"" \n
"//Check for hackers" \n
" {" \n
@@ -302,7 +302,7 @@ class FSM
" };" \n
" } forEach allUnits;" \n
"" \n
"dayz_serverObjectMonitor = _safety;"/*%FSM</STATEINIT""">*/;
"PVDZE_serverObjectMonitor = _safety;"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links
{

View File

@@ -37,8 +37,8 @@ if(_outcome == "PASS") then {
if(isDedicated) then {
setDate _date;
dayzSetDate = _date;
publicVariable "dayzSetDate";
PVDZE_plr_SetDate = _date;
publicVariable "PVDZE_plr_SetDate";
};
diag_log ("HIVE: Local Time set to " + str(_date));
@@ -268,7 +268,7 @@ if (isServer and isNil "sm_done") then {
};
//Monitor the object
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];
PVDZE_serverObjectMonitor set [count PVDZE_serverObjectMonitor,_object];
};
} forEach _objectArray;
// # END OF STREAMING #