From 840e52e9a52a0bed6bdd7b2e383787804fd1009b Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 8 Jul 2013 15:28:42 -0500 Subject: [PATCH] REsec and BIS effects fixes from 177 part 2 --- SQF/dayz_code/medical/setup_functions_med.sqf | 2 +- .../DayZ_Epoch_1.Takistan/description.ext | 4 +- .../MPMissions/DayZ_Epoch_1.Takistan/init.sqf | 32 ++++++++- .../DayZ_Epoch_1.Takistan/mission.sqm | 3 + .../description.ext | 12 +++- .../DayZ_Epoch_10.Mountains_ACR/init.sqf | 62 ++++++++++++++--- .../DayZ_Epoch_10.Mountains_ACR/mission.sqm | 10 ++- .../R3F_Realism/R3F_Weight/R3F_CfgWeight.h | 4 ++ .../DayZ_Epoch_11.Chernarus/mission.sqm | 1 + .../DayZ_Epoch_12.isladuala/description.ext | 4 +- .../DayZ_Epoch_12.isladuala/init.sqf | 32 ++++++++- .../DayZ_Epoch_12.isladuala/mission.sqm | 6 +- .../DayZ_Epoch_13.Tavi/description.ext | 4 +- .../MPMissions/DayZ_Epoch_13.Tavi/init.sqf | 34 +++++++++- .../MPMissions/DayZ_Epoch_13.Tavi/mission.sqm | 6 +- .../DayZ_Epoch_15.namalsk/description.ext | 6 +- .../MPMissions/DayZ_Epoch_15.namalsk/init.sqf | 32 ++++++++- .../DayZ_Epoch_15.namalsk/mission.sqm | 6 +- .../DayZ_Epoch_16.Panthera2/description.ext | 6 +- .../DayZ_Epoch_16.Panthera2/mission.sqm | 6 +- .../DayZ_Epoch_17.Chernarus/description.ext | 4 +- .../DayZ_Epoch_17.Chernarus/init.sqf | 39 ++++++++++- .../DayZ_Epoch_2.Utes/description.ext | 4 +- .../MPMissions/DayZ_Epoch_2.Utes/init.sqf | 32 ++++++++- .../MPMissions/DayZ_Epoch_2.Utes/mission.sqm | 3 + .../DayZ_Epoch_3.Shapur_BAF/description.ext | 5 +- .../DayZ_Epoch_3.Shapur_BAF/init.sqf | 32 ++++++++- .../DayZ_Epoch_3.Shapur_BAF/mission.sqm | 4 ++ .../DayZ_Epoch_4.Zargabad/description.ext | 4 +- .../MPMissions/DayZ_Epoch_4.Zargabad/init.sqf | 32 ++++++++- .../DayZ_Epoch_4.Zargabad/mission.sqm | 3 + .../DayZ_Epoch_5.Bootcamp_ACR/description.ext | 8 ++- .../DayZ_Epoch_5.Bootcamp_ACR/init.sqf | 61 ++++++++++++++--- .../DayZ_Epoch_5.Bootcamp_ACR/mission.sqm | 10 ++- .../DayZ_Epoch_6.Dingor/description.ext | 4 +- .../MPMissions/DayZ_Epoch_6.Dingor/init.sqf | 32 ++++++++- .../DayZ_Epoch_6.Dingor/mission.sqm | 7 +- .../DayZ_Epoch_7.Lingor/description.ext | 4 +- .../MPMissions/DayZ_Epoch_7.Lingor/init.sqf | 32 ++++++++- .../DayZ_Epoch_7.Lingor/mission.sqm | 7 +- .../description.ext | 4 +- .../DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf | 32 ++++++++- .../mission.sqm | 6 +- .../DayZ_Epoch_9.Woodland_ACR/description.ext | 8 ++- .../DayZ_Epoch_9.Woodland_ACR/init.sqf | 68 ++++++++++++++----- .../DayZ_Epoch_9.Woodland_ACR/mission.sqm | 10 ++- 46 files changed, 646 insertions(+), 81 deletions(-) diff --git a/SQF/dayz_code/medical/setup_functions_med.sqf b/SQF/dayz_code/medical/setup_functions_med.sqf index eb97af186..28be814e2 100644 --- a/SQF/dayz_code/medical/setup_functions_med.sqf +++ b/SQF/dayz_code/medical/setup_functions_med.sqf @@ -254,5 +254,5 @@ fnc_usec_recoverUncons = { sleep 1; r_player_cardiac = false; r_player_handler1 = false; - player switchMove "AmovPpneMstpSnonWnonDnon_healed"; + // player switchMove "AmovPpneMstpSnonWnonDnon_healed"; }; \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/description.ext b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/description.ext index 282d3a60a..d5c7f2d98 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/description.ext @@ -8,8 +8,10 @@ disabledAI = true; disableChannels[]={0,1,2,6}; enableItemsDropping=0; #include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; -onPauseScript = "\z\addons\dayz_code\compile\player_onPause.sqf"; +onPauseScript = ""; loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header { diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index a874792cf..7f03f969d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -43,6 +43,35 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -73,4 +102,5 @@ if (!isDedicated) then { _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; -}; \ No newline at end of file +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm index e8da933bb..83455511e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm @@ -5,9 +5,12 @@ class Mission { "takistan", "ca_modules_animals", + "dayz_anim", "dayz_code", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/description.ext b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/description.ext index caf9199f2..401473d5c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/description.ext @@ -1,12 +1,18 @@ respawn = "BASE"; respawndelay = 5; -onLoadMission="DayZ_Epoch Zargabad"; -OnLoadIntro = "Welcome to Zargabad"; +onLoadMission="DayZ_Epoch Mountains ACR"; +OnLoadIntro = "Welcome to Mountains ACR"; OnLoadIntroTime = False; OnLoadMissionTime = False; disabledAI = true; -disableChannels[]={0,2,6}; +disableChannels[]={0,1,2,6}; enableItemsDropping=0; +#include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; + +onPauseScript = ""; +loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header { diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf index 2c06d8d01..7a032c89b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf @@ -1,17 +1,23 @@ -startLoadingScreen ["","DayZ_loadingScreen"]; /* For DayZ Epoch Addons Credits: Jetski Yanahui by Kol9yN, Zakat, Gerasimow9, YuraPetrov, zGuba, A.Karagod, IceBreakr, Sahbazz */ +startLoadingScreen ["","RscDisplayLoadCustom"]; +cutText ["","BLACK OUT"]; enableSaving [false, false]; //REALLY IMPORTANT VALUES -dayZ_instance = 10; //The instance -hiveInUse = true; +dayZ_instance = 10; //The instance +dayzHiveRequest = []; initialized = false; dayz_previousID = 0; -// AMP config +//disable greeting menu +player setVariable ["BIS_noCoreConversations", true]; +//disable radio messages to be heard and shown in the left lower corner of the screen +enableRadio false; + +// DayZ Epoch config spawnShoremode = 0; // Default = 1 (on shore) spawnArea= 1000; // Default = 1500 MaxHeliCrashes= 3; // Default = 5 @@ -23,6 +29,7 @@ dayz_maxLocalZombies = 40; // Default = 40 EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"]]; dayz_fullMoonNights = true; +//Load in compiled functions call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; //Initilize the Variables (IMPORTANT: Must happen very early) progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; //Initilize the publicVariable event handlers @@ -30,10 +37,41 @@ progressLoadingScreen 0.2; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; //Functions used by CLIENT for medical progressLoadingScreen 0.4; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; //Compile regular functions +progressLoadingScreen 0.5; +call compile preprocessFileLineNumbers "server_traders.sqf"; //Compile trader configs progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -47,18 +85,22 @@ if ((!isServer) && (player != player)) then }; if (isServer) then { - //Run the server monitor - hiveInUse = true; - _serverMonitor = [] execVM "\z\addons\dayz_server\system\server_monitor.sqf"; + call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs + + // Add trader citys + _nil = [] execVM "mission.sqf"; + _serverMonitor = [] execVM "\z\addons\dayz_code\system\server_monitor.sqf"; }; if (!isDedicated) then { //Conduct map operations 0 fadeSound 0; - 0 cutText [(localize "STR_AUTHENTICATING"), "BLACK FADED",60]; + waitUntil {!isNil "dayz_loadScreenMsg"}; + dayz_loadScreenMsg = (localize "STR_AUTHENTICATING"); //Run the player monitor _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; - -}; \ No newline at end of file + _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/mission.sqm index f59547cca..a8f15d1d1 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/mission.sqm @@ -5,15 +5,23 @@ class Mission { "mountains_acr", "ca_modules_animals", + "dayz_anim", "dayz_code", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", "warfarebuildings", "ind_tank", - "camisc_e" + "camisc_e", + "glt_m300t", + "sigisolda", + "suv_col", + "csj_gyroac", + "map_eu" }; addOnsAuto[]= { diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index 48f23b526..b0aa80893 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -1611,6 +1611,10 @@ class CfgWeight { weight = 0.002; }; + class ItemSodaCokeEmpty + { + weight = 0.002; + }; class ItemSodaPepsiEmpty { weight = 0.002; diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm index 373d450d0..d837c3fa8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm @@ -10,6 +10,7 @@ class Mission "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/description.ext b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/description.ext index 0220a0b21..93d4ad8d4 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/description.ext @@ -8,8 +8,10 @@ disabledAI = true; disableChannels[]={0,1,2,6}; enableItemsDropping=0; #include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; -onPauseScript = "\z\addons\dayz_code\compile\player_onPause.sqf"; +onPauseScript = ""; loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index b4d017119..d9379a57f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -43,6 +43,35 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -73,4 +102,5 @@ if (!isDedicated) then { _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; -}; \ No newline at end of file +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm index daa8625fb..884440b5b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm @@ -5,9 +5,12 @@ class Mission { "ibr_isladuala", "ca_modules_animals", + "dayz_anim", "dayz_code", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", @@ -17,7 +20,8 @@ class Mission "glt_m300t", "sigisolda", "suv_col", - "csj_gyroac" + "csj_gyroac", + "map_eu" }; addOnsAuto[]= { diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/description.ext b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/description.ext index d53a2c3a6..83a6f6d46 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/description.ext @@ -8,8 +8,10 @@ disabledAI = true; disableChannels[]={0,1,2,6}; enableItemsDropping=0; #include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; -onPauseScript = "\z\addons\dayz_code\compile\player_onPause.sqf"; +onPauseScript = ""; loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index 1b60566c6..468a5d730 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -17,7 +17,7 @@ player setVariable ["BIS_noCoreConversations", true]; //disable radio messages to be heard and shown in the left lower corner of the screen enableRadio false; -// Epoch config +// DayZ Epoch config spawnShoremode = 1; // Default = 1 (on shore) spawnArea = 2500; // Default = 1500 @@ -55,6 +55,35 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -85,4 +114,5 @@ if (!isDedicated) then { _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; -}; \ No newline at end of file +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm index 11dfbb14c..f92baa5ed 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm @@ -5,9 +5,12 @@ class Mission { "tavi", "ca_modules_animals", + "dayz_anim", "dayz_code", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", @@ -17,7 +20,8 @@ class Mission "glt_m300t", "sigisolda", "suv_col", - "csj_gyroac" + "csj_gyroac", + "map_eu" }; addOnsAuto[]= { diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/description.ext b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/description.ext index 014e3dad5..ea9f0fb10 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/description.ext @@ -5,11 +5,13 @@ OnLoadIntro = "Welcome to Namalsk"; OnLoadIntroTime = False; OnLoadMissionTime = False; disabledAI = true; -disableChannels[]={1,2,6}; +disableChannels[]={0,1,2,6}; enableItemsDropping=0; #include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; -onPauseScript = "\z\addons\dayz_code\compile\player_onPause.sqf"; +onPauseScript = ""; loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index 28408f333..da240baca 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -56,6 +56,35 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -86,4 +115,5 @@ if (!isDedicated) then { _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; -}; \ No newline at end of file +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/mission.sqm index d197ac57b..5b8b7445c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/mission.sqm @@ -5,9 +5,12 @@ class Mission { "namalsk", "ca_modules_animals", + "dayz_anim", "dayz_code", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", @@ -17,7 +20,8 @@ class Mission "glt_m300t", "sigisolda", "suv_col", - "csj_gyroac" + "csj_gyroac", + "map_eu" }; addOnsAuto[]= { diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/description.ext b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/description.ext index 9bdbcc181..331ee00f8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/description.ext @@ -5,11 +5,13 @@ OnLoadIntro = "Welcome to Panthera Island"; OnLoadIntroTime = False; OnLoadMissionTime = False; disabledAI = true; -disableChannels[]={1,2,6}; +disableChannels[]={0,1,2,6}; enableItemsDropping=0; #include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; -onPauseScript = "\z\addons\dayz_code\compile\player_onPause.sqf"; +onPauseScript = ""; loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/mission.sqm index 8a4138499..f7b4f6be3 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/mission.sqm @@ -5,9 +5,12 @@ class Mission { "ibr_panthera2", "ca_modules_animals", + "dayz_anim", "dayz_code", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", @@ -17,7 +20,8 @@ class Mission "glt_m300t", "sigisolda", "suv_col", - "csj_gyroac" + "csj_gyroac", + "map_eu" }; addOnsAuto[]= { diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/description.ext b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/description.ext index 6c2b35cfc..0e55184d0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/description.ext @@ -8,8 +8,10 @@ disabledAI = true; disableChannels[]={0,1,2,6}; enableItemsDropping = 0; #include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; -onPauseScript = "\z\addons\dayz_code\compile\player_onPause.sqf"; +onPauseScript = ""; loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index 647eb979f..ab4f3fdc8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -1,5 +1,6 @@ /* - INITILIZATION + For DayZ Epoch + Addons Credits: Jetski Yanahui by Kol9yN, Zakat, Gerasimow9, YuraPetrov, zGuba, A.Karagod, IceBreakr, Sahbazz */ startLoadingScreen ["","RscDisplayLoadCustom"]; cutText ["","BLACK OUT"]; @@ -23,8 +24,10 @@ MaxHeliCrashes= 5; // Default = 5 MaxVehicleLimit = 300; // Default = 50 MaxDynamicDebris = 500; // Default = 100 dayz_MapArea = 14000; // Default = 10000 -dayz_maxLocalZombies = 40; // Default = 40 +dayz_maxLocalZombies = 30; // Default = 30 +EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"]]; +dayz_fullMoonNights = true; //Load in compiled functions call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; //Initilize the Variables (IMPORTANT: Must happen very early) @@ -40,6 +43,35 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -70,4 +102,5 @@ if (!isDedicated) then { _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; -}; \ No newline at end of file +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/description.ext b/Server Files/MPMissions/DayZ_Epoch_2.Utes/description.ext index 0f560e9c0..23bece9ab 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/description.ext @@ -8,8 +8,10 @@ disabledAI = true; disableChannels[]={0,1,2,6}; enableItemsDropping=0; #include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; -onPauseScript = "\z\addons\dayz_code\compile\player_onPause.sqf"; +onPauseScript = ""; loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index 1e44c4419..10176ffd0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf @@ -43,6 +43,35 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -73,4 +102,5 @@ if (!isDedicated) then { _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; -}; \ No newline at end of file +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_2.Utes/mission.sqm index bdf88f1df..2a34bdd9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/mission.sqm @@ -5,9 +5,12 @@ class Mission { "utes", "ca_modules_animals", + "dayz_anim", "dayz_code", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/description.ext b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/description.ext index 9f543b107..014561a6b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/description.ext @@ -7,8 +7,11 @@ OnLoadMissionTime = False; disabledAI = true; disableChannels[]={0,1,2,6}; enableItemsDropping = 0; -onPauseScript = "\z\addons\dayz_code\compile\player_onPause.sqf"; +#include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; +onPauseScript = ""; loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf index 9c35696b8..aa8da7df7 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf @@ -43,6 +43,35 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -73,4 +102,5 @@ if (!isDedicated) then { _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; -}; \ No newline at end of file +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/mission.sqm index 0bb72b34a..77f74e9d8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/mission.sqm @@ -5,9 +5,12 @@ class Mission { "shapur_baf", "ca_modules_animals", + "dayz_anim", "dayz_code", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", @@ -18,6 +21,7 @@ class Mission "sigisolda", "suv_col", "csj_gyroac", + "map_eu" }; addOnsAuto[]= { diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/description.ext b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/description.ext index a8c44293b..29ff4be3c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/description.ext @@ -8,8 +8,10 @@ disabledAI = true; disableChannels[]={0,1,2,6}; enableItemsDropping=0; #include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; -onPauseScript = "\z\addons\dayz_code\compile\player_onPause.sqf"; +onPauseScript = ""; loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header { diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index 9c0f393a4..faedc72b1 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf @@ -43,6 +43,35 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -73,4 +102,5 @@ if (!isDedicated) then { _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; -}; \ No newline at end of file +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/mission.sqm index a520c7b78..1446c3e1c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/mission.sqm @@ -5,9 +5,12 @@ class Mission { "zargabad", "ca_modules_animals", + "dayz_anim", "dayz_code", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/description.ext b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/description.ext index e5b3cb2fd..f3763ecc8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/description.ext @@ -5,8 +5,14 @@ OnLoadIntro = "Welcome to Bootcamp ACR"; OnLoadIntroTime = False; OnLoadMissionTime = False; disabledAI = true; -disableChannels[]={0,2,6}; +disableChannels[]={0,1,2,6}; enableItemsDropping=0; +#include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; + +onPauseScript = ""; +loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header { diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf index 35cdd0033..6c6073f65 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf @@ -1,17 +1,23 @@ -startLoadingScreen ["","DayZ_loadingScreen"]; /* For DayZ Epoch Addons Credits: Jetski Yanahui by Kol9yN, Zakat, Gerasimow9, YuraPetrov, zGuba, A.Karagod, IceBreakr, Sahbazz */ +startLoadingScreen ["","RscDisplayLoadCustom"]; +cutText ["","BLACK OUT"]; enableSaving [false, false]; //REALLY IMPORTANT VALUES -dayZ_instance = 5; //The instance -hiveInUse = true; +dayZ_instance = 5; //The instance +dayzHiveRequest = []; initialized = false; dayz_previousID = 0; -// AMP config +//disable greeting menu +player setVariable ["BIS_noCoreConversations", true]; +//disable radio messages to be heard and shown in the left lower corner of the screen +enableRadio false; + +// DayZ Epoch config spawnShoremode = 0; // Default = 1 (on shore) spawnArea= 500; // Default = 1500 MaxHeliCrashes= 2; // Default = 5 @@ -23,6 +29,7 @@ dayz_maxLocalZombies = 40; // Default = 40 EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"]]; dayz_fullMoonNights = true; +//Load in compiled functions call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; //Initilize the Variables (IMPORTANT: Must happen very early) progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; //Initilize the publicVariable event handlers @@ -30,10 +37,41 @@ progressLoadingScreen 0.2; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; //Functions used by CLIENT for medical progressLoadingScreen 0.4; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; //Compile regular functions +progressLoadingScreen 0.5; +call compile preprocessFileLineNumbers "server_traders.sqf"; //Compile trader configs progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -47,17 +85,22 @@ if ((!isServer) && (player != player)) then }; if (isServer) then { - //Run the server monitor - hiveInUse = true; - _serverMonitor = [] execVM "\z\addons\dayz_server\system\server_monitor.sqf"; + call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs + + // Add trader citys + _nil = [] execVM "mission.sqf"; + _serverMonitor = [] execVM "\z\addons\dayz_code\system\server_monitor.sqf"; }; if (!isDedicated) then { //Conduct map operations 0 fadeSound 0; - 0 cutText [(localize "STR_AUTHENTICATING"), "BLACK FADED",60]; + waitUntil {!isNil "dayz_loadScreenMsg"}; + dayz_loadScreenMsg = (localize "STR_AUTHENTICATING"); //Run the player monitor _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; -}; \ No newline at end of file + _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/mission.sqm index 571a98a76..e54718f5c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/mission.sqm @@ -5,13 +5,21 @@ class Mission { "bootcamp_acr", "ca_modules_animals", + "dayz_anim", "dayz_code", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", - "warfarebuildings" + "warfarebuildings", + "glt_m300t", + "sigisolda", + "suv_col", + "csj_gyroac", + "map_eu" }; addOnsAuto[]= { diff --git a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/description.ext b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/description.ext index 586f6e4be..dc3b20c94 100644 --- a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/description.ext @@ -8,8 +8,10 @@ disabledAI = true; disableChannels[]={0,1,2,6}; enableItemsDropping=0; #include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; -onPauseScript = "\z\addons\dayz_code\compile\player_onPause.sqf"; +onPauseScript = ""; loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header diff --git a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf index a3c438034..007d8efbe 100644 --- a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf @@ -44,6 +44,35 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -74,4 +103,5 @@ if (!isDedicated) then { _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; -}; \ No newline at end of file +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/mission.sqm index 879e16aae..140b572fc 100644 --- a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/mission.sqm @@ -16,10 +16,12 @@ class Mission "ibr_hangars", "ibr_airports", "ca_modules_animals", + "dayz_anim", "dayz_code", - "dayz", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", @@ -31,7 +33,8 @@ class Mission "glt_m300t", "sigisolda", "suv_col", - "csj_gyroac" + "csj_gyroac", + "map_eu" }; addOnsAuto[]= { diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/description.ext b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/description.ext index 7ca7ae694..68895f67c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/description.ext @@ -8,8 +8,10 @@ disabledAI = true; disableChannels[]={0,1,2,6}; enableItemsDropping=0; #include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; -onPauseScript = "\z\addons\dayz_code\compile\player_onPause.sqf"; +onPauseScript = ""; loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index c0366dbb3..178583802 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -44,6 +44,35 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -74,4 +103,5 @@ if (!isDedicated) then { _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; -}; \ No newline at end of file +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/mission.sqm index 7ed73e0d0..b3f55396f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/mission.sqm @@ -16,10 +16,12 @@ class Mission "ibr_hangars", "ibr_airports", "ca_modules_animals", + "dayz_anim", "dayz_code", - "dayz", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", @@ -30,7 +32,8 @@ class Mission "glt_m300t", "sigisolda", "suv_col", - "csj_gyroac" + "csj_gyroac", + "map_eu" }; addOnsAuto[]= { diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/description.ext b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/description.ext index 1f94eaa6f..d3161e125 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/description.ext @@ -8,8 +8,10 @@ disabledAI = true; disableChannels[]={0,1,2,6}; enableItemsDropping=0; #include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; -onPauseScript = "\z\addons\dayz_code\compile\player_onPause.sqf"; +onPauseScript = ""; loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf index 878d4f532..d112e8d2a 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf @@ -43,6 +43,35 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -73,4 +102,5 @@ if (!isDedicated) then { _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; -}; \ No newline at end of file +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/mission.sqm index eabd440ee..560febb67 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/mission.sqm @@ -5,9 +5,12 @@ class Mission { "provinggrounds_pmc", "ca_modules_animals", + "dayz_anim", "dayz_code", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", @@ -15,7 +18,8 @@ class Mission "glt_m300t", "sigisolda", "suv_col", - "csj_gyroac" + "csj_gyroac", + "map_eu" }; addOnsAuto[]= { diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/description.ext b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/description.ext index d8c3d2bda..9c071587c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/description.ext @@ -5,8 +5,14 @@ OnLoadIntro = "Welcome to Woodland ACR"; OnLoadIntroTime = False; OnLoadMissionTime = False; disabledAI = true; -disableChannels[]={0,2,6}; +disableChannels[]={0,1,2,6}; enableItemsDropping=0; +#include "R3F_Realism\R3F_Weight\R3F_CfgWeight.h" +briefing = 0; +debriefing = 0; + +onPauseScript = ""; +loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header { diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf index d88f6aab7..5676e296e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf @@ -1,18 +1,23 @@ -startLoadingScreen ["","DayZ_loadingScreen"]; /* For DayZ Epoch Addons Credits: Jetski Yanahui by Kol9yN, Zakat, Gerasimow9, YuraPetrov, zGuba, A.Karagod, IceBreakr, Sahbazz */ +startLoadingScreen ["","RscDisplayLoadCustom"]; +cutText ["","BLACK OUT"]; enableSaving [false, false]; //REALLY IMPORTANT VALUES -dayZ_hivePipe1 = "\\.\pipe\dayz"; //The named pipe -dayZ_instance = 9; //The instance -hiveInUse = true; +dayZ_instance = 9; //The instance +dayzHiveRequest = []; initialized = false; dayz_previousID = 0; -// AMP config +//disable greeting menu +player setVariable ["BIS_noCoreConversations", true]; +//disable radio messages to be heard and shown in the left lower corner of the screen +enableRadio false; + +// DayZ Epoch config spawnShoremode = 0; // Default = 1 (on shore) spawnArea= 500; // Default = 1500 MaxHeliCrashes= 3; // Default = 5 @@ -24,6 +29,7 @@ dayz_maxLocalZombies = 40; // Default = 40 EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"]]; dayz_fullMoonNights = true; +//Load in compiled functions call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; //Initilize the Variables (IMPORTANT: Must happen very early) progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; //Initilize the publicVariable event handlers @@ -31,10 +37,41 @@ progressLoadingScreen 0.2; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; //Functions used by CLIENT for medical progressLoadingScreen 0.4; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; //Compile regular functions +progressLoadingScreen 0.5; +call compile preprocessFileLineNumbers "server_traders.sqf"; //Compile trader configs progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; +/* BIS_Effects_* fixes from Dwarden */ +BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; +BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; +BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + +BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; +}; + +BIS_Effects_startEvent = { + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; + }; + }; +}; + +"BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; +}; + if ((!isServer) && (isNull player) ) then { waitUntil {!isNull player}; @@ -48,23 +85,22 @@ if ((!isServer) && (player != player)) then }; if (isServer) then { - //Run the server monitor - hiveInUse = true; - _serverMonitor = [] execVM "\z\addons\dayz_server\system\server_monitor.sqf"; + call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs + + // Add trader citys + _nil = [] execVM "mission.sqf"; + _serverMonitor = [] execVM "\z\addons\dayz_code\system\server_monitor.sqf"; }; if (!isDedicated) then { //Conduct map operations 0 fadeSound 0; - 0 cutText [(localize "STR_AUTHENTICATING"), "BLACK FADED",60]; + waitUntil {!isNil "dayz_loadScreenMsg"}; + dayz_loadScreenMsg = (localize "STR_AUTHENTICATING"); //Run the player monitor _id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}]; _playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf"; - - // Create burn effect for each helicopter wreck - { - nul = [_x, 2, time, false, false] spawn BIS_Effects_Burn; - } forEach allMissionObjects "UH1Wreck_DZ"; - -}; \ No newline at end of file + _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; +}; +#include "\z\addons\dayz_code\system\REsec.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/mission.sqm index 1bbb31399..40c369aeb 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/mission.sqm @@ -5,13 +5,21 @@ class Mission { "woodland_acr", "ca_modules_animals", + "dayz_anim", "dayz_code", + "dayz_communityassets", "dayz_weapons", "dayz_equip", + "dayz_epoch", "dayz_vehicles", "cacharacters_pmc", "ca_modules_functions", - "warfarebuildings" + "warfarebuildings", + "glt_m300t", + "sigisolda", + "suv_col", + "csj_gyroac", + "map_eu" }; addOnsAuto[]= {