W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 20:13:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

version control and RC4

Browse Source
This commit is contained in:
[VB]AWOL
2013-10-11 11:44:07 -05:00
parent 9dc2c01d9a
commit b20a6e2948
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_anim/config.cpp
View File

File diff suppressed because one or more lines are too long

2
SQF/dayz_code/Configs/rscTitles.hpp
View File

@@ -149,7 +149,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version class DAYZ_Version : CA_Version
{ {
idc = -1; idc = -1;
text = "DayZ Epoch 1.0.2.4 RC3"; text = "DayZ Epoch 1.0.2.4 RC4";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
}; };
delete CA_TitleMainMenu; delete CA_TitleMainMenu;

2
SQF/dayz_code/config.cpp
View File

@@ -41,7 +41,7 @@ class CfgMods
hidePicture = 0; hidePicture = 0;
hideName = 0; hideName = 0;
action = "http://www.dayzepoch.com"; action = "http://www.dayzepoch.com";
version = "1.0.2.397"; version = "1.0.2.398";
hiveVersion = 0.96; //0.93 hiveVersion = 0.96; //0.93
}; };
}; };

21
SQF/dayz_code/system/player_monitor.fsm
View File

@@ -1,4 +1,4 @@
/*%FSM<COMPILE "D:\Programme\Bohemia Interactive\Tools\FSM Editor Personal Edition\scriptedFSM.cfg, DayZ Player Monitor">*/ /*%FSM<COMPILE "F:\Program Files (x86)\Bohemia Interactive\Tools\FSM Editor Personal Edition\scriptedFSM.cfg, DayZ Player Monitor">*/
/*%FSM<HEAD>*/ /*%FSM<HEAD>*/
/* /*
item0[] = {"init",0,250,-75.000000,-350.000000,25.000000,-300.000000,0.000000,"init"}; item0[] = {"init",0,250,-75.000000,-350.000000,25.000000,-300.000000,0.000000,"init"};
@@ -43,13 +43,13 @@ item38[] = {"Too_Long",4,218,300.000000,150.000000,400.000000,200.000000,0.00000
item39[] = {"Too_Long",4,218,300.000000,500.000000,400.000000,550.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"}; 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"}; 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"}; item42[] = {"Enable_Sim",2,4346,-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"}; 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"}; 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"}; 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"}; 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"}; item47[] = {"Process",2,250,-275.000000,600.000000,-175.000000,650.000000,0.000000,"Process"};
item48[] = {"no_PlayerID",4,4314,50.000000,-100.000000,150.000000,-50.000000,2.000000,"no PlayerID"}; 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"}; 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"}; 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"}; item51[] = {"Stream",2,250,-75.000000,900.000000,25.000000,950.000000,0.000000,"Stream"};
@@ -152,8 +152,8 @@ link77[] = {66,59};
link78[] = {67,15}; link78[] = {67,15};
link79[] = {68,69}; link79[] = {68,69};
link80[] = {69,20}; link80[] = {69,20};
globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-222.006485,507.642456,414.571289,-329.785095,892,951,1}; globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-557.366516,843.001587,849.326355,-532.202698,892,880,1};
window[] = {2,-1,-1,-1,-1,809,1945,3317,29,3,910}; window[] = {2,-1,-1,-32000,-32000,806,26,1398,26,3,910};
*//*%FSM</HEAD>*/ *//*%FSM</HEAD>*/
class FSM class FSM
{ {
@@ -1085,18 +1085,23 @@ class FSM
"};" \n "};" \n
"" \n "" \n
"if (player hasWeapon ""MeleeCrowbar"") then {" \n "if (player hasWeapon ""MeleeCrowbar"") then {" \n
" player removeMagazine 'crowbar_swing'; " \n
" player addMagazine 'crowbar_swing';" \n " player addMagazine 'crowbar_swing';" \n
"};" \n "};" \n
"if (player hasWeapon ""MeleeSledge"") then {" \n "if (player hasWeapon ""MeleeSledge"") then {" \n
" player removeMagazine 'sledge_swing'; " \n
" player addMagazine 'sledge_swing';" \n " player addMagazine 'sledge_swing';" \n
"};" \n "};" \n
"if (player hasWeapon ""MeleeHatchet"") then {" \n "if (player hasWeapon ""MeleeHatchet"") then {" \n
" player removeMagazine 'hatchet_swing'; " \n
" player addMagazine 'hatchet_swing';" \n " player addMagazine 'hatchet_swing';" \n
"};" \n "};" \n
"if (player hasWeapon ""MeleeMachete"") then {" \n "if (player hasWeapon ""MeleeMachete"") then {" \n
" player removeMagazine 'machete_swing'; " \n
" player addMagazine 'machete_swing';" \n " player addMagazine 'machete_swing';" \n
"};" \n "};" \n
"if (player hasWeapon ""MeleeFishingPole"") then {" \n "if (player hasWeapon ""MeleeFishingPole"") then {" \n
" player removeMagazine 'Fishing_Swing'; " \n
" player addMagazine 'Fishing_Swing';" \n " player addMagazine 'Fishing_Swing';" \n
"};" \n "};" \n
"" \n "" \n
@@ -1315,8 +1320,10 @@ class FSM
name = "Enable_Sim"; name = "Enable_Sim";
init = /*%FSM<STATEINIT""">*/"diag_log (""PLOGIN: Enable Sim"");" \n init = /*%FSM<STATEINIT""">*/"diag_log (""PLOGIN: Enable Sim"");" \n
"" \n "" \n
"_myEpochAnim = getNumber(configFile >> ""CfgPatches"" >> ""dayz_anim"" >> ""dayzVersion"");" \n
"_myEpoch = getNumber(configFile >> ""CfgPatches"" >> ""dayz_epoch"" >> ""dayzVersion"");" \n "_myEpoch = getNumber(configFile >> ""CfgPatches"" >> ""dayz_epoch"" >> ""dayzVersion"");" \n
"_myEpochB = getNumber(configFile >> ""CfgPatches"" >> ""dayz_epoch_b"" >> ""dayzVersion"");" \n "_myEpochB = getNumber(configFile >> ""CfgPatches"" >> ""dayz_epoch_b"" >> ""dayzVersion"");" \n
"_myEpochSfx = getNumber(configFile >> ""CfgPatches"" >> ""dayz_sfx"" >> ""dayzVersion"");" \n
"" \n "" \n
"" \n "" \n
"player enableSimulation true;"/*%FSM</STATEINIT""">*/; "player enableSimulation true;"/*%FSM</STATEINIT""">*/;
@@ -1329,7 +1336,7 @@ class FSM
priority = 2.000000; priority = 2.000000;
to="ERROR__No_Player_1"; to="ERROR__No_Player_1";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"(_myEpochB != ""1.0.2.4"") || (_myEpochB != ""1.0.2.4"")"/*%FSM</CONDITION""">*/; condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.2.4"") || (_myEpochB != ""1.0.2.4"") || (_myEpochB != ""1.0.2.4"") || (_myEpochSfx != ""1.0.2.4"")"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/; action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
}; };
/*%FSM</LINK>*/ /*%FSM</LINK>*/
@@ -1398,7 +1405,7 @@ class FSM
init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n init = /*%FSM<STATEINIT""">*/"endLoadingScreen;" \n
"selectNoPlayer;" \n "selectNoPlayer;" \n
"_myTime = diag_tickTime;" \n "_myTime = diag_tickTime;" \n
"1 cutText [""You have an outdated version of 'dayz_anim' please download the correct version"", ""PLAIN"",15];"/*%FSM</STATEINIT""">*/; "1 cutText [""You have an outdated version of epoch please download the correct version"", ""PLAIN"",15];"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
{ {

1
SQF/dayz_sfx/config.cpp
View File

@@ -22,6 +22,7 @@ class CfgPatches {
units[] = {}; units[] = {};
weapons[] = {}; weapons[] = {};
requiredVersion = 0.1; requiredVersion = 0.1;
dayzVersion = "1.0.2.4";
requiredAddons[] = {}; requiredAddons[] = {};
}; };
}; };