diff --git a/SQF/dayz_code/system/mission/server_traders/caribou.sqf b/SQF/dayz_code/system/mission/server_traders/caribou.sqf index 205a65283..9116b224e 100644 --- a/SQF/dayz_code/system/mission/server_traders/caribou.sqf +++ b/SQF/dayz_code/system/mission/server_traders/caribou.sqf @@ -1,6 +1,6 @@ // DayZ Epoch TRADERS for 17 -serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Profiteer1","Rita_Ensler_EP1","Dr_Hladik_EP1","Worker2","TK_CIV_Worker01_EP1","RU_Villager3","CIV_EuroMan01_EP1","CIV_EuroMan02_EP1","RU_WorkWoman5","Doctor","Worker1","TK_CIV_Worker02_EP1","RU_Pilot","HouseWife1","Profiteer2","Profiteer3","Functionary1_EP1_DZ"]; +serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Villager1","Profiteer1","Rita_Ensler_EP1","Dr_Hladik_EP1","Worker2","TK_CIV_Worker01_EP1","RU_Villager3","CIV_EuroMan01_EP1","CIV_EuroMan02_EP1","RU_WorkWoman5","Doctor","Worker1","TK_CIV_Worker02_EP1","RU_Pilot","HouseWife1","Profiteer2","Profiteer3","Functionary1_EP1_DZ"]; /***************Hero Vendor*********/ menu_FR_AC = [ @@ -59,7 +59,7 @@ menu_Worker2 = [ ]; if (Z_singleCurrency) then {(menu_Worker2 select 0) set [count (menu_Worker2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; /***************Vehicles*********/ -menu_TK_CIV_Worker01_EP1 = [ +menu_Villager1 = [ [[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" diff --git a/SQF/dayz_code/system/mission/server_traders/chernarus11.sqf b/SQF/dayz_code/system/mission/server_traders/chernarus11.sqf index 7452d2536..f8d6c720d 100644 --- a/SQF/dayz_code/system/mission/server_traders/chernarus11.sqf +++ b/SQF/dayz_code/system/mission/server_traders/chernarus11.sqf @@ -1,6 +1,6 @@ // DayZ Epoch TRADERS for 11 -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","Functionary1_EP1_DZ"]; +serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Profiteer1","Rita_Ensler_EP1","Dr_Hladik_EP1","Worker2","Villager1","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","Functionary1_EP1_DZ"]; /***************Hero Vendor*********/ menu_FR_AC = [ @@ -60,7 +60,7 @@ menu_Worker2 = [ ]; if (Z_singleCurrency) then {(menu_Worker2 select 0) set [count (menu_Worker2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; /***************Vehicles*********/ -menu_TK_CIV_Worker01_EP1 = [ +menu_Villager1 = [ [[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" diff --git a/SQF/dayz_code/system/mission/server_traders/chernarus17.sqf b/SQF/dayz_code/system/mission/server_traders/chernarus17.sqf index c795a2052..0baaf7bbb 100644 --- a/SQF/dayz_code/system/mission/server_traders/chernarus17.sqf +++ b/SQF/dayz_code/system/mission/server_traders/chernarus17.sqf @@ -1,5 +1,5 @@ // DayZ Epoch TRADERS for 17 -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","Functionary1_EP1_DZ"]; +serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Villager1","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","Functionary1_EP1_DZ"]; /***************Hero Vendor*********/ menu_FR_AC = [ @@ -145,7 +145,7 @@ menu_Worker3 = [ ]; if (Z_singleCurrency) then {(menu_Worker3 select 0) set [count (menu_Worker3 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; /***************Vehicles*********/ -menu_TK_CIV_Worker01_EP1 = [ +menu_Villager1 = [ [[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" diff --git a/SQF/dayz_code/system/mission/server_traders/fdf_isle1_a.sqf b/SQF/dayz_code/system/mission/server_traders/fdf_isle1_a.sqf index 11b21d6e4..5f9dd3628 100644 --- a/SQF/dayz_code/system/mission/server_traders/fdf_isle1_a.sqf +++ b/SQF/dayz_code/system/mission/server_traders/fdf_isle1_a.sqf @@ -1,6 +1,6 @@ // DayZ Epoch TRADERS for 19 -serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Profiteer1","Rita_Ensler_EP1","Dr_Hladik_EP1","Worker2","TK_CIV_Worker01_EP1","Rocker4","RU_Citizen3","RU_WorkWoman1","Dr_Annie_Baker_EP1","Worker3","RU_Pilot","RU_Villager3","Profiteer2","Profiteer3","Functionary1_EP1_DZ"]; +serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Villager1","Profiteer1","Rita_Ensler_EP1","Dr_Hladik_EP1","Worker2","TK_CIV_Worker01_EP1","Rocker4","RU_Citizen3","RU_WorkWoman1","Dr_Annie_Baker_EP1","Worker3","RU_Pilot","RU_Villager3","Profiteer2","Profiteer3","Functionary1_EP1_DZ"]; /***************Hero Vendor*********/ menu_FR_AC = [ @@ -60,7 +60,7 @@ menu_Worker2 = [ ]; if (Z_singleCurrency) then {(menu_Worker2 select 0) set [count (menu_Worker2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; /***************Vehicles*********/ -menu_TK_CIV_Worker01_EP1 = [ +menu_Villager1 = [ [[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" diff --git a/SQF/dayz_code/system/mission/server_traders/isladuala.sqf b/SQF/dayz_code/system/mission/server_traders/isladuala.sqf index 28537cd95..9cb0c013c 100644 --- a/SQF/dayz_code/system/mission/server_traders/isladuala.sqf +++ b/SQF/dayz_code/system/mission/server_traders/isladuala.sqf @@ -1,6 +1,6 @@ // DayZ Epoch TRADERS for 12 -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","Functionary1_EP1_DZ"]; +serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","Villager1","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","Functionary1_EP1_DZ"]; /***************Hero Vendor*********/ menu_FR_AC = [ @@ -16,7 +16,7 @@ menu_GUE_Commander = [ "hostile" ]; if (Z_singleCurrency) then {(menu_GUE_Commander select 0) set [count (menu_GUE_Commander select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; -/***********************************Pinley************************************/ +/***********************************Camara************************************/ /***************Black Market*********/ menu_GUE_Woodlander2 = [ [[localize "STR_EPOCH_TRADER_CATEGORY_BLACKMARKET",11]], @@ -66,7 +66,7 @@ menu_TK_CIV_Worker02_EP1 = [ "neutral" ]; /*****************************************************************************/ -/************************************Camara*************************************/ +/************************************Pinley*************************************/ /***************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]], @@ -103,7 +103,7 @@ menu_Worker2 = [ ]; if (Z_singleCurrency) then {(menu_Worker2 select 0) set [count (menu_Worker2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; /***************Vehicles*********/ -menu_TK_CIV_Worker01_EP1 = [ +menu_Villager1 = [ [[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" diff --git a/SQF/dayz_code/system/mission/server_traders/lingor.sqf b/SQF/dayz_code/system/mission/server_traders/lingor.sqf index 943bc959f..e230ba20f 100644 --- a/SQF/dayz_code/system/mission/server_traders/lingor.sqf +++ b/SQF/dayz_code/system/mission/server_traders/lingor.sqf @@ -1,6 +1,6 @@ // DayZ Epoch TRADERS for 6 -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","Functionary1_EP1_DZ"]; +serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Villager1","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","Functionary1_EP1_DZ"]; /***************Hero Vendor*********/ menu_FR_AC = [ @@ -60,7 +60,7 @@ menu_Worker2 = [ ]; if (Z_singleCurrency) then {(menu_Worker2 select 0) set [count (menu_Worker2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; /***************Vehicles*********/ -menu_TK_CIV_Worker01_EP1 = [ +menu_Villager1 = [ [[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" diff --git a/SQF/dayz_code/system/mission/server_traders/napf.sqf b/SQF/dayz_code/system/mission/server_traders/napf.sqf index f91590b24..41561a1d6 100644 --- a/SQF/dayz_code/system/mission/server_traders/napf.sqf +++ b/SQF/dayz_code/system/mission/server_traders/napf.sqf @@ -1,5 +1,5 @@ // DayZ Epoch TRADERS for 17 -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","Functionary1_EP1_DZ"]; +serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Villager1","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","Functionary1_EP1_DZ"]; /***************Hero Vendor*********/ menu_FR_AC = [ @@ -58,7 +58,7 @@ menu_Worker2 = [ ]; if (Z_singleCurrency) then {(menu_Worker2 select 0) set [count (menu_Worker2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; /***************Vehicles*********/ -menu_TK_CIV_Worker01_EP1 = [ +menu_Villager1 = [ [[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" diff --git a/SQF/dayz_code/system/mission/server_traders/panthera2.sqf b/SQF/dayz_code/system/mission/server_traders/panthera2.sqf index 91063528e..b03566487 100644 --- a/SQF/dayz_code/system/mission/server_traders/panthera2.sqf +++ b/SQF/dayz_code/system/mission/server_traders/panthera2.sqf @@ -1,6 +1,6 @@ // DayZ Epoch TRADERS for 17 -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","Functionary1_EP1_DZ"]; +serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Villager1","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","Functionary1_EP1_DZ"]; /***************Hero Vendor*********/ menu_FR_AC = [ @@ -60,7 +60,7 @@ menu_Worker2 = [ ]; if (Z_singleCurrency) then {(menu_Worker2 select 0) set [count (menu_Worker2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; /***************Vehicles*********/ -menu_TK_CIV_Worker01_EP1 = [ +menu_Villager1 = [ [[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" diff --git a/SQF/dayz_code/system/mission/server_traders/sauerland.sqf b/SQF/dayz_code/system/mission/server_traders/sauerland.sqf index 151cbd4cc..be48266f3 100644 --- a/SQF/dayz_code/system/mission/server_traders/sauerland.sqf +++ b/SQF/dayz_code/system/mission/server_traders/sauerland.sqf @@ -1,6 +1,6 @@ // DayZ Epoch TRADERS for 17 -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","Profiteer2","Profiteer3","Functionary1_EP1_DZ"]; +serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Villager1","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","Profiteer2","Profiteer3","Functionary1_EP1_DZ"]; /***************Hero Vendor*********/ menu_FR_AC = [ @@ -60,7 +60,7 @@ menu_Worker2 = [ ]; if (Z_singleCurrency) then {(menu_Worker2 select 0) set [count (menu_Worker2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; /***************Vehicles*********/ -menu_TK_CIV_Worker01_EP1 = [ +menu_Villager1 = [ [[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" diff --git a/SQF/dayz_code/system/mission/server_traders/smd_sahrani_a2.sqf b/SQF/dayz_code/system/mission/server_traders/smd_sahrani_a2.sqf index b01fb824a..47a86d87d 100644 --- a/SQF/dayz_code/system/mission/server_traders/smd_sahrani_a2.sqf +++ b/SQF/dayz_code/system/mission/server_traders/smd_sahrani_a2.sqf @@ -1,6 +1,6 @@ // DayZ Epoch TRADERS for 22 -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","Functionary1_EP1_DZ"]; +serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Villager1","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","Functionary1_EP1_DZ"]; /***************Hero Vendor*********/ menu_FR_AC = [ @@ -60,7 +60,7 @@ menu_Worker2 = [ ]; if (Z_singleCurrency) then {(menu_Worker2 select 0) set [count (menu_Worker2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; /***************Vehicles*********/ -menu_TK_CIV_Worker01_EP1 = [ +menu_Villager1 = [ [[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" diff --git a/SQF/dayz_code/system/mission/server_traders/takistan.sqf b/SQF/dayz_code/system/mission/server_traders/takistan.sqf index 1c039ec46..876c04533 100644 --- a/SQF/dayz_code/system/mission/server_traders/takistan.sqf +++ b/SQF/dayz_code/system/mission/server_traders/takistan.sqf @@ -1,6 +1,6 @@ // DayZ Epoch TRADERS for 1 -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","Profiteer2","Profiteer3","Functionary1_EP1_DZ"]; +serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Villager1","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","Profiteer2","Profiteer3","Functionary1_EP1_DZ"]; /***************Hero Vendor*********/ menu_FR_AC = [ @@ -60,7 +60,7 @@ menu_Worker2 = [ ]; if (Z_singleCurrency) then {(menu_Worker2 select 0) set [count (menu_Worker2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; /***************Vehicles*********/ -menu_TK_CIV_Worker01_EP1 = [ +menu_Villager1 = [ [[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" diff --git a/SQF/dayz_code/system/mission/server_traders/tavi.sqf b/SQF/dayz_code/system/mission/server_traders/tavi.sqf index 9340106a6..885f02942 100644 --- a/SQF/dayz_code/system/mission/server_traders/tavi.sqf +++ b/SQF/dayz_code/system/mission/server_traders/tavi.sqf @@ -1,6 +1,6 @@ // DayZ Epoch TRADERS for 13 -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","Functionary1_EP1_DZ"]; +serverTraders = ["FR_AC","GUE_Commander","GUE_Woodlander2","RU_Citizen4","Villager1","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","Functionary1_EP1_DZ"]; /***************Hero Vendor*********/ menu_FR_AC = [ @@ -60,7 +60,7 @@ menu_Worker2 = [ ]; if (Z_singleCurrency) then {(menu_Worker2 select 0) set [count (menu_Worker2 select 0), [localize "STR_EPOCH_TRADER_CATEGORY_CURRENCY",51]];}; /***************Vehicles*********/ -menu_TK_CIV_Worker01_EP1 = [ +menu_Villager1 = [ [[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" diff --git a/SQF/dayz_server/traders/chernarus11.sqf b/SQF/dayz_server/traders/chernarus11.sqf index 9eab0ab7d..bf46cc056 100644 --- a/SQF/dayz_server/traders/chernarus11.sqf +++ b/SQF/dayz_server/traders/chernarus11.sqf @@ -17,7 +17,7 @@ //Building/Parts ["Worker2",[6317.9,7789,0.0],244], //Vehicles - ["TK_CIV_Worker01_EP1",[6300.6,7800.3,0],310], + ["Villager1",[6300.6,7800.3,0],310], /***********************************************/ /******************Bash************************/ //Weapons diff --git a/SQF/dayz_server/traders/chernarus17.sqf b/SQF/dayz_server/traders/chernarus17.sqf index a53f5289e..9476920b8 100644 --- a/SQF/dayz_server/traders/chernarus17.sqf +++ b/SQF/dayz_server/traders/chernarus17.sqf @@ -17,7 +17,7 @@ //Building/Parts ["Worker2",[6391.78,7791.1,0],294.557], //Vehicles - ["TK_CIV_Worker01_EP1",[6381.81,7767.48,0],121.089], + ["Villager1",[6381.81,7767.48,0],121.089], /***********************************************/ /******************Bash************************/ //Weapons diff --git a/SQF/dayz_server/traders/fdf_isle1_a.sqf b/SQF/dayz_server/traders/fdf_isle1_a.sqf index 660c6e0d9..f8a2ecaee 100644 --- a/SQF/dayz_server/traders/fdf_isle1_a.sqf +++ b/SQF/dayz_server/traders/fdf_isle1_a.sqf @@ -17,7 +17,7 @@ //Building/Parts ["Worker2",[7985.6,10607.4,0],92.5541], //Vehicles - ["TK_CIV_Worker01_EP1",[7989.91,10604.4,0],97.4502], + ["Villager1",[7989.91,10604.4,0],97.4502], /***********************************************/ /******************Jesco************************/ //Weapons diff --git a/SQF/dayz_server/traders/isladuala.sqf b/SQF/dayz_server/traders/isladuala.sqf index 8665a6a74..a84f75e61 100644 --- a/SQF/dayz_server/traders/isladuala.sqf +++ b/SQF/dayz_server/traders/isladuala.sqf @@ -3,20 +3,6 @@ ["FR_AC",[6272.86,1274.2,0],266.473], // Bandit Vendor ["GUE_Commander",[8414.86,3368.66,0],332.222], - /******************Pinley************************/ - //Weapons - ["RU_Citizen4",[1280.75,9076.26,0],249.027], - //Ammunition - ["Profiteer1",[1277.35,9078.92,0],171.432], - //General Store - ["Rita_Ensler_EP1",[1272.02,9076.05,0],116.104], - //Medical Supplies - ["Dr_Hladik_EP1",[1271.24,9071.47,0],66.6204], - //Building/Parts - ["Worker2",[1288.84,9070.91,0],202.364], - //Vehicles - ["TK_CIV_Worker01_EP1",[1289.31,9065.7,0],249.243], - /***********************************************/ /******************Camara************************/ //Black Market ["GUE_Woodlander2",[1972.15,1203.71,0],101], @@ -33,6 +19,20 @@ //Vehicles ["TK_CIV_Worker02_EP1",[1988.5,1124.82,0],78.2], /***********************************************/ + /******************Pinley************************/ + //Weapons + ["RU_Citizen4",[1280.75,9076.26,0],249.027], + //Ammunition + ["Profiteer1",[1277.35,9078.92,0],171.432], + //General Store + ["Rita_Ensler_EP1",[1272.02,9076.05,0],116.104], + //Medical Supplies + ["Dr_Hladik_EP1",[1271.24,9071.47,0],66.6204], + //Building/Parts + ["Worker2",[1288.84,9070.91,0],202.364], + //Vehicles + ["Villager1",[1289.31,9065.7,0],249.243], + /***********************************************/ /******************Nubak************************/ //Weapons ["Rocker4",[4971.45,5109.62,0],319.14], diff --git a/SQF/dayz_server/traders/lingor.sqf b/SQF/dayz_server/traders/lingor.sqf index 7fe518e8d..d183578e1 100644 --- a/SQF/dayz_server/traders/lingor.sqf +++ b/SQF/dayz_server/traders/lingor.sqf @@ -17,7 +17,7 @@ //Building/Parts ["Worker2",[2402.69, 4177.35,0],244], //Vehicles - ["TK_CIV_Worker01_EP1",[2399.04, 4143.42,0],275], + ["Villager1",[2399.04, 4143.42,0],275], /***********************************************/ /******************El Villon************************/ //Weapons diff --git a/SQF/dayz_server/traders/napf.sqf b/SQF/dayz_server/traders/napf.sqf index 5e1654948..2283b0f53 100644 --- a/SQF/dayz_server/traders/napf.sqf +++ b/SQF/dayz_server/traders/napf.sqf @@ -17,7 +17,7 @@ //Building/Parts ["Worker2",[8254.95,15509.6,0.250067],189.353], //Vehicles - ["TK_CIV_Worker01_EP1",[8266.67,15482.2,0.123269],218.236], + ["Villager1",[8266.67,15482.2,0.123269],218.236], /***********************************************/ /******************Emmen************************/ //Weapons diff --git a/SQF/dayz_server/traders/panthera2.sqf b/SQF/dayz_server/traders/panthera2.sqf index 823258b1c..d7f7b11d9 100644 --- a/SQF/dayz_server/traders/panthera2.sqf +++ b/SQF/dayz_server/traders/panthera2.sqf @@ -17,7 +17,7 @@ //Building/Parts ["Worker2",[4425.9,1629.26,0],23], //Vehicles - ["TK_CIV_Worker01_EP1",[4405.04,1629.91,0],11.3336], + ["Villager1",[4405.04,1629.91,0],11.3336], /***********************************************/ /******************Selca************************/ //Weapons diff --git a/SQF/dayz_server/traders/sauerland.sqf b/SQF/dayz_server/traders/sauerland.sqf index 3f84d3f20..ac55431ec 100644 --- a/SQF/dayz_server/traders/sauerland.sqf +++ b/SQF/dayz_server/traders/sauerland.sqf @@ -17,7 +17,7 @@ //Building/Parts ["Worker2",[15516.6,17037.8,0],252.183], //Vehicles - ["TK_CIV_Worker01_EP1",[15535.4,17013.4,0],74.9945], + ["Villager1",[15535.4,17013.4,0],74.9945], /***********************************************/ /******************Oberdorf************************/ //Weapons diff --git a/SQF/dayz_server/traders/smd_sahrani_a2.sqf b/SQF/dayz_server/traders/smd_sahrani_a2.sqf index aa27c87d3..67d39a87d 100644 --- a/SQF/dayz_server/traders/smd_sahrani_a2.sqf +++ b/SQF/dayz_server/traders/smd_sahrani_a2.sqf @@ -17,7 +17,7 @@ //Building/Parts ["Worker2",[14266,12375.6,0],21.4575], //Vehicles - ["TK_CIV_Worker01_EP1",[14280.5,12382.6,0],345.399], + ["Villager1",[14280.5,12382.6,0],345.399], /***********************************************/ /******************Corazol***********************/ //Weapons diff --git a/SQF/dayz_server/traders/takistan.sqf b/SQF/dayz_server/traders/takistan.sqf index 7e861acf0..9a740702c 100644 --- a/SQF/dayz_server/traders/takistan.sqf +++ b/SQF/dayz_server/traders/takistan.sqf @@ -17,7 +17,7 @@ //Building/Parts ["Worker2",[1963.87,12560.5,0],44.3217], //Vehicles - ["TK_CIV_Worker01_EP1",[1936.82,12571.4,0],144], + ["Villager1",[1936.82,12571.4,0],144], /***********************************************/ /******************Garmsar************************/ //Weapons diff --git a/SQF/dayz_server/traders/tavi.sqf b/SQF/dayz_server/traders/tavi.sqf index 3e7db5166..7c4958d10 100644 --- a/SQF/dayz_server/traders/tavi.sqf +++ b/SQF/dayz_server/traders/tavi.sqf @@ -17,7 +17,7 @@ //Building/Parts ["Worker2",[7350.31,4331.09,0],51.0959], //Vehicles - ["TK_CIV_Worker01_EP1",[7344.24,4301.96,0],70.4169], + ["Villager1",[7344.24,4301.96,0],70.4169], /***********************************************/ /******************Bilgrad**********************/ //Weapons @@ -59,7 +59,7 @@ //Building/Parts ["Worker2",[11701.8,15231.1,0],222.73], //Vehicles - ["TK_CIV_Worker01_EP1",[11687.5,15226.8,0],309.145], + ["Villager1",[11687.5,15226.8,0],309.145], /***********************************************/ //Aircraft Dealer ["RU_Pilot",[6813.01,8539.05,0],220.008],