diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index a50a58acc..ac21ae002 100644 --- a/SQF/dayz_code/config.cpp +++ b/SQF/dayz_code/config.cpp @@ -110,8 +110,9 @@ class CfgAddons //Epoch Additions #include "Configs\RscDisplay\safegui.hpp" #include "Configs\RscDisplay\tradermenu.hpp" -//advancedTrading.hpp and ZSCdefines.hpp are included from description.ext so admins can customize +#include "Configs\RscDisplay\ZSCdefines.hpp" +#include "Configs\RscDisplay\advancedTrading.hpp" +#include "Configs\RscDisplay\plotManagement.hpp" #include "Configs\RscDisplay\deathboards.hpp" #include "Configs\CfgExtra\snappoints.hpp" -#include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.hpp" -#include "Configs\RscDisplay\plotManagement.hpp" +#include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.hpp" \ 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 13202841d..2186841f7 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + 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 9da272f7b..919bf6b68 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/description.ext b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/description.ext index 86d79afa7..4e21cff12 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/description.ext b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/description.ext index 2a2a6394d..c3f283340 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/description.ext b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/description.ext index 59636f55b..b23eff8bc 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/description.ext b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/description.ext index 76cdd90f4..297327ef4 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/description.ext b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/description.ext index 878f63cf8..bd2a782e2 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/description.ext b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/description.ext index 36595efbe..197888650 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/description.ext b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/description.ext index b96f716e2..c628374e8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/description.ext b/Server Files/MPMissions/DayZ_Epoch_2.Utes/description.ext index 032c082c9..e4f69a8b2 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/description.ext b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/description.ext index 3d0da5f4f..ebc39e18c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/description.ext b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/description.ext index 8523e4978..880a889a4 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/description.ext b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/description.ext index 4aa282bdd..7c2461512 100644 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/description.ext b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/description.ext index c9bec6ee4..14455f601 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/description.ext b/Server Files/MPMissions/DayZ_Epoch_24.Napf/description.ext index e91c5eb32..cc8c2ff6b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/description.ext b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/description.ext index 5cfe61b8f..ea6699ac1 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/description.ext b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/description.ext index 04889e67f..9bde764f7 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + 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 a8cde968b..88520cebe 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/description.ext b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/description.ext index 8e7d17110..e1fc91eba 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + 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 e431ca195..6f303e625 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/description.ext b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/description.ext index 928312d35..46430579e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + 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 83c4ef865..169a719f9 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" + 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 08e60c456..bab0bc1ab 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/description.ext +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/description.ext @@ -31,5 +31,4 @@ diagHit = 1; #include "\z\addons\dayz_code\gui\description.hpp" #include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp" -#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp" +