mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-14 04:02:37 +03:00
Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch
This commit is contained in:
Binary file not shown.
@@ -1176,7 +1176,7 @@ class Mission
|
||||
};
|
||||
class Markers
|
||||
{
|
||||
items=23;
|
||||
items=24;
|
||||
class Item0
|
||||
{
|
||||
position[]={5192.2104,62.495663,4994.3667};
|
||||
@@ -1266,8 +1266,8 @@ class Mission
|
||||
class Item14
|
||||
{
|
||||
position[]={5232.6299,1.9700195,8228.4785};
|
||||
name="WholesalerWest";
|
||||
text="West's Wholesaler";
|
||||
name="WholesalerNorth";
|
||||
text="North's Wholesaler";
|
||||
type="mil_dot";
|
||||
colorName="ColorBlack";
|
||||
};
|
||||
@@ -1335,10 +1335,18 @@ class Mission
|
||||
type="mil_circle";
|
||||
colorName="ColorBrown";
|
||||
};
|
||||
class Item23
|
||||
{
|
||||
position[]={3804.6707,-1.1429843,7656.6055};
|
||||
name="Boat2";
|
||||
text="North Boat Vendor";
|
||||
type="mil_dot";
|
||||
colorName="ColorBlack";
|
||||
};
|
||||
};
|
||||
class Sensors
|
||||
{
|
||||
items=10;
|
||||
items=11;
|
||||
class Item0
|
||||
{
|
||||
position[]={4419.9492,22.076105,1629.0402};
|
||||
@@ -1501,10 +1509,27 @@ class Mission
|
||||
repeating=1;
|
||||
interruptable=1;
|
||||
age="UNKNOWN";
|
||||
name="PlanicaTraders_1";
|
||||
expCond="(player distance PlanicaTraders) < 100; ";
|
||||
expActiv="TitleText[""Now Entering Trader City Planica"",""PLAIN DOWN""]; canbuild = false;";
|
||||
expDesactiv="TitleText[""Now Leaving Trader City Planica"",""PLAIN DOWN""]; canbuild = true;";
|
||||
name="MelloVehicleRepair";
|
||||
expCond="(player distance MelloVehicleRepair) < 100; ";
|
||||
expActiv="TitleText[""Now Entering Mello"",""PLAIN DOWN""]; canbuild = false;";
|
||||
expDesactiv="TitleText[""Now Leaving Mello"",""PLAIN DOWN""]; canbuild = true;";
|
||||
class Effects
|
||||
{
|
||||
};
|
||||
};
|
||||
class Item10
|
||||
{
|
||||
position[]={3807.3525,0.86945671,7661.0386};
|
||||
a=100;
|
||||
b=100;
|
||||
activationBy="WEST";
|
||||
repeating=1;
|
||||
interruptable=1;
|
||||
age="UNKNOWN";
|
||||
name="BOAT12";
|
||||
expCond="(player distance BOAT12) < 100; ";
|
||||
expActiv="TitleText[""Now Entering North Boat Vendor"",""PLAIN DOWN""]; canbuild = false;";
|
||||
expDesactiv="TitleText[""Now Leaving North Boat Vendor"",""PLAIN DOWN""]; canbuild = true;";
|
||||
class Effects
|
||||
{
|
||||
};
|
||||
|
||||
@@ -1,164 +1,170 @@
|
||||
// DayZ Epoch TRADERS for 16
|
||||
serverTraders = ["GUE_Soldier_Pilot","UN_CDF_Soldier_MG_EP1","GUE_Soldier_Medic","GUE_Woodlander1","GUE_Commander","Tanny_PMC","BAF_Soldier_AMG_W","BAF_Soldier_AAA_DDPM","GUE_Soldier_2","GUE_Soldier_1","BAF_Pilot_MTP","GUE_Soldier_Sab","US_Soldier_Medic_EP1","CZ_Special_Forces_MG_DES_EP1","Damsel5","GUE_Woodlander3","UN_CDF_Soldier_AAT_EP1","RU_Farmwife1","Citizen2_EP1","Rita_Ensler_EP1","USMC_SoldierS_Engineer","USMC_Soldier_TL","ValentinaVictim","Reynolds_PMC","GUE_Soldier_AR","FR_Corpsman","GUE_Soldier_Sab"];
|
||||
// AWOL's Airfield
|
||||
menu_GUE_Soldier_Pilot = [
|
||||
[["Airplanes",517],["Helicopter Unarmed",519]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// West's Wholesaler
|
||||
menu_UN_CDF_Soldier_MG_EP1 = [
|
||||
[["Wholesale",555]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Neutral Medic
|
||||
menu_GUE_Soldier_Medic = [
|
||||
[["Chem-lites/Flares",666],["Medical Supplies",665],["Smoke Grenades",668]],
|
||||
[["FoodBioMeat","ItemZombieParts",1,1,"buy","Zombie Parts","Bio Meat",101]],
|
||||
"neutral"
|
||||
];
|
||||
// Stavz Ammo
|
||||
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"
|
||||
];
|
||||
// Stevhn's Weapons
|
||||
menu_GUE_Commander = [
|
||||
[["Assault Rifle",602],["Light Machine Gun",603],["Pistols",606],["Shotguns and Single-shot",607],["Sniper Rifle",605],["Submachine Guns",604]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Trevors Hero Supplies.
|
||||
// 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 = [
|
||||
[["Ammunition",478],["Clothes",476],["Weapons",477]],
|
||||
[["Ammunition",478],["Clothes",476],["Helicopter Armed",493],["Military Armed",562],["Trucks Armed",479],["Weapons",477]],
|
||||
[],
|
||||
"hero"
|
||||
];
|
||||
// Roberts Ammo
|
||||
// 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"
|
||||
];
|
||||
// Drakes Weapons
|
||||
// Weapons Neutral P
|
||||
menu_BAF_Soldier_AAA_DDPM = [
|
||||
[["Assault Rifle",485],["Light Machine Gun",486],["Pistols",489],["Shotguns and Single-shot",574],["Sniper Rifle",487],["Submachine Guns",488]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Brians Vehicles
|
||||
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]],
|
||||
// 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"
|
||||
];
|
||||
// Sam's Boats
|
||||
menu_GUE_Soldier_1 = [
|
||||
[["Boats Armed",558],["Boats Unarmed",557]],
|
||||
// General Store P
|
||||
menu_Damsel5 = [
|
||||
[["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]],
|
||||
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
|
||||
"neutral"
|
||||
];
|
||||
// Weapons neutral 1P
|
||||
menu_GUE_Commander = [
|
||||
[["Assault Rifle",602],["Light Machine Gun",603],["Pistols",606],["Shotguns and Single-shot",607],["Sniper Rifle",605],["Submachine Guns",604]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Darren's Hero Vehicles
|
||||
menu_BAF_Pilot_MTP = [
|
||||
[["Helicopter Armed",493],["Military Armed",562],["Trucks Armed",479]],
|
||||
// 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]],
|
||||
[],
|
||||
"hero"
|
||||
"neutral"
|
||||
];
|
||||
// Green's Air Vehicles - Bandit Trader
|
||||
// Neutral Building/Parts P
|
||||
menu_GUE_Woodlander3 = [
|
||||
[["Building Supplies",508],["Toolbelt Items",510],["Vehicle Parts",509]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Bandit Trader P
|
||||
menu_GUE_Soldier_Sab = [
|
||||
[["Ammunition",577],["Clothing",575],["Helicopter Armed",512],["Military Armed",569],["Trucks Armed",534],["Weapons",627]],
|
||||
[],
|
||||
"hostile"
|
||||
];
|
||||
// Perry's Medical
|
||||
// Aircraft Dealer P
|
||||
menu_GUE_Soldier_Pilot = [
|
||||
[["Airplanes",517],["Helicopter Unarmed",519]],
|
||||
[],
|
||||
"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]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Black Market Vendor 1P
|
||||
menu_Soldier_PMC = [
|
||||
[["Black Market Ammo",527],["Black Market Weapons",526],["Explosives",529]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Neutral Building/Parts 1P
|
||||
menu_Citizen2_EP1 = [
|
||||
[["Building Supplies",530],["Toolbelt Items",532],["Vehicle Parts",531]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Neutral Vehicle 2P
|
||||
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]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Neutral General Store 1P
|
||||
menu_RU_Farmwife1 = [
|
||||
[["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]],
|
||||
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper 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"
|
||||
];
|
||||
// Kypex's Vehicles
|
||||
menu_CZ_Special_Forces_MG_DES_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]],
|
||||
// Weapons Neutral 2P
|
||||
menu_USMC_Soldier_TL = [
|
||||
[["Assault Rifle",615],["Light Machine Gun",616],["Pistols",617],["Shotguns and Single-shot",620],["Sniper Rifle",619],["Submachine Guns",618]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Melly's General Supplies
|
||||
menu_Damsel5 = [
|
||||
[["Backpacks",688],["Clothes",689],["Cooked Meats",690],["Drinks",691],["Packaged Food",692]],
|
||||
[["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]],
|
||||
"neutral"
|
||||
];
|
||||
// Jim's Repair/Building Supplies
|
||||
menu_GUE_Woodlander3 = [
|
||||
[["Building Supplies",680],["Toolbelt Items",681],["Vehicle Parts",682]],
|
||||
// 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"
|
||||
];
|
||||
// South West Wholesaler
|
||||
// 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]],
|
||||
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
|
||||
"neutral"
|
||||
];
|
||||
// North Wholesaler P
|
||||
menu_UN_CDF_Soldier_MG_EP1 = [
|
||||
[["Wholesale",636]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Bertha's General Supplies
|
||||
menu_RU_Farmwife1 = [
|
||||
[["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]],
|
||||
[["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]],
|
||||
"neutral"
|
||||
];
|
||||
// Rocky's Parts/Building Supplies
|
||||
menu_Citizen2_EP1 = [
|
||||
[["Building Supplies",508],["Toolbelt Items",510],["Vehicle Parts",509]],
|
||||
// Boat Vendor South P
|
||||
menu_GUE_Soldier_1 = [
|
||||
[["Boats Armed",558],["Boats Unarmed",557]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Planica Vehicle Vendor
|
||||
menu_Rita_Ensler_EP1 = [
|
||||
[["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"
|
||||
];
|
||||
// Planica Ammo Vendor
|
||||
menu_USMC_SoldierS_Engineer = [
|
||||
[["Assault Rifle Ammo",643],["Light Machine Gun Ammo",644],["Pistol Ammo",646],["Shotguns and Single-shot Ammo",649],["Sniper Rifle Ammo",647],["Submachine Gun Ammo",648]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Plancia Weapon Vendor
|
||||
menu_USMC_Soldier_TL = [
|
||||
[["Assault Rifle",637],["Light Machine Gun",638],["Pistols",674],["Shotguns and Single-shot",641],["Sniper Rifle",640],["Submachine Guns",642]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Plancia General Store
|
||||
menu_ValentinaVictim = [
|
||||
[["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]],
|
||||
[["ItemTinBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Tin Bar",101]],
|
||||
"neutral"
|
||||
];
|
||||
// Planica Parts Vendor
|
||||
menu_Reynolds_PMC = [
|
||||
[["Building Supplies",680],["Toolbelt Items",681],["Vehicle Parts",682]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Island Parts Vendor
|
||||
menu_GUE_Soldier_AR = [
|
||||
[["Building Supplies",678],["Toolbelt Items",679],["Vehicle Parts",677]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Island Vehicle Vendor
|
||||
// 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"
|
||||
];
|
||||
// Black Market Vendor
|
||||
menu_GUE_Soldier_Sab = [
|
||||
[["Black Market Ammo",527],["Black Market Weapons",526],["Explosives",529]],
|
||||
// Neutral Building/Parts 3P
|
||||
menu_GUE_Soldier_AR = [
|
||||
[["Building Supplies",662],["Toolbelt Items",663],["Vehicle Parts",664]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Medical Supplies 1P
|
||||
menu_Dr_Hladik_EP1 = [
|
||||
[["Chem-lites/Flares",666],["Medical Supplies",665],["Smoke Grenades",668]],
|
||||
[["FoodBioMeat","ItemZombieParts",1,1,"buy","Zombie Parts","Bio Meat",101]],
|
||||
"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]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
// Neutral Building/Parts 4p
|
||||
menu_Reynolds_PMC = [
|
||||
[["Building Supplies",678],["Toolbelt Items",679],["Vehicle Parts",677]],
|
||||
[],
|
||||
"neutral"
|
||||
];
|
||||
8
Server Files/SQL/1.0.4.1_Updates.sql
Normal file
8
Server Files/SQL/1.0.4.1_Updates.sql
Normal file
@@ -0,0 +1,8 @@
|
||||
UPDATE `traders_data` SET `buy` = '[4,"ItemBriefcase100oz",1]' WHERE `item` LIKE '%pipebomb%';
|
||||
UPDATE `traders_data` SET `buy` = '[4,"ItemBriefcase100oz",1]', `sell` = '[1,"ItemBriefcase100oz",1]' WHERE `item` LIKE '%HMMWV_M1151_M2_CZ_DES_EP1%';
|
||||
UPDATE `traders_data` SET `buy` = '[1,"ItemBriefcase100oz",1]', `sell` = '[5,"ItemGoldBar10oz",1]' WHERE `item` LIKE '%HMMWV_M998A2_SOV_DES_EP1%';
|
||||
UPDATE `traders_data` SET `buy` = '[1,"ItemBriefcase100oz",1]', `sell` = '[5,"ItemGoldBar10oz",1]' WHERE `item` LIKE '%LandRover_Special_CZ_EP1%';
|
||||
UPDATE `traders_data` SET `buy` = '[6,"ItemGoldBar10oz",1]', `sell` = '[3,"ItemGoldBar10oz",1]' WHERE `item` LIKE '%LandRover_MG_TK_EP1%';
|
||||
UPDATE `traders_data` SET `buy` = '[6,"ItemGoldBar10oz",1]', `sell` = '[3,"ItemGoldBar10oz",1]' WHERE `item` LIKE '%UAZ_MG_TK_EP1%';
|
||||
UPDATE `traders_data` SET `buy` = '[4,"ItemBriefcase100oz",1]', `sell` = '[1,"ItemBriefcase100oz",1]' WHERE `item` LIKE '%CH_47F_EP1%';
|
||||
UPDATE `traders_data` SET `buy` = '[2,"ItemBriefcase100oz",1]', `sell` = '[1,"ItemBriefcase100oz",1]' WHERE `item` LIKE '%Mi17%';
|
||||
Binary file not shown.
Reference in New Issue
Block a user