diff --git a/SQF/dayz_code/$PREFIX$ b/SQF/dayz_code/$PBOPREFIX$ similarity index 100% rename from SQF/dayz_code/$PREFIX$ rename to SQF/dayz_code/$PBOPREFIX$ diff --git a/SQF/dayz_code/system/CA/init.sqf b/SQF/dayz_code/system/ca/functions/init.sqf similarity index 100% rename from SQF/dayz_code/system/CA/init.sqf rename to SQF/dayz_code/system/ca/functions/init.sqf diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index c79e37009..b3320a30d 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.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"")"/*%FSM*/; + condition=/*%FSM*/"(_myEpochAnim != ""1.0.4"") || (_myEpoch != ""1.0.4"") || (_myEpochB != ""1.0.4.1"") || (_myEpochSfx != ""1.0.4.1"")"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/SQF/dayz_server/$PREFIX$ b/SQF/dayz_server/$PBOPREFIX$ similarity index 100% rename from SQF/dayz_server/$PREFIX$ rename to SQF/dayz_server/$PBOPREFIX$ diff --git a/SQF/dayz_sfx/config.cpp b/SQF/dayz_sfx/config.cpp index 5d40c5c0e..dfe73df0c 100644 --- a/SQF/dayz_sfx/config.cpp +++ b/SQF/dayz_sfx/config.cpp @@ -22,7 +22,7 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = 0.1; - dayzVersion = "1.0.4"; + dayzVersion = "1.0.4.1"; requiredAddons[] = {}; }; }; @@ -53,8 +53,8 @@ class CfgSFX { DestrMine1[] = {"\ca\BUILDINGS\sound\building2_destroy", 3.16228, 1, 150, 1, 60, 120, 240}; DestrMine2[] = {"\dayz_sfx\effects\vein_wreck.ogg", 5, 1, 150, 1, 60, 120, 240}; empty[] = {"", 0, 0, 0, 0, 1, 5, 20}; - } + }; }; #include "CfgSounds.hpp" -#include "CfgMusic.hpp" \ No newline at end of file +#include "CfgMusic.hpp" diff --git a/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo b/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo index be523f125..968ebfa67 100644 Binary files a/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo and b/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo differ diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_18.Sara/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_18.Sara/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_18.Sara/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_18.Sara/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/ca/modules/functions/init.sqf b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/TEMPLATE/ca/modules/functions/init.sqf b/Server Files/MPMissions/TEMPLATE/ca/modules/functions/init.sqf index d94d2a8eb..c9ec8fe9f 100644 --- a/Server Files/MPMissions/TEMPLATE/ca/modules/functions/init.sqf +++ b/Server Files/MPMissions/TEMPLATE/ca/modules/functions/init.sqf @@ -1 +1 @@ -#include "\z\addons\dayz_code\system\CA\init.sqf" \ No newline at end of file +#include "\z\addons\dayz_code\system\ca\functions\init.sqf" \ No newline at end of file