From fa2dc58ef3ea49a4eb6f5637acf7069bfbbf618b Mon Sep 17 00:00:00 2001 From: Skaronator Date: Tue, 11 Feb 2014 12:48:06 +0100 Subject: [PATCH] Add Versioncheck for dayz.pbo --- CHANGE LOG 1.0.4.2.txt | 3 + SQF/dayz/config.cpp | 79 +------------------------ SQF/dayz_code/system/player_monitor.fsm | 10 ++-- 3 files changed, 9 insertions(+), 83 deletions(-) diff --git a/CHANGE LOG 1.0.4.2.txt b/CHANGE LOG 1.0.4.2.txt index 2a8d219f0..84d426675 100644 --- a/CHANGE LOG 1.0.4.2.txt +++ b/CHANGE LOG 1.0.4.2.txt @@ -1,4 +1,5 @@ [ADDED] BTR90 HQ ride in back option. @Fank +[ADDED] Version check for dayz.pbo. @Skaronator [FIXED] Completed trade counter was incorrectly returning output count instead of actual number of trades. @vbawol [FIXED] Incremental water bottle had a typo in the picture path. fixes: https://github.com/vbawol/DayZ-Epoch/issues/1084 @vbawol @@ -10,5 +11,7 @@ [FIXED] Fixed undefined variables s_player_tamedog and dayz_myLiftVehicle. @Fank @vbawol [FIXED] Typo in server_traders.sqf for Napf, Sauerland, and panthera. @vbawol +[REMOVED] Old Towngenerator Config. @Skaronator + [INFO] Models/textures by Paul Tomany. @Sequisha. [INFO] Special thanks to http://verthosting.com for hosting our development server. diff --git a/SQF/dayz/config.cpp b/SQF/dayz/config.cpp index a4acfb2f0..d7e5c9ff3 100644 --- a/SQF/dayz/config.cpp +++ b/SQF/dayz/config.cpp @@ -15,6 +15,7 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = 0.1; + dayzVersion = "1.0.4.2"; requiredAddons[] = {}; }; }; @@ -63,84 +64,6 @@ class RscTitles { }; }; }; -class RscStandardDisplay; // External class reference - -class DayZMontage : RscStandardDisplay { - idd = 50666; - movingenable = 0; - - class Controls { - class pic01 : RscPicture { - idc = 1001; - x = "0.17 * safezoneW + safezoneX"; - y = "0.17 * safezoneH + safezoneY"; - w = "0.65 * safezoneW"; - h = "0.65 * safezoneH"; - colorText[] = {0, 0, 0, 0}; - text = "\dayz\ui\intro\screen_01_ca.paa"; - }; - - class pic02 : pic01 { - idc = 1002; - text = "\dayz\ui\intro\screen_02_ca.paa"; - }; - - class pic03 : pic01 { - idc = 1003; - text = "\dayz\ui\intro\screen_04_ca.paa"; - }; - - class pic04 : pic01 { - idc = 1004; - text = "\dayz\ui\intro\screen_03_ca.paa"; - }; - - class pic05 : pic01 { - idc = 1005; - text = "\dayz\ui\intro\screen_05_ca.paa"; - }; - - class pic06 : pic01 { - idc = 1006; - text = "\dayz\ui\intro\screen_06_ca.paa"; - }; - - class pic07 : pic01 { - idc = 1007; - text = "\dayz\ui\intro\screen_07_ca.paa"; - }; - - class pic08 : pic01 { - idc = 1008; - text = "\dayz\ui\intro\screen_08_ca.paa"; - }; - - class pic09 : pic01 { - idc = 1009; - text = "\dayz\ui\intro\screen_09_ca.paa"; - }; - - class pic10 : pic01 { - idc = 1010; - text = "\dayz\ui\intro\screen_10_ca.paa"; - }; - - class pic11 : pic01 { - idc = 1011; - text = "\dayz\ui\intro\screen_11_ca.paa"; - }; - - class pic12 : pic01 { - idc = 1012; - text = "\dayz\ui\intro\screen_12_ca.paa"; - }; - - class pic13 : pic01 { - idc = 1013; - text = "\dayz\ui\intro\screen_13_ca.paa"; - }; - }; -}; class CfgMovesBasic { access = ReadAndCreate; diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index b3320a30d..ab0eae3d2 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -47,7 +47,7 @@ item42[] = {"New_Character",4,218,-325.000000,400.000000,-225.000000,450.000000, 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"}; +item46[] = {"no_PlayerID",4,4314,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"}; @@ -169,8 +169,8 @@ 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}; +globals[] = {25.000000,1,0,0,0,640,480,1,143,6316128,1,-400.773193,754.994873,294.455383,-631.582458,1137,911,1}; +window[] = {2,-1,-1,-1,-1,958,200,1478,200,3,1155}; *//*%FSM*/ class FSM { @@ -1341,7 +1341,7 @@ class FSM "_myEpoch = getText(configFile >> ""CfgPatches"" >> ""dayz_epoch"" >> ""dayzVersion"");" \n "_myEpochB = getText(configFile >> ""CfgPatches"" >> ""dayz_epoch_b"" >> ""dayzVersion"");" \n "_myEpochSfx = getText(configFile >> ""CfgPatches"" >> ""dayz_sfx"" >> ""dayzVersion"");" \n - "" \n + "_myEpochDayZ = getText(configFile >> ""CfgPatches"" >> ""dayz"" >> ""dayzVersion"");" \n "" \n "player enableSimulation true;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -1353,7 +1353,7 @@ class FSM priority = 2.000000; to="ERROR__No_Player_1"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"(_myEpochAnim != ""1.0.4"") || (_myEpoch != ""1.0.4"") || (_myEpochB != ""1.0.4.1"") || (_myEpochSfx != ""1.0.4.1"")"/*%FSM*/; + condition=/*%FSM*/"(_myEpochAnim != ""1.0.4"") || (_myEpoch != ""1.0.4"") || (_myEpochB != ""1.0.4.1"") || (_myEpochSfx != ""1.0.4.1"") || (_myEpochDayZ != ""1.0.4.2"")"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/