Update trader files

This commit re-build the complete traders and almost all the files related with them. It is much easier for new server admins to handle a map change with traders and safe zones now. - Fixing many wrong set markers. - Fixing wrong trader agent positions. - The trader configs got re-build. - All trader categories have a localization now. I've noticed too late that we already have a CL for the categories so I've merged them into epoch. - Fixing dupable objects in the spawned trader cities. - Adding missing sensors for all traders. - Removing many duplicated trader categories inside the trader files. - Adding Safe Zone support for all traders excluded Wholersalers, Boat Traders and Dock Traders. - Removing Mello trader on Panthera due to many trader cites. - Namalsk and Lingor traders got completely re-build. Thx @devlok for building the trader cities. - Sauerland has a Boat Trader now. - Removing wrong markers from Ovaron. - Ruegen and Ovaron have no traders so far. We will probaly add them later.
2026-03-01 11:11:52 +03:00 · 2019-12-04 17:52:31 +01:00
parent f0ac4afc79
commit 92700e8a2e
166 changed files with 5985 additions and 8629 deletions
--- a/SQF/dayz_code/system/mission/server_traders/panthera2.sqf
+++ b/SQF/dayz_code/system/mission/server_traders/panthera2.sqf
@@ -1,170 +1,187 @@
 // DayZ Epoch TRADERS for 17
-serverTraders = ["Tanny_PMC","BAF_Soldier_AMG_W","BAF_Soldier_AAA_DDPM","CZ_Special_Forces_MG_DES_EP1","Damsel5","GUE_Commander","GUE_Woodlander1","GUE_Woodlander3","GUE_Soldier_Sab","GUE_Soldier_Pilot","GUE_Soldier_2","Soldier_PMC","Citizen2_EP1","Rita_Ensler_EP1","RU_Farmwife1","US_Soldier_Medic_EP1","USMC_Soldier_TL","USMC_SoldierS_Engineer","UN_CDF_Soldier_AAT_EP1","ValentinaVictim","UN_CDF_Soldier_MG_EP1","GUE_Soldier_1","FR_Corpsman","GUE_Soldier_AR","Dr_Hladik_EP1","RU_Villager1","Reynolds_PMC"];
-// Hero Vendor P
-menu_Tanny_PMC = [
-	[["Attachments",693],["Ammunition",478],["Clothes",476],["Helicopter Armed",493],["Military Armed",562],["Trucks Armed",479],["Weapons",477]],
+
+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","Rocker4","RU_Citizen3","RU_WorkWoman1","Dr_Annie_Baker_EP1","Worker3","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"
 ];
-// Ammunition Neutral P
-menu_BAF_Soldier_AMG_W = [
-	[["Assault Rifle Ammo",480],["Light Machine Gun Ammo",481],["Pistol Ammo",484],["Shotguns and Single-shot Ammo",573],["Sniper Rifle Ammo",482],["Submachine Gun Ammo",483]],
-	[],
-	"neutral"
-];
-// Weapons Neutral P
-menu_BAF_Soldier_AAA_DDPM = [
-	[["Attachments",693],["Assault Rifle",485],["Light Machine Gun",486],["Pistols",489],["Shotguns and Single-shot",574],["Sniper Rifle",487],["Submachine Guns",488]],
-	[],
-	"neutral"
-];
-// Neutral Vehicles P
-menu_CZ_Special_Forces_MG_DES_EP1 = [
-	[["Bikes and ATV",608],["Buses and Vans",563],["Cargo Trucks",564],["Fuel Trucks",492],["Military Unarmed",491],["Trucks",495],["Used Cars",585],["Utility Vehicles",565]],
-	[],
-	"neutral"
-];
-// General Store P
-menu_Damsel5 = [
-	[["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]],
-	[["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Tin Bar",101]],
-	"neutral"
-];
-// Weapons neutral 1P
+/***************Bandit Vendor*********/
 menu_GUE_Commander = [
-	[["Attachments",693],["Assault Rifle",602],["Light Machine Gun",603],["Pistols",606],["Shotguns and Single-shot",607],["Sniper Rifle",605],["Submachine Guns",604]],
-	[],
-	"neutral"
-];
-// Ammunition Neutral 1P
-menu_GUE_Woodlander1 = [
-	[["Assault Rifle Ammo",609],["Light Machine Gun Ammo",610],["Pistol Ammo",611],["Shotguns and Single-shot Ammo",613],["Sniper Rifle Ammo",614],["Submachine Gun Ammo",612]],
-	[],
-	"neutral"
-];
-// Neutral Building/Parts P
-menu_GUE_Woodlander3 = [
-	[["Building Supplies",508],["Tools",510],["Vehicle Parts",509]],
-	[],
-	"neutral"
-];
-// Bandit Trader P
-menu_GUE_Soldier_Sab = [
-	[["Attachments",693],["Ammunition",577],["Clothing",575],["Helicopter Armed",512],["Military Armed",569],["Trucks Armed",534],["Weapons",627]],
+	[[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"
 ];
-// Aircraft Dealer P
-menu_GUE_Soldier_Pilot = [
-	[["Airplanes",517],["Helicopter Unarmed",519]],
+/************************************Pikia*************************************/
+/***************Black Market*********/
+menu_GUE_Woodlander2 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_BLACKMARKET",11]],
 	[],
 	"neutral"
 ];
-// Vehicles Neutral 1P
-menu_GUE_Soldier_2 = [
-	[["Bikes and ATV",587],["Buses and Vans",588],["Cargo Trucks",586],["Fuel Trucks",589],["Military Unarmed",598],["Trucks",590],["Used Cars",520],["Utility Vehicles",591]],
+
+/***************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"
 ];
-// Black Market Vendor 1P
-menu_Soldier_PMC = [
-	[["Attachments",693],["Black Market Ammo",527],["Black Market Weapons",526],["Explosives",529]],
+
+/***************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"
 ];
-// Neutral Building/Parts 1P
-menu_Citizen2_EP1 = [
-	[["Building Supplies",530],["Tools",532],["Vehicle Parts",531]],
-	[],
-	"neutral"
-];
-// Neutral Vehicle 2P
+
+/***************General Store*********/
 menu_Rita_Ensler_EP1 = [
-	[["Bikes and ATV",536],["Buses and Vans",592],["Cargo Trucks",570],["Fuel Trucks",595],["Military Unarmed",599],["Trucks Unarmed",535],["Used Cars",600],["Utility Vehicles",568]],
-	[],
+	[[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"
 ];
-// Neutral General Store 1P
-menu_RU_Farmwife1 = [
-	[["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]],
-	[["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Tin Bar",101]],
-	"neutral"
-];
-// Medical Supplies P
-menu_US_Soldier_Medic_EP1 = [
-	[["Chem-lites/Flares",542],["Medical Supplies",541],["Smoke Grenades",543]],
-	[["FoodBioMeat","ItemZombieParts",1,1,"buy","Zombie Parts","Bio Meat",101]],
-	"neutral"
-];
-// Weapons Neutral 2P
-menu_USMC_Soldier_TL = [
-	[["Attachments",693],["Assault Rifle",615],["Light Machine Gun",616],["Pistols",617],["Shotguns and Single-shot",620],["Sniper Rifle",619],["Submachine Guns",618]],
-	[],
-	"neutral"
-];
-// Ammunition Neutral 2P
-menu_USMC_SoldierS_Engineer = [
-	[["Assault Rifle Ammo",621],["Light Machine Gun Ammo",622],["Pistol Ammo",625],["Shotguns and Single-shot Ammo",623],["Sniper Rifle Ammo",624],["Submachine Gun Ammo",626]],
-	[],
-	"neutral"
-];
-// East Wholesaler P
-menu_UN_CDF_Soldier_AAT_EP1 = [
-	[["Wholesale",555]],
-	[],
-	"neutral"
-];
-// General Store 2P
-menu_ValentinaVictim = [
-	[["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]],
-	[["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Tin Bar",101]],
-	"neutral"
-];
-// North Wholesaler P
-menu_UN_CDF_Soldier_MG_EP1 = [
-	[["Wholesale",636]],
-	[],
-	"neutral"
-];
-// Boat Vendor South P
-menu_GUE_Soldier_1 = [
-	[["Boats Armed",558],["Boats Unarmed",557]],
-	[],
-	"neutral"
-];
-// Vehicles Neutral 3p
-menu_FR_Corpsman = [
-	[["Bikes and ATV",650],["Buses and Vans",651],["Cargo Trucks",653],["Fuel Trucks",655],["Military Unarmed",658],["Trucks",659],["Used Cars",660],["Utility Vehicles",661]],
-	[],
-	"neutral"
-];
-// Neutral Building/Parts 3P
-menu_GUE_Soldier_AR = [
-	[["Building Supplies",662],["Tools",663],["Vehicle Parts",664]],
-	[],
-	"neutral"
-];
-// Medical Supplies 1P
+
+/***************Medical Supplies*********/
 menu_Dr_Hladik_EP1 = [
-	[["Chem-lites/Flares",666],["Medical Supplies",665],["Smoke Grenades",668]],
-	[["FoodBioMeat","ItemZombieParts",1,1,"buy","Zombie Parts","Bio Meat",101]],
+	[[localize "STR_EPOCH_TRADER_CATEGORY_MEDICALSUPPLIES",33]],
+	[["FoodBioMeat","ItemZombieParts",1,1]],
 	"neutral"
 ];
-// Medical Supplies 3
-menu_RU_Doctor = [
-	[["Chem-lites/Flares",669],["Medical Supplies",670],["Smoke Grenades",671]],
-	[["FoodBioMeat","ItemZombieParts",1,1,"buy","Zombie Parts","Bio Meat",101]],
-	"neutral"
-];
-// Boat Trader 1P
-menu_RU_Villager1 = [
-	[["Boats Armed",673],["Boats Unarmed",672]],
+
+/***************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"
 ];
-// Neutral Building/Parts 4p
-menu_Reynolds_PMC = [
-	[["Building Supplies",678],["Tools",679],["Vehicle Parts",677]],
+
+/***************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"
+];
+
+/*****************************************************************************/
+/************************************Selca*************************************/
+/***************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"
+];
+/*****************************************************************************/
+/************************************Planica*************************************/
+/***************Weapons*********/
+menu_Rocker4 = [
+	[[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]],
+	[],
+	"friendly"
+];
+
+/***************Ammunition*********/
+menu_RU_Citizen3 = [
+	[[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]],
+	[],
+	"friendly"
+];
+
+/***************General Store*********/
+menu_RU_WorkWoman1 = [
+	[[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]],
+	"friendly"
+];
+
+/***************Medical Supplies*********/
+menu_Dr_Annie_Baker_EP1 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_MEDICALSUPPLIES",33]],
+	[["FoodBioMeat","ItemZombieParts",1,1]],
+	"friendly"
+];
+
+/***************Building/Parts*********/
+menu_Worker3 = [
+	[[localize "STR_EPOCH_TRADER_CATEGORY_TOOLS",34],[localize "STR_EPOCH_TRADER_CATEGORY_BUILDINGSUPPLIES",35],[localize "STR_EPOCH_TRADER_CATEGORY_VEHICLEPARTS",36]],
+	[],
+	"friendly"
+];
+
+/***************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]],
+	[],
+	"friendly"
+];
+/*****************************************************************************/
+/***************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"
 ];