diff --git a/SQF/dayz_code/actions/trade_metals.sqf b/SQF/dayz_code/actions/trade_metals.sqf index 331976ab6..638e254d8 100644 --- a/SQF/dayz_code/actions/trade_metals.sqf +++ b/SQF/dayz_code/actions/trade_metals.sqf @@ -11,12 +11,6 @@ _metals_conversion = [ ["ItemTinBar","ItemAluminumBar",1,2,"buy","Aluminum","Tin",108], ["ItemAluminumBar","ItemTinBar",2,1,"buy","Tin","Aluminum",107], - ["ItemCopperBar","ItemTinBar",1,2,"buy","Tin","Copper",106], - ["ItemTinBar","ItemCopperBar",2,1,"buy","Copper","Tin",105], - - ["ItemSilverBar","ItemCopperBar10oz",1,3,"buy","10oz Copper","Silver",104], - ["ItemCopperBar10oz","ItemSilverBar",3,1,"buy","Silver","10oz Copper",103], - ["ItemGoldBar","ItemSilverBar10oz",1,3,"buy","10oz Silver","Gold",102], ["ItemSilverBar10oz","ItemGoldBar",3,1,"buy","Gold","10oz Silver",101], @@ -35,4 +29,4 @@ _metals_conversion = [ _cancel = player addAction ["Cancel", "\z\addons\dayz_code\actions\trade_cancel.sqf",["na"], 0, true, false, "",""]; s_player_parts set [count s_player_parts,_cancel]; -DZE_ActionInProgress = false; \ No newline at end of file +DZE_ActionInProgress = false; diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/server_traders.sqf index ddf89f062..152c55de2 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/server_traders.sqf @@ -21,7 +21,7 @@ menu_Profiteer1 = [ // Can Trader - Khush menu_RU_Sportswoman5 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Parts Trader - Khush @@ -64,7 +64,7 @@ menu_TK_CIV_Takistani04_EP1 = [ // Can Trader - Nur menu_TK_CIV_Woman03_EP1 = [ [["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Doctor - Nur @@ -94,7 +94,7 @@ menu_TK_CIV_Takistani02_EP1 = [ // Can Trader - Garm menu_RU_Damsel4 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Wholesaler - South @@ -120,4 +120,4 @@ menu_TK_GUE_Soldier_Sniper_EP1 = [ [["Ammunition",577],["Clothing",575],["Helicopter Armed",512],["Military Armed",569],["Trucks Armed",534],["Weapons",627]], [], "hostile" -]; \ No newline at end of file +]; diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/server_traders.sqf index 13693c201..7591b3f54 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/server_traders.sqf @@ -27,7 +27,7 @@ menu_Profiteer4 = [ // General Store menu_Rita_Ensler_EP1 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Weapons neutral @@ -87,7 +87,7 @@ menu_UN_CDF_Soldier_Pilot_EP1 = [ // General Store 2 menu_RU_WorkWoman1 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Medical Supplies @@ -105,7 +105,7 @@ menu_RU_Citizen4 = [ // General Store 3 menu_RU_WorkWoman5 = [ [["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // West Wholesaler @@ -167,4 +167,4 @@ menu_GUE_Woodlander2 = [ [["Black Market Ammo",527],["Black Market Weapons",526],["Explosives",529]], [], "neutral" -]; \ No newline at end of file +]; diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/server_traders.sqf index 5c282e0c7..b75335090 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/server_traders.sqf @@ -66,7 +66,7 @@ menu_Woodlander1 = [ // General Store 1 menu_RU_WorkWoman1 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Medical 1 @@ -104,7 +104,7 @@ menu_Woodlander3 = [ // General Store 2 menu_Rita_Ensler_EP1 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Medical Supplies 2 @@ -142,7 +142,7 @@ menu_TK_GUE_Soldier_5_EP1 = [ // General Store 3 menu_RU_WorkWoman5 = [ [["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Medical Supplies 3 @@ -163,4 +163,4 @@ menu_TK_CIV_Takistani04_EP1 = [ [], "neutral" ]; -//--------------------------------------Third Trader City End - Camara \ No newline at end of file +//--------------------------------------Third Trader City End - Camara diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/server_traders.sqf index 22ae4cfb0..2f4342160 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/server_traders.sqf @@ -58,7 +58,7 @@ menu_RU_Doctor = [ //FOOD & DRINK menu_RU_Damsel5 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "hero" ]; @@ -87,7 +87,7 @@ menu_Dr_Hladik_EP1 = [ //FOOD & DRINK menu_RU_Farmwife5 = [ [["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "hostile" ]; @@ -122,7 +122,7 @@ menu_Soldier_GL_PMC = [ //FOOD & DRINK menu_Citizen3 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/server_traders.sqf index 7a542b1a3..5ab62abfa 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/server_traders.sqf @@ -9,13 +9,13 @@ menu_GUE_Villager4 = [ // Alda's General Supplies menu_RU_Farmwife4 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Carole's General Supplies menu_RU_Farmwife3 = [ [["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Dr. Zoidberg @@ -101,4 +101,4 @@ menu_UN_CDF_Soldier_Pilot_EP1 = [ [["Airplanes",517],["Helicopter Unarmed",519]], [], "friendly" -]; \ No newline at end of file +]; diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/server_traders.sqf index c41dba7c5..ce7973f31 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/server_traders.sqf @@ -87,7 +87,7 @@ menu_CZ_Special_Forces_MG_DES_EP1 = [ // Melly's General Supplies menu_Damsel5 = [ [["Backpacks",688],["Clothes",689],["Cooked Meats",690],["Drinks",691],["Packaged Food",692]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Jim's Repair/Building Supplies @@ -105,7 +105,7 @@ menu_UN_CDF_Soldier_AAT_EP1 = [ // Bertha's General Supplies menu_RU_Farmwife1 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Rocky's Parts/Building Supplies @@ -135,7 +135,7 @@ menu_USMC_Soldier_TL = [ // Plancia General Store menu_ValentinaVictim = [ [["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Planica Parts Vendor @@ -155,4 +155,4 @@ 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" -]; \ No newline at end of file +]; diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/server_traders.sqf index 3b0ad1953..04b785389 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/server_traders.sqf @@ -27,7 +27,7 @@ menu_US_Delta_Force_AR_EP1 = [ // General Store menu_US_Delta_Force_Medic_EP1 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Weapons neutral @@ -87,7 +87,7 @@ menu_UN_CDF_Soldier_Pilot_EP1 = [ // General Store 2 menu_GUE_Worker2 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Medical Supplies @@ -117,7 +117,7 @@ menu_GUE_Soldier_CO = [ // General Store 3 menu_RU_Damsel4 = [ [["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // West Wholesaler @@ -203,4 +203,4 @@ menu_Damsel3 = [ [["Backpacks",688],["Clothes",689],["Cooked Meats",690],["Drinks",691],["Packaged Food",692]], [], "friendly" -]; \ No newline at end of file +]; diff --git a/Server Files/MPMissions/DayZ_Epoch_18.Sara/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_18.Sara/server_traders.sqf index 99f2e969e..8c7170e58 100644 --- a/Server Files/MPMissions/DayZ_Epoch_18.Sara/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_18.Sara/server_traders.sqf @@ -27,7 +27,7 @@ menu_Profiteer4 = [ // General Store menu_Rita_Ensler_EP1 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Weapons neutral @@ -87,7 +87,7 @@ menu_UN_CDF_Soldier_Pilot_EP1 = [ // General Store 2 menu_RU_WorkWoman1 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Medical Supplies @@ -105,7 +105,7 @@ menu_RU_Citizen4 = [ // General Store 3 menu_RU_WorkWoman5 = [ [["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // West Wholesaler @@ -161,4 +161,4 @@ menu_HouseWife1 = [ [["Boats Armed",673],["Boats Unarmed",672]], [], "neutral" -]; \ No newline at end of file +]; diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/server_traders.sqf index c3049d3e5..7c8acc037 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/server_traders.sqf @@ -27,7 +27,7 @@ menu_CIV_Contractor2_BAF = [ // General Store menu_RU_Farmwife4 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Weapons neutral @@ -87,7 +87,7 @@ menu_UN_CDF_Soldier_Pilot_EP1 = [ // General Store 2 menu_Damsel5 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Medical Supplies @@ -117,7 +117,7 @@ menu_GUE_Soldier_3 = [ // General Store 3 menu_Farmwife4 = [ [["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // West Wholesaler @@ -203,4 +203,4 @@ menu_Damsel3 = [ [["Backpacks",688],["Clothes",689],["Cooked Meats",690],["Drinks",691],["Packaged Food",692]], [], "friendly" -]; \ No newline at end of file +]; diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/server_traders.sqf index 4c350c6c6..9673302a5 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/server_traders.sqf @@ -31,7 +31,7 @@ menu_Soldier_Bodyguard_M4_PMC = [ // General Store menu_RU_Damsel1 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; @@ -94,7 +94,7 @@ menu_GUE_Commander = [ // General Store 2 menu_RU_Damsel2 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/server_traders.sqf index 69c0eca6f..b54e7553f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/server_traders.sqf @@ -27,7 +27,7 @@ menu_CIV_Contractor1_BAF = [ // General Store C menu_RU_Farmwife4 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Tin Bar",101]], "neutral" ]; // Weapons neutral C @@ -81,7 +81,7 @@ menu_Ins_Woodlander2 = [ // General Store 2 C menu_RU_Damsel4 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Tin Bar",101]], "neutral" ]; // Medical Supplies C @@ -119,4 +119,4 @@ menu_Ins_Woodlander1 = [ [["Boats Armed",673],["Boats Unarmed",672]], [], "neutral" -]; \ No newline at end of file +]; diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/server_traders.sqf index 99f2e969e..e50b8cadb 100644 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/server_traders.sqf @@ -27,7 +27,7 @@ menu_Profiteer4 = [ // General Store menu_Rita_Ensler_EP1 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Weapons neutral @@ -161,4 +161,4 @@ menu_HouseWife1 = [ [["Boats Armed",673],["Boats Unarmed",672]], [], "neutral" -]; \ No newline at end of file +]; diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/server_traders.sqf index 65a08a8f5..de1e7e5ce 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/server_traders.sqf @@ -4,7 +4,7 @@ serverTraders = ["TK_CIV_Woman02_EP1","TK_CIV_Takistani05_EP1","TK_CIV_Takistani // Farhah's General Supplies menu_TK_CIV_Woman02_EP1 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Akwhell's Vehicles @@ -46,7 +46,7 @@ menu_Dr_Hladik_EP1 = [ // Heather's General Supplies menu_CIV_EuroWoman01_EP1 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Greg's Ammunition @@ -72,4 +72,4 @@ menu_TK_CIV_Takistani04_EP1 = [ [["Ammunition",577],["Clothing",575],["Helicopter Armed",512],["Military Armed",569],["Trucks Armed",534],["Weapons",627]], [], "hostile" -]; \ No newline at end of file +]; diff --git a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/server_traders.sqf index d8fdd52e3..3c2a30acb 100644 --- a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/server_traders.sqf @@ -16,7 +16,7 @@ menu_Dr_Annie_Baker_EP1 = [ // Alejandria's General Supplies menu_CIV_EuroWoman01_EP1 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Blivion's Wholesale Items @@ -34,7 +34,7 @@ menu_Worker2 = [ // Stella's General Goods menu_TK_CIV_Woman03_EP1 = [ [["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Clive's Wholesale @@ -76,7 +76,7 @@ menu_Worker1 = [ // Bag Lady Gina menu_RU_Madam3 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Chip's Choppers @@ -106,7 +106,7 @@ menu_ibr_lingorman7s = [ // Tina's Tarts menu_Damsel3 = [ [["Cooked Meats",690],["Drinks",691],["Packaged Food",692]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Sly's Moto @@ -154,7 +154,7 @@ menu_ibr_lingorman6s = [ // Samish Shop menu_TK_CIV_Woman02_EP1 = [ [["Cooked Meats",686],["Drinks",684],["Packaged Food",687]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // AWOL's Planes diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/server_traders.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/server_traders.sqf index ae1a3ff78..3c2a30acb 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/server_traders.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/server_traders.sqf @@ -16,7 +16,7 @@ menu_Dr_Annie_Baker_EP1 = [ // Alejandria's General Supplies menu_CIV_EuroWoman01_EP1 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Blivion's Wholesale Items @@ -34,7 +34,7 @@ menu_Worker2 = [ // Stella's General Goods menu_TK_CIV_Woman03_EP1 = [ [["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Clive's Wholesale @@ -76,7 +76,7 @@ menu_Worker1 = [ // Bag Lady Gina menu_RU_Madam3 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Chip's Choppers @@ -106,7 +106,7 @@ menu_ibr_lingorman7s = [ // Tina's Tarts menu_Damsel3 = [ [["Cooked Meats",690],["Drinks",691],["Packaged Food",692]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Sly's Moto @@ -154,7 +154,7 @@ menu_ibr_lingorman6s = [ // Samish Shop menu_TK_CIV_Woman02_EP1 = [ [["Cooked Meats",686],["Drinks",684],["Packaged Food",687]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // AWOL's Planes @@ -185,4 +185,4 @@ menu_Functionary1 = [ [["Ammunition",478],["Clothes",476],["Helicopter Armed",493],["Military Armed",562],["Trucks Armed",479],["Weapons",477]], [], "hero" -]; \ No newline at end of file +]; diff --git a/Server Files/MPMissions/TEMPLATE/server_traders_tmp.sqf b/Server Files/MPMissions/TEMPLATE/server_traders_tmp.sqf index bdb110409..0caf95384 100644 --- a/Server Files/MPMissions/TEMPLATE/server_traders_tmp.sqf +++ b/Server Files/MPMissions/TEMPLATE/server_traders_tmp.sqf @@ -27,7 +27,7 @@ menu_Drake = [ // General Store menu_Damsel2 = [ [["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // Weapons neutral @@ -87,7 +87,7 @@ menu_UN_CDF_Soldier_Pilot_EP1 = [ // General Store 2 menu_GUE_Worker2 = [ [["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" ]; // Medical Supplies @@ -117,7 +117,7 @@ menu_GUE_Soldier_CO = [ // General Store 3 menu_Farmwife4 = [ [["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // West Wholesaler @@ -195,12 +195,12 @@ menu_ibr_lingorman6s = [ // General Store 4 menu_TK_CIV_Woman02_EP1 = [ [["Backpacks",685],["Clothes",683],["Cooked Meats",686],["Drinks",684],["Packaged Food",687]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "neutral" ]; // General Store 5 menu_Damsel3 = [ [["Backpacks",688],["Clothes",689],["Cooked Meats",690],["Drinks",691],["Packaged Food",692]], - [["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]], + [["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]], "friendly" -]; \ No newline at end of file +];