diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf
index 2aaab0443..9fdfc67e4 100644
--- a/SQF/dayz_code/init/variables.sqf
+++ b/SQF/dayz_code/init/variables.sqf
@@ -72,6 +72,8 @@ if (isServer) then {
/**************Variables Compiled on Clients Only**************/
if (!isDedicated) then {
+ DZE_schedDebug = 0; // Debug some scheduler lines
+ DZE_playerFSMDebug = 0; // Debug whole player.fsm
// Rolling Msg system
Message_1 = "";
@@ -316,6 +318,13 @@ if (!isDedicated) then {
DZE_WaterSources = ["Land_pumpa","Land_Barrel_water","Land_Misc_Well_C_EP1","Land_Misc_Well_L_EP1","land_smd_water_pump","Watertank_DZE","Watertower_DZE","Land_water_tank","MAP_water_tank"];
// Helper Colors Require Reformatting
+ DZE_helperSize = [[3,"Sign_sphere100cm_EP1"],[2,"Sign_sphere25cm_EP1"],[1,"Sign_sphere10cm_EP1"]]; // array of helper sizes and corresponding class. Keep in reverse order for optimized lookup
+ DZE_helperSizeDefault = 3; // default to large sphere
+ DZE_NoRefundTransparency = 0.5; // Red Basebuilding Helper Transparency. min = 0.1, max = 1
+ DZE_removeTransparency = 0.5; // Green Basebuilding Helper Transparency. min = 0.1, max = 1
+ DZE_deconstructTransparency = 0.5; // Blue Basebuilding Helper Transparency. min = 0.1, max = 1
+ DZE_largeObjects = ["MetalContainer2D_DZ","MetalContainer1G_DZ","MetalContainer1B_DZ","MetalContainer1A_DZ","DragonTeeth_DZ","DragonTeethBig_DZ","MetalFloor4x_DZ","Land_metal_floor_2x2_wreck","WoodFloor4x_DZ","Land_wood_floor_2x2_wreck","Scaffolding_DZ","CinderGateFrame_DZ","CinderGate_DZ","CinderGateLocked_DZ","WoodGateFrame_DZ","Land_DZE_WoodGate","Land_DZE_WoodGateLocked","WoodRamp_DZ","Metal_Drawbridge_DZ","Metal_DrawbridgeLocked_DZ","Land_WarfareBarrier10x_DZ","Land_WarfareBarrier10xTall_DZ","SandNestLarge_DZ"]; // adjust _allowedDistance in fn_selfActions.sqf for large modular/crafted objects
+
DZE_NoRefundTexture = [0, format["#(argb,8,8,3)color(1.00,0.00,0.00,%1,ca)", (DZE_NoRefundTransparency max 0.1)] ]; // red
DZE_removeTexture = [0, format["#(argb,8,8,3)color(0.15,1.00,0.40,%1,ca)", (DZE_removeTransparency max 0.1)] ]; // green
DZE_deconstructTexture = [0, format["#(argb,8,8,3)color(0.15,0.00,1.00,%1,ca)", (DZE_deconstructTransparency max 0.1)] ]; // blue
diff --git a/SQF/dayz_code/system/BIS_Effects/init.sqf b/SQF/dayz_code/system/BIS_Effects/init.sqf
index 907c4b6b4..2bef30492 100644
--- a/SQF/dayz_code/system/BIS_Effects/init.sqf
+++ b/SQF/dayz_code/system/BIS_Effects/init.sqf
@@ -2,7 +2,7 @@ BIS_Effects_Init = true;
Corepatch_Effects_Init = true;
if (isNil "BIS_Effects_Init_DZ") then {
BIS_Effects_Init_DZ = true;
- diag_log "Res3tting B!S effects...";
+ //diag_log "Res3tting B!S effects...";
BIS_Effects_EH_Fired=compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\fired.sqf"; // Allows tanks to use smoke counter measures
BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf";
diff --git a/SQF/dayz_code/system/antihack.sqf b/SQF/dayz_code/system/antihack.sqf
index 94adb9b04..c7786d9ca 100644
--- a/SQF/dayz_code/system/antihack.sqf
+++ b/SQF/dayz_code/system/antihack.sqf
@@ -35,4 +35,4 @@ inGameUISetEventHandler ["Action","false"];
deleteVehicle _plant;
} count ["grass","prunus","picea","fallentree","phragmites","acer","amygdalusn","Brush","fiberplant","amygdalusc","boulder"];
-diag_log format ["%1: Plants libs tests done!",__FILE__];
\ No newline at end of file
+//diag_log format ["%1: Plants libs tests done!",__FILE__];
\ No newline at end of file
diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm
index 86f04a90b..8e2795c5a 100644
--- a/SQF/dayz_code/system/player_monitor.fsm
+++ b/SQF/dayz_code/system/player_monitor.fsm
@@ -265,7 +265,6 @@ class FSM
"_timeStart = diag_tickTime;" \n
"_readytoAuth = false;" \n
"_startCheck = 0;" \n
- "_debug = 0;" \n
"_schedulerStarted=false;" \n
"_spawnSelection = 9;" \n
"" \n
@@ -273,7 +272,7 @@ class FSM
"_timeNemRegion = 0;" \n
"" \n
"" \n
- "if (_debug == 1) then {" \n
+ "if (DZE_playerFSMDebug == 1) then {" \n
"diag_log (""DAYZ: CLIENT IS RUNNING DAYZ_CODE "" + str(dayz_versionNo));" \n
"};" \n
""/*%FSM*/;
@@ -335,7 +334,7 @@ class FSM
itemno = 4;
init = /*%FSM*/"dayz_loadScreenMsg = localize 'str_player_loading'; " \n
"" \n
- "if (_debug == 1) then {diag_log [diag_tickTime,'Loading'];};"/*%FSM*/;
+ "if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Loading'];};"/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
class Links
{
@@ -364,7 +363,7 @@ class FSM
"" \n
"_playerUID = getPlayerUID player;" \n
"dayz_progressBarValue = 0.6;" \n
- "if (_debug == 1) then {diag_log [diag_tickTime,'Collect'];};"/*%FSM*/;
+ "if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Collect'];};"/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
class Links
{
@@ -424,7 +423,7 @@ class FSM
{
name = "Request";
itemno = 11;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Request'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Request'];};" \n
"" \n
"dayz_loadScreenMsg = localize 'str_player_request';" \n
"" \n
@@ -432,10 +431,10 @@ class FSM
"dayz_progressBarValue = 0.65;" \n
"PVDZ_plr_Login1 = [_playerUID,player];" \n
"publicVariableServer ""PVDZ_plr_Login1"";" \n
- "diag_log ['Sent to server: PVDZ_plr_Login1', PVDZ_plr_Login1]; " \n
+ "if (DZE_playerFSMDebug == 1) then {diag_log ['Sent to server: PVDZ_plr_Login1', PVDZ_plr_Login1];};" \n
"PVDZ_send = [player,""dayzSetDate"",[player]];" \n
"publicVariableServer ""PVDZ_send"";" \n
- "diag_log ['Sent to server: PVDZ_send', PVDZ_send]; " \n
+ "if (DZE_playerFSMDebug == 1) then {diag_log ['Sent to server: PVDZ_send', PVDZ_send];};" \n
"_myTime = diag_tickTime;" \n
""/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
@@ -471,7 +470,7 @@ class FSM
{
name = "Parse_Login";
itemno = 13;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Parse_Login'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Parse_Login'];};" \n
"dayz_progressBarValue = 0.8;" \n
"_charID = _msg select 0;" \n
"_inventory = _msg select 1;" \n
@@ -497,12 +496,12 @@ class FSM
" _characterCoins = _msg select 11;" \n
" _globalCoins = _msg select 12;" \n
" _bankCoins = _msg select 13;" \n
- " diag_log (""PLAYER RESULT: "" + str(_isHiveOk));" \n
+ " if (DZE_playerFSMDebug == 1) then {diag_log (""PLAYER RESULT: "" + str(_isHiveOk));};" \n
"};" \n
"" \n
"dayz_loadScreenMsg = localize 'str_player_creating_character'; " \n
"if (_isHiveOk) then { if (!_schedulerStarted) then { _schedulerStarted=true; execVM '\z\addons\dayz_code\system\scheduler\sched_init.sqf'; }; };" \n
- "if (_debug == 1) then {" \n
+ "if (DZE_playerFSMDebug == 1) then {" \n
"diag_log (""PLOGIN: authenticated with : "" + str(_msg));" \n
" diag_log [""player_monitor:Parse_Login _isHiveOk,_isNew,isnil preload, preload:"",_isHiveOk,_isNew,!isNil 'dayz_preloadFinished',dayz_preloadFinished];" \n
"};" \n
@@ -583,7 +582,7 @@ class FSM
{
name = "ERROR__Wrong_HIVE";
itemno = 15;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'ERROR__Wrong_HIVE'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'ERROR__Wrong_HIVE'];};" \n
"_myTime = diag_tickTime;" \n
"dayz_loadScreenMsg = localize 'str_player_wrong_hive';" \n
""/*%FSM*/;
@@ -609,7 +608,7 @@ class FSM
{
name = "Phase_One";
itemno = 17;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Phase_One'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Phase_One'];};" \n
"if ((!isNil ""dayz_selectGender"") && {(!isNil ""DZE_defaultSkin"") && (_isInfected == 0)}) then {" \n
" if (dayz_selectGender == ""Survivor2_DZ"") then {" \n
" _rand = (DZE_defaultSkin select 0) call BIS_fnc_selectRandom;" \n
@@ -711,7 +710,7 @@ class FSM
"PVCDZ_plr_Login2 = [];" \n
"PVDZ_plr_Login2 = [_charID,player,_playerUID,_spawnSelection,_inventory];" \n
"publicVariableServer ""PVDZ_plr_Login2"";" \n
- "diag_log ['Sent to server: PVDZ_plr_Login2', PVDZ_plr_Login2]; " \n
+ "if (DZE_playerFSMDebug == 1) then {diag_log ['Sent to server: PVDZ_plr_Login2', PVDZ_plr_Login2];};" \n
"dayz_loadScreenMsg = localize 'str_player_requesting_character';" \n
""/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
@@ -736,7 +735,7 @@ class FSM
{
name = "Phase_Two";
itemno = 19;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Phase_Two'];};dayz_loadScreenMsg = localize 'str_login_characterData'; " \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Phase_Two'];};dayz_loadScreenMsg = localize 'str_login_characterData'; " \n
"" \n
"_worldspace = PVCDZ_plr_Login2 select 0;" \n
"_state = PVCDZ_plr_Login2 select 1;" \n
@@ -918,7 +917,7 @@ class FSM
{
name = "ERROR__Player_Already";
itemno = 21;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'ERROR__Player_Already'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'ERROR__Player_Already'];};" \n
"selectNoPlayer;" \n
"_myTime = diag_tickTime;" \n
"dayz_loadScreenMsg = localize 'str_login_alreadyDead';" \n
@@ -945,7 +944,7 @@ class FSM
{
name = "Position";
itemno = 23;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Position'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Position'];};" \n
"dayz_progressBarValue = 0.85;" \n
""/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
@@ -981,7 +980,7 @@ class FSM
{
name = "Load_In";
itemno = 25;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Load_In'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Load_In'];};" \n
"dayz_progressBarValue = 0.95;" \n
"dayz_loadScreenMsg = localize 'str_player_setup_completed';" \n
"_torev4l=nearestObjects [_setPos, Dayz_plants + DayZ_GearedObjects + [""AllVehicles"",""WeaponHolder""], 50];" \n
@@ -1056,7 +1055,7 @@ class FSM
{
name = "Preload_Display";
itemno = 29;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Preload_Display'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Preload_Display'];};" \n
"" \n
"player disableConversation true;" \n
"" \n
@@ -1143,7 +1142,7 @@ class FSM
{
name = "Initialize";
itemno = 31;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Initialize'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Initialize'];};" \n
"" \n
"//Medical" \n
"//dayz_medicalH = [] execVM ""\z\addons\dayz_code\medical\init_medical.sqf""; //Medical Monitor Script (client only)" \n
@@ -1210,7 +1209,7 @@ class FSM
{
name = "Finish";
itemno = 32;
- init = /*%FSM*/"diag_log 'player_forceSave called from fsm';" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log 'player_forceSave called from fsm';};" \n
"//call player_forceSave;" \n
"" \n
"//Check for bad controls at login" \n
@@ -1228,7 +1227,7 @@ class FSM
{
name = "Enable_Sim";
itemno = 38;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Enable_Sim'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Enable_Sim'];};" \n
"" \n
"_myAssets = getText(configFile >> ""CfgPatches"" >> ""dayz_communityassets"" >> ""dayzVersion"");" \n
"_mySfx = getNumber(configFile >> ""CfgPatches"" >> ""dayz_sfx"" >> ""dayzVersion"");" \n
@@ -1247,7 +1246,7 @@ class FSM
"_myWeapons = getNumber(configFile >> ""CfgPatches"" >> ""dayz_weapons"" >> ""dayzVersion"");" \n
"*/" \n
"" \n
- "if (_debug == 1) then {" \n
+ "if (DZE_playerFSMDebug == 1) then {" \n
" diag_log format[""DayZ Version: DayZ_Anim: %1 DayZ_SFX: %2 DayZ_Assets: %3"",_myAnim, _mySfx,_myAssets];" \n
"};"/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
@@ -1283,7 +1282,7 @@ class FSM
{
name = "ERROR__Client_Files";
itemno = 40;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'ERROR__Client_Files'];};selectNoPlayer;" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'ERROR__Client_Files'];};selectNoPlayer;" \n
"_myTime = diag_tickTime;" \n
"dayz_loadScreenMsg = localize 'str_player_outdated';" \n
""/*%FSM*/;
@@ -1309,7 +1308,7 @@ class FSM
{
name = "Stream";
itemno = 42;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Stream'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Stream'];};" \n
"dayz_loadScreenMsg = localize 'str_login_spawningLocalObjects';" \n
""/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
@@ -1334,14 +1333,14 @@ class FSM
{
name = "Retry";
itemno = 46;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Retry'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Retry'];};" \n
"dayz_loadScreenMsg = localize 'str_player_retrying';" \n
"" \n
"_AuthAttempt = _AuthAttempt +1;" \n
"" \n
"_myTime = diag_tickTime;" \n
"" \n
- "if (_debug == 1) then {" \n
+ "if (DZE_playerFSMDebug == 1) then {" \n
" diag_log (""PLOGIN: Retrying Authentication... ("" + _playerUID + "")"");" \n
"};"/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
@@ -1377,9 +1376,9 @@ class FSM
{
name = "get_ready_to_clo";
itemno = 48;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'get_ready_to_clo'];};dayz_loadScreenMsg = localize 'str_player_authentication_failed';" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'get_ready_to_clo'];};dayz_loadScreenMsg = localize 'str_player_authentication_failed';" \n
"_myTime = diag_tickTime;" \n
- "if (_debug == 1) then {" \n
+ "if (DZE_playerFSMDebug == 1) then {" \n
" diag_log (""PLOGIN: Authentication Failed ("" + _playerUID + "")"");" \n
"};"/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
@@ -1404,11 +1403,11 @@ class FSM
{
name = "Disconnect";
itemno = 50;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Disconnect'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Disconnect'];};" \n
"" \n
" player enableSimulation false;" \n
"" \n
- "if (_debug == 1) then {" \n
+ "if (DZE_playerFSMDebug == 1) then {" \n
" diag_log (""End Mission"");" \n
"};" \n
"" \n
@@ -1429,7 +1428,7 @@ class FSM
{
name = "Date_or_Time_Send";
itemno = 52;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Date_or_Time_Send'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Date_or_Time_Send'];};" \n
"_myTime = diag_tickTime;"/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
class Links
@@ -1442,9 +1441,9 @@ class FSM
to="Stream";
precondition = /*%FSM*/""/*%FSM*/;
condition=/*%FSM*/"!isNil ""dayzSetDate"""/*%FSM*/;
- action=/*%FSM*/"diag_log ['Date & time received:', dayzSetDate];" \n
+ action=/*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log ['Date & time received:', dayzSetDate];};" \n
"setDate dayzSetDate;" \n
- "diag_log ['Local date on this client:', date];"/*%FSM*/;
+ "if (DZE_playerFSMDebug == 1) then {diag_log ['Local date on this client:', date];};"/*%FSM*/;
};
/*%FSM*/
/*%FSM*/
@@ -1466,10 +1465,10 @@ class FSM
{
name = "Server_Loading";
itemno = 54;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Server_Loading'];};_myTime = diag_tickTime;" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Server_Loading'];};_myTime = diag_tickTime;" \n
"dayz_loadScreenMsg = localize 'str_player_waiting_start';" \n
"" \n
- "if (_debug == 1) then {" \n
+ "if (DZE_playerFSMDebug == 1) then {" \n
" diag_log (""Server Loading"");" \n
" diag_log (""PLOGIN: Waiting for server to start authentication"");" \n
"};"/*%FSM*/;
@@ -1506,7 +1505,7 @@ class FSM
{
name = "Gender_Selection";
itemno = 58;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Gender_Selection'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Gender_Selection'];};" \n
"endLoadingScreen;" \n
"freshSpawn = 2;" \n
"" \n
@@ -1549,7 +1548,7 @@ class FSM
{
name = "Character_Type_6";
itemno = 60;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Character_Type_6'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Character_Type_6'];};" \n
"" \n
"_model = dayz_selectGender;"/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
@@ -1585,7 +1584,7 @@ class FSM
{
name = "Region_Selection";
itemno = 61;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Region_Selection'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Region_Selection'];};" \n
"endLoadingScreen;" \n
"" \n
"_timeNem=diag_tickTime;" \n
@@ -1627,7 +1626,7 @@ class FSM
{
name = "Region_Process_6";
itemno = 63;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Region_Process_6, region selected:',_spawnSelection];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Region_Process_6, region selected:',_spawnSelection];};" \n
"_isNew = false;" \n
"_spawnSelection = dayz_selectRegion;"/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
@@ -1654,7 +1653,7 @@ class FSM
{
name = "Spawn_Process_65";
itemno = 65;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Spawn_Process_65'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Spawn_Process_65'];};" \n
"_isNew = false;" \n
"dayz_selectRegion = 9;"/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
@@ -1681,7 +1680,7 @@ class FSM
{
name = "ERROR__Date_Time";
itemno = 72;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'ERROR__Date_Time'];};_myTime = diag_tickTime;" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'ERROR__Date_Time'];};_myTime = diag_tickTime;" \n
"" \n
"diag_log format[""Date and time not synced""];" \n
"dayz_loadScreenMsg = localize 'str_player_desync';" \n
@@ -1733,7 +1732,7 @@ class FSM
{
name = "Waiting_for_Gender";
itemno = 90;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Waiting_for_Gender'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Waiting_for_Gender'];};" \n
"" \n
"_timeNemGender = diag_tickTime;"/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
@@ -1784,7 +1783,7 @@ class FSM
{
name = "Waiting_for__Region";
itemno = 92;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Waiting_for__Region'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Waiting_for__Region'];};" \n
"" \n
"_timeNemRegion = diag_tickTime;" \n
""/*%FSM*/;
@@ -1838,7 +1837,7 @@ class FSM
{
name = "Update_player";
itemno = 96;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Update_player'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Update_player'];};" \n
"dayz_loadScreenMsg = format[ localize 'str_player_ghost', _timeOut];" \n
"" \n
"_myTime = diag_tickTime;" \n
@@ -1876,7 +1875,7 @@ class FSM
{
name = "Ghost_System";
itemno = 99;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Ghost_System'];};dayz_loadScreenMsg = localize 'str_login_ghostedPlayer';" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Ghost_System'];};dayz_loadScreenMsg = localize 'str_login_ghostedPlayer';" \n
"" \n
""/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
@@ -1952,7 +1951,7 @@ class FSM
{
name = "Finish_1";
itemno = 106;
- init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Finish'];};" \n
+ init = /*%FSM*/"if (DZE_playerFSMDebug == 1) then {diag_log [diag_tickTime,'Finish'];};" \n
"" \n
"dayz_playerName = if (alive player) then {name player} else {'unknown'};" \n
"PVDZ_plr_LoginRecord = [_playerUID,_charID,0,toArray dayz_playerName];" \n
@@ -1960,7 +1959,7 @@ class FSM
"" \n
"dayz_progressBarValue = 1;" \n
"" \n
- "diag_log format ['Sent to server PVDZ_plr_LoginRecord: [%1, %2, %3, %4]',_playerUID,_charID,0,dayz_playerName]; " \n
+ "if (DZE_playerFSMDebug == 1) then {diag_log format ['Sent to server PVDZ_plr_LoginRecord: [%1, %2, %3, %4]',_playerUID,_charID,0,dayz_playerName];};" \n
"" \n
"_world = toUpper(worldName); //toUpper(getText (configFile >> ""CfgWorlds"" >> (worldName) >> ""description""));" \n
"_nearestCity = nearestLocations [getPos player, [""NameCityCapital"",""NameCity"",""NameVillage"",""NameLocal""],1000];" \n
@@ -1980,7 +1979,7 @@ class FSM
" call compile preprocessFileLineNumbers (""\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\""+_x+"".sqf""); " \n
"} count infectedWaterHoles;" \n
" " \n
- "diag_log (infectedWaterHoles);"/*%FSM*/;
+ "if (DZE_playerFSMDebug == 1) then {diag_log (infectedWaterHoles);};"/*%FSM*/;
precondition = /*%FSM*/""/*%FSM*/;
class Links
{
diff --git a/SQF/dayz_code/system/scheduler/sched_animals.sqf b/SQF/dayz_code/system/scheduler/sched_animals.sqf
index c45a9786d..2a9665e76 100644
--- a/SQF/dayz_code/system/scheduler/sched_animals.sqf
+++ b/SQF/dayz_code/system/scheduler/sched_animals.sqf
@@ -85,6 +85,6 @@ sched_animals = {
};
};
};
-// diag_log format [ "%1: update animals. local: %5, global: %6 fps: %2 -> %3%4",__FILE__, _min, diag_fpsmin,if (diag_fpsmin < 10) then {"!! <<<<<<<<<<<<<<<<<<<"} else {""}, _count, _global ];
+ if (DZE_schedDebug == 1) then {diag_log format [ "%1: update animals. local: %5, global: %6 fps: %2 -> %3%4",__FILE__, _min, diag_fpsmin,if (diag_fpsmin < 10) then {"!! <<<<<<<<<<<<<<<<<<<"} else {""}, _count, _global ];};
objNull
};
\ No newline at end of file
diff --git a/SQF/dayz_code/system/scheduler/sched_antiTeleport.sqf b/SQF/dayz_code/system/scheduler/sched_antiTeleport.sqf
index c5ddba27b..dd464a2de 100644
--- a/SQF/dayz_code/system/scheduler/sched_antiTeleport.sqf
+++ b/SQF/dayz_code/system/scheduler/sched_antiTeleport.sqf
@@ -6,7 +6,7 @@
*/
sched_antiTP_init = {
- diag_log [ diag_ticktime, __FILE__, "Anti Teleport inited"];
+ if (DZE_schedDebug == 1) then {diag_log [ diag_ticktime, __FILE__, "Anti Teleport inited"];};
[true, [], 0, 0, objNull, respawn_west_original]
};
diff --git a/SQF/dayz_code/system/scheduler/sched_init.sqf b/SQF/dayz_code/system/scheduler/sched_init.sqf
index 0e5d5d805..d5bccb571 100644
--- a/SQF/dayz_code/system/scheduler/sched_init.sqf
+++ b/SQF/dayz_code/system/scheduler/sched_init.sqf
@@ -63,4 +63,4 @@ if (count _list == 0) then {
};
_list execFSM (_base+"scheduler.fsm");
-diag_log [ diag_tickTime, __FILE__, "Scheduler started"];
+//diag_log [ diag_tickTime, __FILE__, "Scheduler started"];
diff --git a/SQF/dayz_code/system/scheduler/sched_security.sqf b/SQF/dayz_code/system/scheduler/sched_security.sqf
index 16f328393..6505a7bc6 100644
--- a/SQF/dayz_code/system/scheduler/sched_security.sqf
+++ b/SQF/dayz_code/system/scheduler/sched_security.sqf
@@ -1,7 +1,7 @@
// (c) facoptere@gmail.com, licensed to DayZMod for the community
sched_security_init = {
- diag_log [ diag_ticktime, __FILE__, "Some security routines inited"];
+ if (DZE_schedDebug == 1) then {diag_log [ diag_ticktime, __FILE__, "Some security routines inited"];};
[ "", time, 0, 0, grpNull ]
};
diff --git a/SQF/dayz_code/system/weather/setWeather.sqf b/SQF/dayz_code/system/weather/setWeather.sqf
index 781f36de7..eed2cd638 100644
--- a/SQF/dayz_code/system/weather/setWeather.sqf
+++ b/SQF/dayz_code/system/weather/setWeather.sqf
@@ -97,4 +97,4 @@ if (_currentRain == 0 || {_currentOvercast <= .70} || {DZE_Weather in [3,4]}) th
if (DEBUG_MESSAGE) then {"The Weather Has Changed" call dayz_rollingMessages;};
-diag_log format ["Weather Forecast: Overcast: %1, Fog: %2, Rain: %3, WindX: %4, WindY: %5, Snow: %6, Blizzard: %7, Change Type: %8.",_currentOvercast,_currentFog,_currentRain,_currentWindX,_currentWindY,_currentSnow,_blizzard,_changeType];
\ No newline at end of file
+if (DEBUG_MESSAGE) then {diag_log format ["Weather Forecast: Overcast: %1, Fog: %2, Rain: %3, WindX: %4, WindY: %5, Snow: %6, Blizzard: %7, Change Type: %8.",_currentOvercast,_currentFog,_currentRain,_currentWindX,_currentWindY,_currentSnow,_blizzard,_changeType];};
\ No newline at end of file