From e4f2b373a2bfabc33a05e233886ddcb7104d4d16 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 18 Nov 2013 10:23:18 -0600 Subject: [PATCH] moved to PEH --- SQF/dayz_code/system/player_monitor.fsm | 41 ++++++------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index a51973a00..7cb334b00 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -1,4 +1,4 @@ -/*%FSM*/ +/*%FSM*/ /*%FSM*/ /* item0[] = {"init",0,250,-75.000000,-350.000000,25.000000,-300.000000,0.000000,"init"}; @@ -152,8 +152,8 @@ link77[] = {66,59}; link78[] = {67,15}; link79[] = {68,69}; link80[] = {69,20}; -globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-592.955444,422.624878,1469.107178,428.394379,888,911,1}; -window[] = {2,-1,-1,-1,-1,980,200,1572,200,3,906}; +globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-592.955444,422.624878,1027.017090,306.503998,888,630,1}; +window[] = {2,-1,-1,-1,-1,858,78,1370,78,3,906}; *//*%FSM*/ class FSM { @@ -472,9 +472,7 @@ class FSM class Request { name = "Request"; - init = /*%FSM*/"//startLoadingScreen ["""",""DayZ_loadingScreen""];" \n - "" \n - "diag_log (""PLOGIN: Requesting Authentication... ("" + _playerUID + "")"");" \n + init = /*%FSM*/"diag_log (""PLOGIN: Requesting Authentication... ("" + _playerUID + "")"");" \n "dayz_loadScreenMsg = (localize ""str_player_15"");" \n "" \n "progressLoadingScreen 0.7;" \n @@ -762,17 +760,15 @@ class FSM "" \n "_worldspace = dayzPlayerLogin2 select 0;" \n "_state = dayzPlayerLogin2 select 1;" \n - "PVDZE_plr_SetWeather = dayzPlayerLogin2 select 2;" \n - "PVDZE_plr_SetDate = dayzPlayerLogin2 select 3;" \n - "DZE_FreshSpawn = dayzPlayerLogin2 select 4;" \n + "DZE_FreshSpawn = dayzPlayerLogin2 select 2;" \n "" \n "_setDir = _worldspace select 0;" \n "_setPos = _worldspace select 1;" \n "" \n "if(dayz_paraSpawn and !(player isKindOf ""PZombie_VB"") and DZE_FreshSpawn) then {" \n - " player setPosATL [(_setPos select 0),(_setPos select 1),1000];" \n " player setDir _setDir;" \n - " [player,1000] spawn BIS_fnc_halo;" \n + " player setPosATL [(_setPos select 0),(_setPos select 1),2000];" \n + " [player,2000] spawn BIS_fnc_halo;" \n "} else {" \n "" \n " // make protective box" \n @@ -942,10 +938,7 @@ class FSM class Position { name = "Position"; - init = /*%FSM*/"endLoadingScreen;" \n - "startLoadingScreen ["""",""DayZ_loadingScreen""];" \n - "" \n - "//Location" \n + init = /*%FSM*/"//Location" \n "_myLoc = getPosATL player;" \n "" \n "dayz_loadScreenMsg = ""Setup Completed, please wait..."";" \n @@ -1186,23 +1179,7 @@ class FSM class Initialize { name = "Initialize"; - init = /*%FSM*/"#define ods(arg1) ""armaperflib"" callextension arg1" \n - "" \n - "if (!isNil ""PVDZE_plr_SetDate"") then {" \n - " setDate PVDZE_plr_SetDate;" \n - "};" \n - "" \n - "if (!isNil ""PVDZE_plr_SetDate"") then {" \n - " 0 setOvercast (zeroCurrentWeather select 0);" \n - " 0 setFog (zeroCurrentWeather select 1);" \n - " setWind [((zeroCurrentWeather select 2) select 0),((zeroCurrentWeather select 2) select 1),true];" \n - " 0 setRain (zeroCurrentWeather select 3);" \n - "};" \n - "" \n - "" \n - "diag_log (""Local Time: "" +str(PVDZE_plr_SetDate));" \n - "" \n - "//Medical" \n + init = /*%FSM*/"//Medical" \n "dayz_medicalH = [] execVM ""\z\addons\dayz_code\medical\init_medical.sqf""; //Medical Monitor Script (client only)" \n "[player] call fnc_usec_damageHandle;" \n "if (r_player_unconscious) then {" \n