From 72fd8ddf628be32b71106b80ee490f9df2c33f93 Mon Sep 17 00:00:00 2001 From: Skaronator Date: Sat, 30 Nov 2013 21:29:23 +0100 Subject: [PATCH] Same stuff with less PVC Var --- .../compile/player_projectileNear.sqf | 10 +- SQF/dayz_code/system/player_monitor.fsm | 294 ++++++++---------- .../compile/server_playerSetup.sqf | 2 +- 3 files changed, 133 insertions(+), 173 deletions(-) diff --git a/SQF/dayz_code/compile/player_projectileNear.sqf b/SQF/dayz_code/compile/player_projectileNear.sqf index c645d9ea7..4b3684076 100644 --- a/SQF/dayz_code/compile/player_projectileNear.sqf +++ b/SQF/dayz_code/compile/player_projectileNear.sqf @@ -2,12 +2,12 @@ private ["_unit","_projectile","_isInCombat","_currentNear","_projectilespeed"," _unit = _this select 0; _projectile = _this select 6; -diag_log ("0"); +//diag_log ("0"); //_isInComat = _unit getVariable["startcombattimer",0]; -diag_log ("Bullit Speed: " +str(Speed _projectile)); -diag_log ("Bullit Velocity: " +str(velocity _projectile)); +//diag_log ("Bullit Speed: " +str(Speed _projectile)); +//diag_log ("Bullit Velocity: " +str(velocity _projectile)); _listNear = []; _callCount = 0; @@ -23,12 +23,12 @@ while {(alive _projectile) && !(isNull _projectile) && _callCount < 85;} do { _listNear = _listNear + _currentNear; _callCount = _callCount + 1; }; -diag_log ("2"); +//diag_log ("2"); { _nearVehicle = _x; _listNear = _listNear - [_x]; - diag_log ("3"); + //diag_log ("3"); if (isPlayer _nearVehicle) then { _isInCombat = _nearVehicle getVariable["startcombattimer",0]; diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index fad2eb8bb..072c762a2 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"}; @@ -11,149 +11,144 @@ item6[] = {"player_not_null",4,218,-175.000000,-50.000000,-75.000000,0.000000,0. item7[] = {"Prepare",2,250,-75.000000,0.000000,25.000000,50.000000,0.000000,"Prepare"}; item8[] = {"player___player",4,218,50.000000,50.000000,150.000000,100.000000,0.000000,"player =" \n "player"}; item9[] = {"Collect",2,250,-75.000000,100.000000,25.000000,150.000000,0.000000,"Collect"}; -item10[] = {"Single_Player",4,218,-200.000000,100.000000,-100.000000,150.000000,3.000000,"Single" \n "Player"}; -item11[] = {"Make_PlayerID",2,250,-200.000000,175.000000,-100.000000,225.000000,0.000000,"Make PlayerID"}; -item12[] = {"Has_PlayerID",4,218,-75.000000,175.000000,25.000000,225.000000,1.000000,"Has PlayerID"}; -item13[] = {"no_PlayerID",4,218,50.000000,150.000000,150.000000,200.000000,2.000000,"no PlayerID"}; -item14[] = {"ERROR__No_Player",2,250,175.000000,150.000000,275.000000,200.000000,0.000000,"ERROR:" \n "No PlayerID"}; -item15[] = {"Request",2,250,-75.000000,400.000000,25.000000,450.000000,0.000000,"Request"}; -item16[] = {"Response",4,218,-175.000000,450.000000,-75.000000,500.000000,0.000000,"Response"}; -item17[] = {"Parse_Login",2,250,-75.000000,500.000000,25.000000,550.000000,0.000000,"Parse Login"}; -item18[] = {"Hive_Bad",4,218,50.000000,500.000000,150.000000,550.000000,10.000000,"Hive" \n "Bad"}; -item19[] = {"ERROR__Wrong_HIVE",2,250,175.000000,500.000000,275.000000,550.000000,0.000000,"ERROR:" \n "Wrong HIVE" \n "Version"}; -item20[] = {"Hive_Ok",4,218,-175.000000,550.000000,-75.000000,600.000000,0.000000,"Hive" \n "Ok"}; -item21[] = {"Phase_One",2,250,-75.000000,600.000000,25.000000,650.000000,0.000000,"Phase One"}; -item22[] = {"Response",4,218,-175.000000,650.000000,-75.000000,700.000000,0.000000,"Response"}; -item23[] = {"Phase_Two",2,250,-75.000000,700.000000,25.000000,750.000000,0.000000,"Phase Two"}; -item24[] = {"Dead_Player",4,218,50.000000,700.000000,150.000000,750.000000,0.000000,"Dead" \n "Player"}; -item25[] = {"ERROR__Player_Already",2,250,175.000000,700.000000,275.000000,750.000000,0.000000,"ERROR:" \n "Player Already" \n "Dead"}; -item26[] = {"Alive",4,218,-175.000000,750.000000,-75.000000,800.000000,0.000000,"Alive"}; -item27[] = {"Position",2,250,-75.000000,800.000000,25.000000,850.000000,0.000000,"Position"}; -item28[] = {"Version_Ok",4,218,-175.000000,850.000000,-75.000000,900.000000,0.000000,"Version" \n "Ok"}; -item29[] = {"Load_In",2,250,-75.000000,1000.000000,25.000000,1050.000000,0.000000,"Load In"}; -item30[] = {"Bad_Version",4,218,50.000000,800.000000,150.000000,850.000000,0.000000,"Bad" \n "Version"}; -item31[] = {"ERROR__Bad_Versi",2,250,175.000000,800.000000,275.000000,850.000000,0.000000,"ERROR:" \n "Bad Version"}; -item32[] = {"Display_Ready",4,218,-175.000000,1050.000000,-75.000000,1100.000000,0.000000,"Display" \n "Ready"}; -item33[] = {"Preload_Display",2,4346,-75.000000,1100.000000,25.000000,1150.000000,0.000000,"Preload" \n "Display"}; -item34[] = {"Preload_Done",4,218,-175.000000,1150.000000,-75.000000,1200.000000,0.000000,"Preload" \n "Done"}; -item35[] = {"Initialize",2,250,-75.000000,1200.000000,25.000000,1250.000000,0.000000,"Initialize"}; -item36[] = {"Finish",1,250,-75.000000,1300.000000,25.000000,1350.000000,0.000000,"Finish"}; -item37[] = {"True",8,218,25.000000,1250.000000,125.000000,1300.000000,0.000000,"True"}; -item38[] = {"Too_Long",4,218,300.000000,150.000000,400.000000,200.000000,0.000000,"Too" \n "Long"}; -item39[] = {"Too_Long",4,218,300.000000,500.000000,400.000000,550.000000,0.000000,"Too" \n "Long"}; -item40[] = {"Too_Long",4,218,300.000000,700.000000,400.000000,750.000000,0.000000,"Too" \n "Long"}; -item41[] = {"Too_Long",4,218,300.000000,800.000000,400.000000,850.000000,0.000000,"Too" \n "Long"}; -item42[] = {"Enable_Sim",2,250,-75.000000,-100.000000,25.000000,-50.000000,0.000000,"Enable Sim"}; -item43[] = {"Initialized",4,218,-175.000000,-150.000000,-75.000000,-100.000000,0.000000,"Initialized"}; -item44[] = {"New_Character",4,218,-500.000000,375.000000,-400.000000,425.000000,5.000000,"New" \n "Character"}; -item45[] = {"Gender_Selection",2,250,-500.000000,500.000000,-400.000000,550.000000,0.000000,"Gender Selection" \n "Dialog"}; -item46[] = {"Selected",4,218,-400.000000,600.000000,-300.000000,650.000000,0.000000,"Selected"}; -item47[] = {"Process",2,250,-275.000000,600.000000,-175.000000,650.000000,0.000000,"Process"}; -item48[] = {"no_PlayerID",4,218,50.000000,-100.000000,150.000000,-50.000000,2.000000,"no PlayerID"}; -item49[] = {"ERROR__No_Player_1",2,250,175.000000,-100.000000,275.000000,-50.000000,0.000000,"ERROR:" \n "No PlayerID"}; -item50[] = {"Too_Long",4,218,300.000000,-100.000000,400.000000,-50.000000,0.000000,"Too" \n "Long"}; -item51[] = {"Stream",2,250,-75.000000,900.000000,25.000000,950.000000,0.000000,"Stream"}; -item52[] = {"Preloaded",4,218,-175.000000,950.000000,-75.000000,1000.000000,0.000000,"Preloaded"}; -item53[] = {"Retry",4,218,25.000000,375.000000,125.000000,425.000000,0.000000,"Retry"}; -item54[] = {"retry_",4,218,25.000000,425.000000,125.000000,475.000000,0.000000,"retry" \n ""}; -item55[] = {"Retry",2,250,125.000000,400.000000,225.000000,450.000000,0.000000,"Retry"}; -item56[] = {"auth_failed",4,218,250.000000,400.000000,350.000000,450.000000,0.000000,"auth failed"}; -item57[] = {"get_ready_to_clo",2,250,400.000000,400.000000,500.000000,450.000000,0.000000,"get ready to close"}; -item58[] = {"sleep_",4,218,550.000000,400.000000,650.000000,450.000000,0.000000,"sleep" \n ""}; -item59[] = {"Disconnect",2,250,675.000000,400.000000,775.000000,450.000000,0.000000,"Disconnect"}; -item60[] = {"No_time_date",4,218,25.000000,1150.000000,125.000000,1200.000000,0.000000,"No time/date"}; -item61[] = {"ERROR__No_Date_or",2,250,175.000000,1150.000000,275.000000,1200.000000,0.000000,"ERROR:" \n "No Date or Time"}; -item62[] = {"Too_Long",4,218,300.000000,1150.000000,400.000000,1200.000000,0.000000,"Too" \n "Long"}; -item63[] = {"get_ready_to_clo_1",2,250,450.000000,800.000000,550.000000,850.000000,0.000000,"get ready to close"}; -item64[] = {"sleep_",4,218,600.000000,800.000000,700.000000,850.000000,0.000000,"sleep" \n ""}; -item65[] = {"Server_Loading",2,250,-75.000000,250.000000,25.000000,300.000000,0.000000,"Server Loading"}; -item66[] = {"Too_Long",4,218,50.000000,250.000000,150.000000,300.000000,0.000000,"Too" \n "Long"}; -item67[] = {"Server_Ready",4,218,-75.000000,325.000000,25.000000,375.000000,0.000000,"Server Ready"}; -item68[] = {"New_Infected_Cha",4,218,-375.000000,450.000000,-275.000000,500.000000,5.000000,"New" \n "Infected" \n "Character"}; -item69[] = {"Player_Zombie__S",2,250,-300.000000,525.000000,-200.000000,575.000000,0.000000,"Player Zombie" \n " Selection"}; +item10[] = {"Has_PlayerID",4,218,-75.000000,175.000000,25.000000,225.000000,1.000000,"Has PlayerID"}; +item11[] = {"no_PlayerID",4,218,50.000000,150.000000,150.000000,200.000000,2.000000,"no PlayerID"}; +item12[] = {"ERROR__No_Player",2,250,175.000000,150.000000,275.000000,200.000000,0.000000,"ERROR:" \n "No PlayerID"}; +item13[] = {"Request",2,250,-75.000000,400.000000,25.000000,450.000000,0.000000,"Request"}; +item14[] = {"Response",4,218,-175.000000,450.000000,-75.000000,500.000000,0.000000,"Response"}; +item15[] = {"Parse_Login",2,250,-75.000000,500.000000,25.000000,550.000000,0.000000,"Parse Login"}; +item16[] = {"Hive_Bad",4,218,50.000000,500.000000,150.000000,550.000000,10.000000,"Hive" \n "Bad"}; +item17[] = {"ERROR__Wrong_HIVE",2,250,175.000000,500.000000,275.000000,550.000000,0.000000,"ERROR:" \n "Wrong HIVE" \n "Version"}; +item18[] = {"Hive_Ok",4,218,-175.000000,550.000000,-75.000000,600.000000,0.000000,"Hive" \n "Ok"}; +item19[] = {"Phase_One",2,250,-75.000000,600.000000,25.000000,650.000000,0.000000,"Phase One"}; +item20[] = {"Response",4,218,-175.000000,650.000000,-75.000000,700.000000,0.000000,"Response"}; +item21[] = {"Phase_Two",2,4346,-75.000000,700.000000,25.000000,750.000000,0.000000,"Phase Two"}; +item22[] = {"Dead_Player",4,218,50.000000,700.000000,150.000000,750.000000,0.000000,"Dead" \n "Player"}; +item23[] = {"ERROR__Player_Already",2,250,175.000000,700.000000,275.000000,750.000000,0.000000,"ERROR:" \n "Player Already" \n "Dead"}; +item24[] = {"Alive",4,218,-175.000000,750.000000,-75.000000,800.000000,0.000000,"Alive"}; +item25[] = {"Position",2,250,-75.000000,800.000000,25.000000,850.000000,0.000000,"Position"}; +item26[] = {"Version_Ok",4,218,-175.000000,850.000000,-75.000000,900.000000,0.000000,"Version" \n "Ok"}; +item27[] = {"Load_In",2,250,-75.000000,1000.000000,25.000000,1050.000000,0.000000,"Load In"}; +item28[] = {"Bad_Version",4,218,50.000000,800.000000,150.000000,850.000000,0.000000,"Bad" \n "Version"}; +item29[] = {"ERROR__Bad_Versi",2,250,175.000000,800.000000,275.000000,850.000000,0.000000,"ERROR:" \n "Bad Version"}; +item30[] = {"Display_Ready",4,218,-175.000000,1050.000000,-75.000000,1100.000000,0.000000,"Display" \n "Ready"}; +item31[] = {"Preload_Display",2,250,-75.000000,1100.000000,25.000000,1150.000000,0.000000,"Preload" \n "Display"}; +item32[] = {"Preload_Done",4,218,-175.000000,1150.000000,-75.000000,1200.000000,0.000000,"Preload" \n "Done"}; +item33[] = {"Initialize",2,250,-75.000000,1200.000000,25.000000,1250.000000,0.000000,"Initialize"}; +item34[] = {"Finish",1,250,-75.000000,1300.000000,25.000000,1350.000000,0.000000,"Finish"}; +item35[] = {"True",8,218,25.000000,1250.000000,125.000000,1300.000000,0.000000,"True"}; +item36[] = {"Too_Long",4,218,300.000000,150.000000,400.000000,200.000000,0.000000,"Too" \n "Long"}; +item37[] = {"Too_Long",4,218,300.000000,500.000000,400.000000,550.000000,0.000000,"Too" \n "Long"}; +item38[] = {"Too_Long",4,218,300.000000,700.000000,400.000000,750.000000,0.000000,"Too" \n "Long"}; +item39[] = {"Too_Long",4,218,300.000000,800.000000,400.000000,850.000000,0.000000,"Too" \n "Long"}; +item40[] = {"Enable_Sim",2,250,-75.000000,-100.000000,25.000000,-50.000000,0.000000,"Enable Sim"}; +item41[] = {"Initialized",4,218,-175.000000,-150.000000,-75.000000,-100.000000,0.000000,"Initialized"}; +item42[] = {"New_Character",4,218,-500.000000,375.000000,-400.000000,425.000000,5.000000,"New" \n "Character"}; +item43[] = {"Gender_Selection",2,250,-500.000000,500.000000,-400.000000,550.000000,0.000000,"Gender Selection" \n "Dialog"}; +item44[] = {"Selected",4,218,-400.000000,600.000000,-300.000000,650.000000,0.000000,"Selected"}; +item45[] = {"Process",2,250,-275.000000,600.000000,-175.000000,650.000000,0.000000,"Process"}; +item46[] = {"no_PlayerID",4,218,50.000000,-100.000000,150.000000,-50.000000,2.000000,"no PlayerID"}; +item47[] = {"ERROR__No_Player_1",2,250,175.000000,-100.000000,275.000000,-50.000000,0.000000,"ERROR:" \n "No PlayerID"}; +item48[] = {"Too_Long",4,218,300.000000,-100.000000,400.000000,-50.000000,0.000000,"Too" \n "Long"}; +item49[] = {"Stream",2,250,-75.000000,900.000000,25.000000,950.000000,0.000000,"Stream"}; +item50[] = {"Preloaded",4,218,-175.000000,950.000000,-75.000000,1000.000000,0.000000,"Preloaded"}; +item51[] = {"Retry",4,218,25.000000,375.000000,125.000000,425.000000,0.000000,"Retry"}; +item52[] = {"retry_",4,218,25.000000,425.000000,125.000000,475.000000,0.000000,"retry" \n ""}; +item53[] = {"Retry",2,250,125.000000,400.000000,225.000000,450.000000,0.000000,"Retry"}; +item54[] = {"auth_failed",4,218,250.000000,400.000000,350.000000,450.000000,0.000000,"auth failed"}; +item55[] = {"get_ready_to_clo",2,250,400.000000,400.000000,500.000000,450.000000,0.000000,"get ready to close"}; +item56[] = {"sleep_",4,218,550.000000,400.000000,650.000000,450.000000,0.000000,"sleep" \n ""}; +item57[] = {"Disconnect",2,250,675.000000,400.000000,775.000000,450.000000,0.000000,"Disconnect"}; +item58[] = {"No_time_date",4,218,25.000000,1150.000000,125.000000,1200.000000,0.000000,"No time/date"}; +item59[] = {"ERROR__No_Date_or",2,250,175.000000,1150.000000,275.000000,1200.000000,0.000000,"ERROR:" \n "No Date or Time"}; +item60[] = {"Too_Long",4,218,300.000000,1150.000000,400.000000,1200.000000,0.000000,"Too" \n "Long"}; +item61[] = {"get_ready_to_clo_1",2,250,450.000000,800.000000,550.000000,850.000000,0.000000,"get ready to close"}; +item62[] = {"sleep_",4,218,600.000000,800.000000,700.000000,850.000000,0.000000,"sleep" \n ""}; +item63[] = {"Server_Loading",2,250,-75.000000,250.000000,25.000000,300.000000,0.000000,"Server Loading"}; +item64[] = {"Too_Long",4,218,50.000000,250.000000,150.000000,300.000000,0.000000,"Too" \n "Long"}; +item65[] = {"Server_Ready",4,218,-75.000000,325.000000,25.000000,375.000000,0.000000,"Server Ready"}; +item66[] = {"New_Infected_Cha",4,218,-375.000000,450.000000,-275.000000,500.000000,5.000000,"New" \n "Infected" \n "Character"}; +item67[] = {"Player_Zombie__S",2,250,-300.000000,525.000000,-200.000000,575.000000,0.000000,"Player Zombie" \n " Selection"}; link0[] = {0,1}; link1[] = {0,5}; link2[] = {1,2}; link3[] = {2,3}; link4[] = {3,4}; -link5[] = {4,43}; +link5[] = {4,41}; link6[] = {5,4}; link7[] = {6,7}; link8[] = {7,8}; link9[] = {8,9}; link10[] = {9,10}; -link11[] = {9,12}; -link12[] = {9,13}; -link13[] = {10,11}; -link14[] = {11,12}; -link15[] = {12,65}; -link16[] = {13,14}; -link17[] = {14,38}; +link11[] = {9,11}; +link12[] = {10,63}; +link13[] = {11,12}; +link14[] = {12,36}; +link15[] = {13,14}; +link16[] = {13,52}; +link17[] = {14,15}; link18[] = {15,16}; -link19[] = {15,54}; -link20[] = {16,17}; -link21[] = {17,18}; -link22[] = {17,20}; -link23[] = {17,44}; -link24[] = {17,68}; -link25[] = {18,19}; -link26[] = {19,39}; -link27[] = {20,21}; -link28[] = {21,22}; +link19[] = {15,18}; +link20[] = {15,42}; +link21[] = {15,66}; +link22[] = {16,17}; +link23[] = {17,37}; +link24[] = {18,19}; +link25[] = {19,20}; +link26[] = {20,21}; +link27[] = {21,22}; +link28[] = {21,24}; link29[] = {22,23}; -link30[] = {23,24}; -link31[] = {23,26}; -link32[] = {24,25}; -link33[] = {25,40}; -link34[] = {26,27}; -link35[] = {27,28}; -link36[] = {27,30}; -link37[] = {28,51}; -link38[] = {29,32}; -link39[] = {30,31}; -link40[] = {31,41}; -link41[] = {32,33}; -link42[] = {33,34}; -link43[] = {34,35}; -link44[] = {35,37}; -link45[] = {35,60}; -link46[] = {37,36}; -link47[] = {38,59}; -link48[] = {39,59}; -link49[] = {40,59}; -link50[] = {41,63}; -link51[] = {42,6}; -link52[] = {42,48}; -link53[] = {43,42}; -link54[] = {44,45}; -link55[] = {45,46}; -link56[] = {46,47}; -link57[] = {47,20}; -link58[] = {48,49}; -link59[] = {49,50}; -link60[] = {50,59}; -link61[] = {51,52}; -link62[] = {52,29}; -link63[] = {53,15}; +link30[] = {23,38}; +link31[] = {24,25}; +link32[] = {25,26}; +link33[] = {25,28}; +link34[] = {26,49}; +link35[] = {27,30}; +link36[] = {28,29}; +link37[] = {29,39}; +link38[] = {30,31}; +link39[] = {31,32}; +link40[] = {32,33}; +link41[] = {33,35}; +link42[] = {33,58}; +link43[] = {35,34}; +link44[] = {36,57}; +link45[] = {37,57}; +link46[] = {38,57}; +link47[] = {39,61}; +link48[] = {40,6}; +link49[] = {40,46}; +link50[] = {41,40}; +link51[] = {42,43}; +link52[] = {43,44}; +link53[] = {44,45}; +link54[] = {45,18}; +link55[] = {46,47}; +link56[] = {47,48}; +link57[] = {48,57}; +link58[] = {49,50}; +link59[] = {50,27}; +link60[] = {51,13}; +link61[] = {52,53}; +link62[] = {53,51}; +link63[] = {53,54}; link64[] = {54,55}; -link65[] = {55,53}; -link66[] = {55,56}; -link67[] = {56,57}; -link68[] = {57,58}; -link69[] = {58,59}; -link70[] = {60,61}; -link71[] = {61,62}; -link72[] = {62,59}; -link73[] = {63,64}; -link74[] = {64,59}; -link75[] = {65,66}; -link76[] = {65,67}; -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,-394.084839,223.753876,1593.910034,981.637451,888,880,1}; -window[] = {2,-1,-1,-1,-1,862,104,1382,104,3,906}; +link65[] = {55,56}; +link66[] = {56,57}; +link67[] = {58,59}; +link68[] = {59,60}; +link69[] = {60,57}; +link70[] = {61,62}; +link71[] = {62,57}; +link72[] = {63,64}; +link73[] = {63,65}; +link74[] = {64,57}; +link75[] = {65,13}; +link76[] = {66,67}; +link77[] = {67,18}; +globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-575.904236,250.442123,1099.357422,251.607941,573,613,1}; +window[] = {2,-1,-1,-32000,-32000,979,376,1654,221,1,591}; *//*%FSM*/ class FSM { @@ -387,16 +382,6 @@ class FSM precondition = /*%FSM*/""/*%FSM*/; class Links { - /*%FSM*/ - class Single_Player - { - priority = 3.000000; - to="Make_PlayerID"; - precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"count playableUnits == 0 and isServer"/*%FSM*/; - action=/*%FSM*/""/*%FSM*/; - }; - /*%FSM*/ /*%FSM*/ class no_PlayerID { @@ -420,30 +405,6 @@ class FSM }; }; /*%FSM*/ - /*%FSM*/ - class Make_PlayerID - { - name = "Make_PlayerID"; - init = /*%FSM*/"//In Single Player" \n - " isSinglePlayer = true;" \n - " player sidechat ""PLOGIN: Single player Mode detected!"";" \n - " _playerUID = ""42"";"/*%FSM*/; - precondition = /*%FSM*/""/*%FSM*/; - class Links - { - /*%FSM*/ - class Has_PlayerID - { - priority = 1.000000; - to="Server_Loading"; - precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNil ""_playerUID"")"/*%FSM*/; - action=/*%FSM*/""/*%FSM*/; - }; - /*%FSM*/ - }; - }; - /*%FSM*/ /*%FSM*/ class ERROR__No_Player { @@ -760,12 +721,11 @@ class FSM "" \n "_worldspace = dayzPlayerLogin2 select 0;" \n "_state = dayzPlayerLogin2 select 1;" \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 + "if(dayz_paraSpawn and (freshSpawn == 2)) then {" \n " player setDir _setDir;" \n " player setPosATL [(_setPos select 0),(_setPos select 1),2000];" \n " [player,2000] spawn BIS_fnc_halo;" \n diff --git a/SQF/dayz_server/compile/server_playerSetup.sqf b/SQF/dayz_server/compile/server_playerSetup.sqf index 6e3acdbc3..8d6542e4a 100644 --- a/SQF/dayz_server/compile/server_playerSetup.sqf +++ b/SQF/dayz_server/compile/server_playerSetup.sqf @@ -233,7 +233,7 @@ _playerObj setVariable["humanity_CHK",_humanity]; //_playerObj setVariable["state",_state,true]; _playerObj setVariable["lastPos",getPosATL _playerObj]; -dayzPlayerLogin2 = [_worldspace,_state,_randomSpot]; +dayzPlayerLogin2 = [_worldspace,_state]; // PVDZE_obj_Debris = DZE_LocalRoadBlocks; _clientID = owner _playerObj;