Merge pull request #2057 from worldwidesorrow/master

Add Ovaron trader files

SQF/dayz_code/system/mission/cmr_ovaron.sqf

@@ -0,0 +1,131 @@
+[[
+	// Hero
+	["FoldTable",[735.547,3117.74,0],31.3417],
+	["FoldChair",[735.415,3115.02,0],185.992],
+	["Hedgehog",[739.457,3117.94,0],0],
+	["Hedgehog",[737.386,3121.2,0],0],
+	["Hedgehog",[733.49,3121.81,0],0],
+	["Land_Barrel_water",[736.75,3115.14,0],0.41794],
+	["HeliHCivil",[724.844,3135,0],0],
+	["MAP_Misc_cargo_cont_net1",[733.455,3115.48,0],7.66206],
+	
+	// Bandit
+	["FoldTable",[9504.26,7122.25,0],209.637],
+	["FoldChair",[9504.31,7124.97,0],4.19057],
+	["Hedgehog",[9500.37,7121.94,0],178.105],
+	["Hedgehog",[9502.55,7118.74,0],178.105],
+	["Hedgehog",[9506.46,7118.25,0],178.105],
+	["Land_Barrel_water",[9502.97,7124.8,0],178.582],
+	["HeliHCivil",[9513.88,7108.85,0],0],
+	["MAP_Misc_cargo_cont_net1",[9506.28,7124.58,0],185.767],
+	
+	// Air trader
+	["HeliHCivil",[9666.34,2661.39,0],0],
+	["TK_WarfareBAntiAirRadar_EP1",[9708.5,2661.42,-0.257236],0],
+	["Land_BagFenceRound",[9708.61,2664.38,0],153.524],
+	
+	// Air trader
+	["HeliHCivil",[573.634,6888.45,0],0],
+	["Land_Barrack2",[546.342,6891.67,0],266.018,[0,0,1]],
+	
+	// Lissabon
+	["MAP_Ind_TankSmall2",[4364.16,6677.99,0.00445557],17.8314],
+	["MAP_garaz",[4370.43,6693.94,-0.184845],288.394,[0,0,1]],
+	["MAP_garaz_mala",[4364.73,6676.63,0.00662231],287.101,[0,0,1]],
+	["MAP_Proxy_UsBasicAmmoBox",[4367.3604, 6717.8896, 0],-26.585472],
+	["MAP_RUBasicWeapons",[4365.8442, 6720.9043, 0],115],
+	["MAP_USBasicWeapons",[4366.8071, 6718.7964, 0],-24],
+	["MAP_GuardShed",[4363.78,6687.2,-0.245605],108.821],
+	["Land_Fire_barrel",[4360.19,6681.6,0],0.0224292],
+	["Land_Misc_Cargo2E_EP1",[4354.29,6731.92,0],270.249],
+	["Land_Market_stalls_01_EP1",[4345.52,6725.19,0],0.392177],
+	["Land_Misc_Cargo2E_EP1",[4348.2,6731.86,0],270.206],
+	["Land_Misc_Cargo2E_EP1",[4342.13,6732.03,0],269.81],
+	["Land_Misc_Cargo2E_EP1",[4335.9,6731.98,0],270.221],
+	["HeliHEmpty",[4356.72,6688.4,0],0],
+	["Land_CncBlock",[4360.97,6688.06,0],108.668],
+	["MAP_pumpa",[4357.08,6724.77,0],0.238181],
+	["MAP_Misc_cargo_cont_net2",[4359.2622, 6721.918,0],11],
+	["MAP_CamoNet_EAST",[4365.51,6719.18,0],52],
+	["MAP_Misc_cargo_cont_net2",[4366.36,6713.78,0],31],
+	["MAP_PowGen_Big",[4371.83,6708.43,0],0],
+	["Land_BagFenceRound",[4368.23,6708.09,0],82],
+	["Base_WarfareBBarrier10xTall",[4367.44,6725.59,0],34],
+	["Base_WarfareBBarrier10xTall",[4375.85,6713.36,0],75],
+	["ClutterCutter_EP1",[4365.45,6718.67,0],0],
+	
+	// Wholesaler
+	["MAP_Misc_Cargo1A",[3112.37,3764.37,0],317],
+	["MAP_Misc_Cargo1A",[3113.17,3758.04,0],29],
+	["FoldChair",[3111.15,3762.67,0],46],
+	["FoldChair",[3111.24,3759.16,0],119],
+	["FoldTable",[3108.15,3760.65,0],86],
+	["Land_covering_hut_EP1",[3107.72,3760.57,0],265],
+	["Land_CncBlock",[3105.31,3761.78,0],86],
+	["Land_CncBlock",[3105.48,3758.88,0],86],
+	["HeliHEmpty",[8579.75,5676.5,0],0],
+	["HeliHEmpty",[1660.65,4563.92,0],0],
+	
+	// Wholesaler
+	["MAP_Misc_Cargo1A",[7128.5,6476.41,0],141],
+	["MAP_Misc_Cargo1A",[7128.79,6482.72,0],213],
+	["FoldChair",[7129.88,6477.48,0],230],
+	["FoldChair",[7129.93,6481.37,0],308],
+	["FoldTable",[7133.52,6479.88,0],271],
+	["Land_covering_hut_EP1",[7133.8,6479.89,0],91],
+	["Land_CncBlock",[7135.85,6478.5,0],271],
+	["Land_CncBlock",[7135.92,6481.39,0],271],
+	
+	// Riad
+	["MAP_runwayold_40_main",[5868.96,3542.85,0],317.806],
+	["ClutterCutter_EP1",[5869,3522.97,0],0],
+	["ClutterCutter_EP1",[5859.77,3534.77,0],0],
+	["ClutterCutter_EP1",[5851.51,3546.97,0],0],
+	["ClutterCutter_EP1",[5878.77,3533.64,0],0],
+	["ClutterCutter_EP1",[5871.46,3548.12,0],0],
+	["ClutterCutter_EP1",[5863.45,3559.11,0],0],
+	["ClutterCutter_EP1",[5889.1,3543.37,0],0],
+	["ClutterCutter_EP1",[5877.95,3555.67,0],0],
+	["ClutterCutter_EP1",[5869.28,3564.64,0],0],
+	["Base_WarfareBBarrier10xTall",[5861.84,3519.78,0],47],
+	["Base_WarfareBBarrier10xTall",[5851.19,3531.18,0],47],
+	["Base_WarfareBBarrier10xTall",[5845.82,3548.77,0],139],
+	["Base_WarfareBBarrier10xTall",[5857.62,3559.09,0],139],
+	["Base_WarfareBBarrier10xTall",[5878.22,3524.78,0],319],
+	["Land_GuardShed",[5868.05,3517.02,-0.25],227],
+	["HeliHEmpty",[5875.18,3509.73,0],0],
+	["Base_WarfareBBarrier10xTall",[5889.86,3535.15,-0.159485],319],
+	["Base_WarfareBBarrier10xTall",[5881.19,3558.1,-0.380157],228],
+	["Base_WarfareBBarrier10xTall",[5891.71,3546.49,-0.245438],228],
+	["Base_WarfareBBarrier10xTall",[5846.3,3538.25,-0.0258484],228],
+	["Barrels",[5858.16,3555.56,0],317],
+	["Land_covering_hut_big_EP1",[5878.19,3530.15,0],138],
+	["Land_Misc_Cargo2E_EP1",[5858.49,3528.84,0],317],
+	["Land_Fire_barrel",[5873.18,3523.27,0],0],
+	["MAP_PowGen_Big",[5863.05,3523.77,0],319.067],
+	["MAP_GuardShed",[5856.11,3554.07,-0.277023],317.947],
+	["MAP_MASH",[5886.74,3541.68,0],228],
+	["MAP_Stan_east",[5882.81,3547.4,0],48],
+	["MAP_tent_east",[5853.03,3544.35,0],319],
+	["Land_bags_EP1",[5878.65,3532.1,0],0],
+	["Land_Toilet",[5885.4,3534.73,0],138],
+	["Garbage_can",[5880.52,3530.96,0.0167847],0],
+	["Land_bags_stack_EP1",[5878.77,3529.38,0],315],
+	["Pile_of_wood",[5861.4,3558.29,0],49],
+	["Land_Barrel_water",[5876.21,3529.72,0],0],
+	["Land_cages_EP1",[5877,3528.2,0],227],
+	["Land_Wheel_cart_EP1",[5854.77,3551.53,0],0],
+	["Land_Toilet",[5884.58,3534.01,0],138],
+	["Land_Toilet",[5883.75,3533.28,0],138],
+	["MAP_Stan_east",[5878.59,3552.16,0],48],
+	["Land_Misc_Cargo2E_EP1",[5854.3,3533.46,0],317],
+	
+	// Map fixes
+	["Base_WarfareBBarrier10xTall",[7914, 4458, 0],11],
+	["Base_WarfareBBarrier10xTall",[7975, 4746, -5.7220459e-005],11],
+	["Base_WarfareBBarrier10xTall",[6199, 1298, -0.10902898],86],
+	["Base_WarfareBBarrier10xTall",[6267, 1303, -0.079432704],86],
+	["WoodStairsSans_DZ",[9054.4, 2085.1, -1.6514561],-23.5],
+	["MAP_A_Castle_WallS_End_ruins",[3161, 5620, 0.3],0],
+	["MAP_A_Castle_WallS_End_ruins",[7074, 4619, 0],-13]
+],true,false,true] call fnc_spawnObjects;

SQF/dayz_code/system/mission/server_traders/cmr_ovaron.sqf

@@ -1 +1,144 @@
-serverTraders = [];
+// DayZ Epoch TRADERS for 23
+
+serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Profiteer1","Rita_Ensler_EP1","Dr_Hladik_EP1","Worker2","TK_CIV_Worker01_EP1","CIV_EuroMan01_EP1","CIV_EuroMan02_EP1","RU_WorkWoman5","Doctor","Worker1","TK_CIV_Worker02_EP1","RU_Pilot","RU_Villager3","HouseWife1","Profiteer2","Profiteer3"];
+
+/***************Hero Vendor*********/
+menu_FR_AC = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_AIRVEHICLES",1],[localize "STR_EPOCH_TRADER_CATEGORY_GROUNDVEHICLES",2],[localize "STR_EPOCH_TRADER_CATEGORY_WEAPONS",3],[localize "STR_EPOCH_TRADER_CATEGORY_AMMUNITION",4],[localize "STR_EPOCH_TRADER_CATEGORY_CLOTHES",5]],
+	[],
+	"hero"
+];
+/***************Bandit Vendor*********/
+menu_GUE_Commander = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_AIRVEHICLES",6],[localize "STR_EPOCH_TRADER_CATEGORY_GROUNDVEHICLES",7],[localize "STR_EPOCH_TRADER_CATEGORY_WEAPONS",8],[localize "STR_EPOCH_TRADER_CATEGORY_AMMUNITION",9],[localize "STR_EPOCH_TRADER_CATEGORY_CLOTHES",10]],
+	[],
+	"hostile"
+];
+/************************************Lissabon*************************************/
+/***************Black Market*********/
+menu_GUE_Woodlander2 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_BLACKMARKET",11]],
+	[],
+	"neutral"
+];
+
+/***************Weapons*********/
+menu_RU_Citizen4 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_ATTACHMENTS",12],[localize "STR_EPOCH_TRADER_CATEGORY_PISTOLS",13],[localize "STR_EPOCH_TRADER_CATEGORY_SUBMACHINEGUNS",14],[localize "STR_EPOCH_TRADER_CATEGORY_SINGLESHOT",15],[localize "STR_EPOCH_TRADER_CATEGORY_ASSAULTRIFLES",16],[localize "STR_EPOCH_TRADER_CATEGORY_SNIPERRIFLES",17],[localize "STR_EPOCH_TRADER_CATEGORY_LIGHTMACHINEGUNS",18]],
+	[],
+	"neutral"
+];
+
+/***************Ammunition*********/
+menu_Profiteer1 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_PISTOLAMMO",19],[localize "STR_EPOCH_TRADER_CATEGORY_SUBMACHINEGUNAMMO",20],[localize "STR_EPOCH_TRADER_CATEGORY_SINGLESHOTAMMO",21],[localize "STR_EPOCH_TRADER_CATEGORY_ASSAULTRIFLEAMMO",22],[localize "STR_EPOCH_TRADER_CATEGORY_SNIPERRIFLEAMMO",23],[localize "STR_EPOCH_TRADER_CATEGORY_LIGHTMACHINEGUNAMMO",24],[localize "STR_EPOCH_TRADER_CATEGORY_SMOKEGRENADES",25],[localize "STR_EPOCH_TRADER_CATEGORY_FLARES",26]],
+	[],
+	"neutral"
+];
+
+/***************General Store*********/
+menu_Rita_Ensler_EP1 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_PACKAGEFOOD",27],[localize "STR_EPOCH_TRADER_CATEGORY_COOKMEAT",28],[localize "STR_EPOCH_TRADER_CATEGORY_DRINKS",29],[localize "STR_EPOCH_TRADER_CATEGORY_CLOTHES",30],[localize "STR_EPOCH_TRADER_CATEGORY_BACKPACKS",31],[localize "STR_EPOCH_TRADER_CATEGORY_MISCELLANEOUS",32]],
+	[["ItemTinBar","TrashJackDaniels",1,1]],
+	"neutral"
+];
+
+/***************Medical Supplies*********/
+menu_Dr_Hladik_EP1 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_MEDICALSUPPLIES",33]],
+	[["FoodBioMeat","ItemZombieParts",1,1]],
+	"neutral"
+];
+
+/***************Building/Parts*********/
+menu_Worker2 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_TOOLS",34],[localize "STR_EPOCH_TRADER_CATEGORY_BUILDINGSUPPLIES",35],[localize "STR_EPOCH_TRADER_CATEGORY_VEHICLEPARTS",36]],
+	[],
+	"neutral"
+];
+
+/***************Vehicles*********/
+menu_TK_CIV_Worker01_EP1 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_BIKESATVS",37],[localize "STR_EPOCH_TRADER_CATEGORY_CARS",38],[localize "STR_EPOCH_TRADER_CATEGORY_PICKUPS",39],[localize "STR_EPOCH_TRADER_CATEGORY_UAZS",40],[localize "STR_EPOCH_TRADER_CATEGORY_SUVS",41],[localize "STR_EPOCH_TRADER_CATEGORY_CARGOTRUCKS",42],[localize "STR_EPOCH_TRADER_CATEGORY_FUELTRUCKS",43],[localize "STR_EPOCH_TRADER_CATEGORY_MILITARYUNARMED",44],[localize "STR_EPOCH_TRADER_CATEGORY_MISCELLANEOUS",45]],
+	[],
+	"neutral"
+];
+
+/*****************************************************************************/
+/************************************Riad*************************************/
+/***************Weapons*********/
+menu_CIV_EuroMan01_EP1 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_ATTACHMENTS",12],[localize "STR_EPOCH_TRADER_CATEGORY_PISTOLS",13],[localize "STR_EPOCH_TRADER_CATEGORY_SUBMACHINEGUNS",14],[localize "STR_EPOCH_TRADER_CATEGORY_SINGLESHOT",15],[localize "STR_EPOCH_TRADER_CATEGORY_ASSAULTRIFLES",16],[localize "STR_EPOCH_TRADER_CATEGORY_SNIPERRIFLES",17],[localize "STR_EPOCH_TRADER_CATEGORY_LIGHTMACHINEGUNS",18]],
+	[],
+	"neutral"
+];
+
+/***************Ammunition*********/
+menu_CIV_EuroMan02_EP1 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_PISTOLAMMO",19],[localize "STR_EPOCH_TRADER_CATEGORY_SUBMACHINEGUNAMMO",20],[localize "STR_EPOCH_TRADER_CATEGORY_SINGLESHOTAMMO",21],[localize "STR_EPOCH_TRADER_CATEGORY_ASSAULTRIFLEAMMO",22],[localize "STR_EPOCH_TRADER_CATEGORY_SNIPERRIFLEAMMO",23],[localize "STR_EPOCH_TRADER_CATEGORY_LIGHTMACHINEGUNAMMO",24],[localize "STR_EPOCH_TRADER_CATEGORY_SMOKEGRENADES",25],[localize "STR_EPOCH_TRADER_CATEGORY_FLARES",26]],
+	[],
+	"neutral"
+];
+
+/***************General Store*********/
+menu_RU_WorkWoman5 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_PACKAGEFOOD",27],[localize "STR_EPOCH_TRADER_CATEGORY_COOKMEAT",28],[localize "STR_EPOCH_TRADER_CATEGORY_DRINKS",29],[localize "STR_EPOCH_TRADER_CATEGORY_CLOTHES",30],[localize "STR_EPOCH_TRADER_CATEGORY_BACKPACKS",31],[localize "STR_EPOCH_TRADER_CATEGORY_MISCELLANEOUS",32]],
+	[["ItemTinBar","TrashJackDaniels",1,1]],
+	"neutral"
+];
+
+/***************Medical Supplies*********/
+menu_Doctor = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_MEDICALSUPPLIES",33]],
+	[["FoodBioMeat","ItemZombieParts",1,1]],
+	"neutral"
+];
+
+/***************Building/Parts*********/
+menu_Worker1 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_TOOLS",34],[localize "STR_EPOCH_TRADER_CATEGORY_BUILDINGSUPPLIES",35],[localize "STR_EPOCH_TRADER_CATEGORY_VEHICLEPARTS",36]],
+	[],
+	"neutral"
+];
+
+/***************Vehicles*********/
+menu_TK_CIV_Worker02_EP1 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_BIKESATVS",37],[localize "STR_EPOCH_TRADER_CATEGORY_CARS",38],[localize "STR_EPOCH_TRADER_CATEGORY_PICKUPS",39],[localize "STR_EPOCH_TRADER_CATEGORY_UAZS",40],[localize "STR_EPOCH_TRADER_CATEGORY_SUVS",41],[localize "STR_EPOCH_TRADER_CATEGORY_CARGOTRUCKS",42],[localize "STR_EPOCH_TRADER_CATEGORY_FUELTRUCKS",43],[localize "STR_EPOCH_TRADER_CATEGORY_MILITARYUNARMED",44],[localize "STR_EPOCH_TRADER_CATEGORY_MISCELLANEOUS",45]],
+	[],
+	"neutral"
+];
+/*****************************************************************************/
+/***************Aircraft Dealer*********/
+menu_RU_Pilot = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_AIRPLANES",46],[localize "STR_EPOCH_TRADER_CATEGORY_HELICOPTER",47]],
+	[],
+	"neutral"
+];
+
+/***************Boat Vendor*********/
+menu_RU_Villager3 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_BOATSARMED",48],[localize "STR_EPOCH_TRADER_CATEGORY_BOATSUNARMED",49]],
+	[],
+	"neutral"
+];
+
+/***************Boat Vendor*********/
+menu_HouseWife1 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_BOATSARMED",48],[localize "STR_EPOCH_TRADER_CATEGORY_BOATSUNARMED",49]],
+	[],
+	"neutral"
+];
+
+/***************Wholesaler*********/
+menu_Profiteer2 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
+	[],
+	"neutral"
+];
+
+/***************Wholesaler*********/
+menu_Profiteer3 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_WHOLESALE",50]],
+	[],
+	"neutral"
+];

SQF/dayz_server/traders/cmr_ovaron.sqf

@@ -0,0 +1,48 @@
+[
+	//Hero Vendor
+	["FR_AC",[734.914,3116.88,0],28.5644],
+	//Bandit Vendor
+	["GUE_Commander",[9504.74,7123.16,0],206.644],
+	/******************Lissabon*********************/
+	//Black Market
+	["GUE_Woodlander2",[4369.14,6708.19,0],261],
+	//Weapons
+	["RU_Citizen4",[4363.72,6721.04,0],228],
+	//Ammunition
+	["Profiteer1",[4365.52,6717.18,0],228],
+	//General Store
+	["Rita_Ensler_EP1",[4344.71,6724.58,0],167],
+	//Medical Supplies
+	["Dr_Hladik_EP1",[4353.15,6724.43,0],175],
+	//Building/Parts
+	["Worker2",[4337.63,6725.31,0],162],
+	//Vehicles
+	["TK_CIV_Worker01_EP1",[4363.65,6687.16,0],285],
+	/***********************************************/
+	/******************Riad************************/
+	//Weapons
+	["CIV_EuroMan01_EP1",[5857.33,3545.05,0],275],
+	//Ammunition
+	["CIV_EuroMan02_EP1",[5851.68,3540.15,0],3],
+	//General Store
+	["RU_WorkWoman5",[5877.69,3530.61,0],317],
+	//Medical Supplies
+	["Doctor",[5887.22,3542.14,0],227],
+	//Building/Parts		
+	["Worker1",[5856.33,3554.11,0],139],
+	//Vehicles
+	["TK_CIV_Worker02_EP1",[5868.08,3517.22,0],44],
+	/***********************************************/
+	//Aircraft Dealer
+	["RU_Pilot",[543.68,6889.99,0.284153],72.2415],
+	//Aircraft Dealer
+	["RU_Pilot",[9709.12,2663.65,0],331.017],
+	//Boat Vendor
+	["RU_Villager3",[8562.11,5676.39,5.47142],5.33906],
+	//Boat Vendor
+	["HouseWife1",[1677.95,4563.61,5.30231],186.156],
+	//Wholesaler
+	["Profiteer2",[3109.31,3760.81,0],263.038],
+	//Wholesaler
+	["Profiteer3",[7132.36,6479.76,0],88]
+] call server_spawnTraders;

Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf

@@ -61,7 +61,7 @@ DZE_GodModeBase = false; // Make player built base objects indestructible
 DZE_requireplot = 1; // Require a plot pole to build  0 = Off, 1 = On
 DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plotpoles]. Difference between them is the minimum buffer between bases.
 DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius
-DZE_SafeZonePosArray = [[[5147,3396,0],100],[[5193,4095,0],100],[[9539,4155,0],100],[[7257,264,0],100],[[280,3281,0],100],[[9637,6894,0],100],[[5147,9057,0],100],[[5450,344,0],100],[[5233,7078,0],100],[[1295,9372,0],100]]; // Format is [[[3D POS],RADIUS],[[3D POS],RADIUS]]; Stops loot and zed spawn, salvage and players being killed if their vehicle is destroyed in these zones.
+DZE_SafeZonePosArray = [[[8562,5676,0],100],[[1678,4564,0],100],[[4356,6688,0],100],[[9708,2661,0],100],[[546,6891,0],100],[[734,3115,0],100],[[9507,7125,0],100],[[3108,3761,0],100],[[7132,6479,0],100],[[5877,3530,0],100]]; // Format is [[[3D POS],RADIUS],[[3D POS],RADIUS]]; Stops loot and zed spawn, salvage and players being killed if their vehicle is destroyed in these zones.
 DZE_SelfTransfuse = true; // Allow players to bloodbag themselves
 DZE_selfTransfuse_Values = [12000,15,120]; // [blood amount given, infection chance %, cooldown in seconds]
 MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the map

Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/mission.sqm

@@ -188,7 +188,7 @@ class Mission
 	};
 	class Markers
 	{
-		items=15;
+		items=25;
 		class Item0
 		{
 			position[]={5010,0,5250};
@@ -273,24 +273,155 @@ class Mission
 			position[]={5010,0,5250};
 			name="crashsites";
 			type="Empty";
-			a=7000;b=7000;
+			a=5000;b=5000;
 		};
 		class Item14
 		{
 			position[]={5010,0,5250};
 			name="carepackages";
 			type="Empty";
-			a=7000;b=0;
+			a=5000;b=0;
+		};
+		class Item15
+		{
+			position[]={9708,0,2661};
+			name="AirTraderE";
+			text="East Air Trader";
+			type="mil_dot";
+			colorName="ColorGreen";
+		};
+		class Item16
+		{
+			position[]={546,0,6891};
+			name="AirTraderW";
+			text="West Air Trader";
+			type="mil_dot";
+			colorName="ColorGreen";
+		};
+		class Item17
+		{
+			position[]={734,0,3115};
+			name="HeroTrader";
+			text="Hero Trader";
+			type="mil_triangle";
+			colorName="ColorBlue";
+		};
+		class Item18
+		{
+			position[]={9507,0,7125};
+			name="BanditTrader";
+			text="Bandit Trader";
+			type="mil_triangle";
+			colorName="ColorRed";
+		};
+		class Item19
+		{
+			position[]={3108,0,3761};
+			name="Wholesaler";
+			text="Wholesaler";
+			type="mil_dot";
+			colorName="ColorBlack";
+		};
+		class Item20
+		{
+			position[]={4356,0,6688};
+			name="LissabonTrader";
+			text="Trader City Lissabon";
+			type="mil_circle";
+			colorName="ColorBlack";
+		};
+		class Item21
+		{
+			position[]={8562,0,5676};
+			name="BoatDealer1";
+			text="Boat Dealer";
+			type="mil_dot";
+			colorName="ColorBlack";
+		};
+		class Item22
+		{
+			position[]={1678,0,4564};
+			name="BoatDealer2";
+			text="Boat Dealer";
+			type="mil_dot";
+			colorName="ColorBlack";
+		};
+		class Item23
+		{
+			position[]={7132,0,6479};
+			name="Wholesaler";
+			text="Wholesaler";
+			type="mil_dot";
+			colorName="ColorBlack";
+		};
+		class Item24
+		{
+			position[]={5877,0,3530};
+			name="RiadTrader";
+			text="Trader City Riad";
+			type="mil_circle";
+			colorName="ColorBlack";
 		};
 	};
-	/*
 	class Sensors
 	{
-		items=0;
+		items=6;
 		#define TRGDEF a=100;b=100;activationBy="WEST";repeating=1;interruptable=1;age="UNKNOWN";class Effects{};
-
+		class Item0
+		{
+			position[]={9708,0,2661};
+			TRGDEF
+			name="AirTraderE";
+			expCond="(player distance AirTraderE) < 100;";
+			expActiv="[""East Air Trader"",true,""enter""] call player_traderCity;";
+			expDesactiv="[""East Air Trader"",true,""leave""] call player_traderCity;";
+		};
+		class Item1
+		{
+			position[]={546,0,6891};
+			TRGDEF
+			name="AirTraderW";
+			expCond="(player distance AirTraderW) < 100;";
+			expActiv="[""West Air Trader"",true,""enter""] call player_traderCity;";
+			expDesactiv="[""West Air Trader"",true,""leave""] call player_traderCity;";
+		};
+		class Item2
+		{
+			position[]={734,0,3115};
+			TRGDEF
+			name="HeroTrader";
+			expCond="(player distance HeroTrader) < 100;";
+			expActiv="[""Hero Trader"",true,""enter""] call player_traderCity;";
+			expDesactiv="[""Hero Trader"",true,""leave""] call player_traderCity;";
+		};
+		class Item3
+		{
+			position[]={9507,0,7125};
+			TRGDEF
+			name="BanditTrader";
+			expCond="(player distance BanditTrader) < 100;";
+			expActiv="[""Bandit Trader"",true,""enter""] call player_traderCity;";
+			expDesactiv="[""Bandit Trader"",true,""leave""] call player_traderCity;";
+		};
+		class Item4
+		{
+			position[]={4356,0,6688};
+			TRGDEF
+			name="LissabonTrader";
+			expCond="(player distance LissabonTrader) < 100;";
+			expActiv="[""Trader City Lissabon"",true,""enter""] call player_traderCity;";
+			expDesactiv="[""Trader City Lissabon"",true,""leave""] call player_traderCity;";
+		};
+		class Item5
+		{
+			position[]={5877,0,3530};
+			TRGDEF
+			name="RiadTrader";
+			expCond="(player distance RiadTrader) < 100;";
+			expActiv="[""Trader City Riad"",true,""enter""] call player_traderCity;";
+			expDesactiv="[""Trader City Riad"",true,""leave""] call player_traderCity;";
+		};
 	};
-	*/
 };
 class Intro
 {