From 47070ae4f58e769bd12b9793de0197bb4212130f Mon Sep 17 00:00:00 2001
From: icomrade <icomrade@live.com>
Date: Thu, 28 Apr 2016 19:30:43 -0400
Subject: [PATCH] Move advanced trading configs to mission

allows customization by server owners
---
 SQF/dayz_code/Configs/RscDisplay/tradermenu.hpp             | 6 +-----
 .../MPMissions/DayZ_Epoch_1.Takistan/description.ext        | 2 ++
 .../MPMissions/DayZ_Epoch_10.Mountains_ACR/description.ext  | 2 ++
 .../MPMissions/DayZ_Epoch_11.Chernarus/description.ext      | 2 ++
 .../MPMissions/DayZ_Epoch_12.isladuala/description.ext      | 2 ++
 Server Files/MPMissions/DayZ_Epoch_13.Tavi/description.ext  | 2 ++
 .../MPMissions/DayZ_Epoch_15.namalsk/description.ext        | 2 ++
 .../MPMissions/DayZ_Epoch_16.Panthera2/description.ext      | 2 ++
 .../MPMissions/DayZ_Epoch_17.Chernarus/description.ext      | 2 ++
 .../MPMissions/DayZ_Epoch_19.FDF_Isle1_a/description.ext    | 2 ++
 Server Files/MPMissions/DayZ_Epoch_2.Utes/description.ext   | 2 ++
 .../MPMissions/DayZ_Epoch_20.fapovo/description.ext         | 2 ++
 .../MPMissions/DayZ_Epoch_21.Caribou/description.ext        | 2 ++
 .../MPMissions/DayZ_Epoch_22.smd_sahrani_A2/description.ext | 2 ++
 .../MPMissions/DayZ_Epoch_23.cmr_ovaron/description.ext     | 2 ++
 Server Files/MPMissions/DayZ_Epoch_24.Napf/description.ext  | 2 ++
 .../MPMissions/DayZ_Epoch_25.sauerland/description.ext      | 4 +++-
 .../DayZ_Epoch_26.sauerland_winter/description.ext          | 4 +++-
 .../MPMissions/DayZ_Epoch_3.Shapur_BAF/description.ext      | 2 ++
 .../MPMissions/DayZ_Epoch_4.Zargabad/description.ext        | 2 ++
 .../MPMissions/DayZ_Epoch_5.Bootcamp_ACR/description.ext    | 2 ++
 Server Files/MPMissions/DayZ_Epoch_7.Lingor/description.ext | 2 ++
 .../DayZ_Epoch_8.ProvingGrounds_PMC/description.ext         | 2 ++
 .../MPMissions/DayZ_Epoch_9.Woodland_ACR/description.ext    | 2 ++
 24 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/SQF/dayz_code/Configs/RscDisplay/tradermenu.hpp b/SQF/dayz_code/Configs/RscDisplay/tradermenu.hpp
index 3aba9d5d1..a60c9ad10 100644
--- a/SQF/dayz_code/Configs/RscDisplay/tradermenu.hpp
+++ b/SQF/dayz_code/Configs/RscDisplay/tradermenu.hpp
@@ -280,8 +280,4 @@ class TraderDialog
 			h = 0.0543546 * safezoneH;
 		};
 	};
-};
-
-//Include advanced trading dialogue
-#include "ZSCdefines.hpp"
-#include "advancedTrading.hpp"
\ No newline at end of file
+};
\ 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 2bec65637..13202841d 100644
--- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/description.ext	
@@ -31,3 +31,5 @@ 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 a0bd69a4d..9da272f7b 100644
--- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/description.ext	
@@ -31,3 +31,5 @@ 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 38e2e1867..86d79afa7 100644
--- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/description.ext	
@@ -31,3 +31,5 @@ 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 b1d085b9d..2a2a6394d 100644
--- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/description.ext	
@@ -31,3 +31,5 @@ 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 3cd4fd3c6..59636f55b 100644
--- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/description.ext	
@@ -31,3 +31,5 @@ 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 cd80113f5..76cdd90f4 100644
--- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/description.ext	
@@ -31,3 +31,5 @@ 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 23b91d795..878f63cf8 100644
--- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/description.ext	
@@ -31,3 +31,5 @@ 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 a22c4b589..36595efbe 100644
--- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/description.ext	
@@ -31,3 +31,5 @@ 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 2a7b0175f..b96f716e2 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,3 +31,5 @@ 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 f02a0b6b5..032c082c9 100644
--- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/description.ext	
@@ -31,3 +31,5 @@ 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 1f41a5a51..3d0da5f4f 100644
--- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/description.ext	
@@ -31,3 +31,5 @@ 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 2c383ea4e..8523e4978 100644
--- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/description.ext	
@@ -31,3 +31,5 @@ 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 d59c7327a..4aa282bdd 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,3 +31,5 @@ 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 f5b280700..c9bec6ee4 100644
--- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/description.ext	
@@ -31,3 +31,5 @@ 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 34a27d2b8..e91c5eb32 100644
--- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/description.ext	
@@ -31,3 +31,5 @@ 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 9f2be0607..5cfe61b8f 100644
--- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/description.ext	
@@ -30,4 +30,6 @@ diagRadio = 1;
 diagHit = 1;
 
 #include "\z\addons\dayz_code\gui\description.hpp"
-#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
\ No newline at end of file
+#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 6cee0d306..04889e67f 100644
--- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/description.ext	
@@ -30,4 +30,6 @@ diagRadio = 1;
 diagHit = 1;
 
 #include "\z\addons\dayz_code\gui\description.hpp"
-#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
\ No newline at end of file
+#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 ae82a2f57..a8cde968b 100644
--- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/description.ext	
@@ -31,3 +31,5 @@ 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 fc6f99bb6..8e7d17110 100644
--- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/description.ext	
@@ -31,3 +31,5 @@ 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 9884b3577..e431ca195 100644
--- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/description.ext	
@@ -31,3 +31,5 @@ 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 0081c20f2..928312d35 100644
--- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/description.ext	
@@ -31,3 +31,5 @@ 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 060c7ea03..83c4ef865 100644
--- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/description.ext	
@@ -31,3 +31,5 @@ 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 851c4ec13..08e60c456 100644
--- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/description.ext	
+++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/description.ext	
@@ -31,3 +31,5 @@ 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"