From 13b7a77c71266dc02fd05125c64bee10a3c2861b Mon Sep 17 00:00:00 2001 From: Skaronator Date: Wed, 15 Jan 2014 14:18:54 +0100 Subject: [PATCH] Move the freshSpawn, update layout a bit --- SQF/dayz_code/system/player_monitor.fsm | 68 ++++++++++++++----------- 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index e58dd91fb..35c12ae8c 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -20,7 +20,7 @@ item15[] = {"Parse_Login",2,250,-75.000000,500.000000,25.000000,550.000000,0.000 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,4346,-75.000000,600.000000,25.000000,650.000000,0.000000,"Phase One"}; +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,250,-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"}; @@ -43,9 +43,9 @@ item38[] = {"Too_Long",4,218,300.000000,700.000000,400.000000,750.000000,0.00000 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,-325.000000,325.000000,-225.000000,375.000000,5.000000,"New" \n "Character"}; -item43[] = {"Gender_Selection",2,250,-575.000000,325.000000,-475.000000,375.000000,0.000000,"Gender Selection" \n "Dialog"}; -item44[] = {"Selected",4,218,-575.000000,400.000000,-475.000000,450.000000,0.000000,"Selected"}; +item42[] = {"New_Character",4,218,-325.000000,400.000000,-225.000000,450.000000,5.000000,"New" \n "Character"}; +item43[] = {"Gender_Selection",2,250,-575.000000,400.000000,-475.000000,450.000000,0.000000,"Gender Selection" \n "Dialog"}; +item44[] = {"Selected",4,218,-575.000000,475.000000,-475.000000,525.000000,0.000000,"Selected"}; item45[] = {"Process",2,250,-575.000000,550.000000,-475.000000,600.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"}; @@ -58,7 +58,7 @@ item53[] = {"Retry",2,250,125.000000,400.000000,225.000000,450.000000,0.000000," 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"}; +item57[] = {"Disconnect",2,250,825.000000,400.000000,925.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"}; @@ -67,12 +67,19 @@ item62[] = {"sleep_",4,218,600.000000,800.000000,700.000000,850.000000,0.000000, 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,-325.000000,400.000000,-225.000000,450.000000,5.000000,"New" \n "Infected" \n "Character"}; -item67[] = {"Player_Zombie__S",2,250,-450.000000,400.000000,-350.000000,450.000000,0.000000,"Player Zombie" \n " Selection"}; +item66[] = {"New_Infected_Cha",4,218,-325.000000,475.000000,-225.000000,525.000000,5.000000,"New" \n "Infected" \n "Character"}; +item67[] = {"Player_Zombie__S",2,250,-450.000000,475.000000,-350.000000,525.000000,0.000000,"Player Zombie" \n " Selection"}; item68[] = {"",7,210,-204.000000,521.000000,-196.000000,529.000000,0.000000,""}; -item69[] = {"",7,210,-204.000000,421.000000,-196.000000,429.000000,0.000000,""}; -item70[] = {"",7,210,-204.000000,346.000000,-196.000000,354.000000,0.000000,""}; +item69[] = {"",7,210,-204.000000,496.000000,-196.000000,504.000000,0.000000,""}; +item70[] = {"",7,210,-204.000000,421.000000,-196.000000,429.000000,0.000000,""}; item71[] = {"",7,210,-404.000000,571.000000,-396.000000,579.000000,0.000000,""}; +item72[] = {"",7,210,871.000000,1171.000000,879.000000,1179.000000,0.000000,""}; +item73[] = {"",7,210,871.000000,821.000000,879.000000,829.000000,0.000000,""}; +item74[] = {"",7,210,871.000000,721.000000,879.000000,729.000000,0.000000,""}; +item75[] = {"",7,210,871.000000,521.000000,879.000000,529.000000,0.000000,""}; +item76[] = {"",7,210,871.000000,170.999985,879.000000,179.000015,0.000000,""}; +item77[] = {"",7,210,871.000000,-79.000000,879.000000,-71.000000,0.000000,""}; +item78[] = {"",7,210,871.000000,271.000000,879.000000,279.000000,0.000000,""}; link0[] = {0,1}; link1[] = {0,5}; link2[] = {1,2}; @@ -116,9 +123,9 @@ link39[] = {32,33}; link40[] = {33,35}; link41[] = {33,58}; link42[] = {35,34}; -link43[] = {36,57}; -link44[] = {37,57}; -link45[] = {38,57}; +link43[] = {36,76}; +link44[] = {37,75}; +link45[] = {38,74}; link46[] = {39,61}; link47[] = {40,6}; link48[] = {40,46}; @@ -129,7 +136,7 @@ link52[] = {44,45}; link53[] = {45,71}; link54[] = {46,47}; link55[] = {47,48}; -link56[] = {48,57}; +link56[] = {48,77}; link57[] = {49,50}; link58[] = {50,27}; link59[] = {51,13}; @@ -141,12 +148,12 @@ link64[] = {55,56}; link65[] = {56,57}; link66[] = {58,59}; link67[] = {59,60}; -link68[] = {60,57}; +link68[] = {60,72}; link69[] = {61,62}; -link70[] = {62,57}; +link70[] = {62,73}; link71[] = {63,64}; link72[] = {63,65}; -link73[] = {64,57}; +link73[] = {64,78}; link74[] = {65,13}; link75[] = {66,67}; link76[] = {67,71}; @@ -155,8 +162,15 @@ link78[] = {69,66}; link79[] = {69,70}; link80[] = {70,42}; link81[] = {71,18}; -globals[] = {25.000000,1,0,0,0,640,480,1,135,6316128,1,-484.875916,99.442245,872.143433,-44.059429,581,911,1}; -window[] = {2,-1,-1,-1,-1,858,100,1378,100,3,599}; +link82[] = {72,73}; +link83[] = {73,74}; +link84[] = {74,75}; +link85[] = {75,57}; +link86[] = {76,78}; +link87[] = {77,76}; +link88[] = {78,57}; +globals[] = {25.000000,1,0,0,0,640,480,1,143,6316128,1,-158.844666,996.923462,645.150146,-280.887787,1137,911,1}; +window[] = {2,-1,-1,-1,-1,908,150,1428,150,3,1155}; *//*%FSM*/ class FSM { @@ -182,8 +196,8 @@ class FSM "_readytoAuth = false;" \n "_startCheck = 0;" \n "//player enableSimulation false;" \n - "" \n - "_debug = false;" \n + "if(isNil ""DZEdebug"") then { DZEdebug = false; };" \n + "_debug = DZEdebug;" \n "" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -621,9 +635,7 @@ class FSM class Phase_One { name = "Phase_One"; - init = /*%FSM*/"//_model = ""BanditW1_DZ"";" \n - "" \n - "dayz_playerName = name player;" \n + init = /*%FSM*/"dayz_playerName = name player;" \n "_model call player_switchModel;" \n "" \n "player allowDamage false;" \n @@ -633,12 +645,6 @@ class FSM "_usedFood = 0;" \n "_usedWater = 0;" \n "" \n - "//_inventory = [[""Mk_48_DZ"",""NVGoggles"",""Binocular_Vector"",""M9SD"",""ItemGPS"",""ItemToolbox"",""ItemEtool"",""ItemCompass"",""ItemMatchbox"",""FoodCanBakedBeans"",""ItemKnife"",""ItemMap"",""ItemWatch""],[[""100Rnd_762x51_M240"",47],""ItemPainkiller"",""ItemBandage"",""15Rnd_9x19_M9SD"",""100Rnd_762x51_M240"",""ItemBandage"",""ItemBandage"",""15Rnd_9x19_M9SD"",""15Rnd_9x19_M9SD"",""15Rnd_9x19_M9SD"",""ItemMorphine"",""PartWoodPile""]];" \n - "" \n - "if (isNil ""freshSpawn"") then {" \n - " freshSpawn = 0;" \n - "};" \n - "" \n "dayzGearSave = false;" \n "_inventory call player_gearSet;" \n "" \n @@ -750,6 +756,10 @@ class FSM "_setDir = _worldspace select 0;" \n "_setPos = _worldspace select 1;" \n "" \n + "if (isNil ""freshSpawn"") then {" \n + " freshSpawn = 0;" \n + "};" \n + "" \n "if(dayz_paraSpawn and (freshSpawn == 2)) then {" \n " player setDir _setDir;" \n " player setPosATL [(_setPos select 0),(_setPos select 1),2000];" \n