fixes plus podagorsk support

This commit is contained in:
[VB]AWOL
2013-09-27 16:29:21 -05:00
parent 4091cf0996
commit 2d65f9e950
6 changed files with 1859 additions and 72 deletions

View File

@@ -2707,10 +2707,10 @@ class CfgMagazines {
scope = 2;
count = 1;
type = 256;
displayName = "Ore";
displayName = "Iron Ore";
model = "\dayz_equip\models\trash_tincan.p3d";
picture = "\dayz_equip\textures\equip_tincan_ca.paa";
descriptionShort = "Ore: Used for crafting scrap metal. Can be mined from rocks using a sledgehammer.";
descriptionShort = "Used for crafting scrap metal. Can be mined from rocks using a sledgehammer.";
class ItemActions {
class Crafting
{

View File

@@ -51,8 +51,8 @@ if (count(_findNearestRock) >= 1) then {
if(_countOut<1)then{_countOut=4};
//diag_log format["DEBUG ROCK DISTANCE: %1 - %2 = %3", _rockBox,_distance2d,(_distance3d-_distance2d)];
axeDiagLog = format["DEBUG ROCK DISTANCE: _rockBox:%1 | _distance2d:%2 | typeOf:%3 | alive:%4 | _countOut:%5 | damage:%6", _rockBox,_distance2d,typeOf _rock,alive _rock,_countOut,damage _rock ];
publicVariable "axeDiagLog";
//axeDiagLog = format["DEBUG ROCK DISTANCE: _rockBox:%1 | _distance2d:%2 | typeOf:%3 | alive:%4 | _countOut:%5 | damage:%6", _rockBox,_distance2d,typeOf _rock,alive _rock,_countOut,damage _rock ];
//publicVariable "axeDiagLog";
// Start ore mining
_counter = 0;
@@ -116,12 +116,12 @@ if (count(_findNearestRock) >= 1) then {
_item setdir (getDir player);
player reveal _item;
// break rock
/* break rock
if("" == typeOf _rock) then {
_rock setDamage 1;
};
//diag_log format["DEBUG TREE DAMAGE: %1", _rock];
diag_log format["DEBUG TREE DAMAGE: %1", _rock];
*/
cutText [format["\n\n%1 piles of ore has been successfully added in front of you.", _countOut], "PLAIN DOWN"];
} else {

View File

@@ -2,6 +2,8 @@ disableSerialization;
_display = (_this select 0);
_close = {locked _x} count (nearestObjects [player, ["AllVehicles"], 5]) > 0;
cutText ["Cannot access gear on a locked vehicle." , "PLAIN DOWN"];
if(_close) then {
_display closeDisplay 1;
};

File diff suppressed because it is too large Load Diff

View File

@@ -1170,10 +1170,10 @@ class Mission
};
class Markers
{
items=17;
items=15;
class Item0
{
position[]={10126.552,19.767424,10494.726};
position[]={10788.115,90.416954,8680.3896};
name="center";
type="Empty";
};
@@ -1185,13 +1185,13 @@ class Mission
};
class Item2
{
position[]={9997.6689,76.535988,4629.1968};
position[]={10772.252,8.8704214,5547.606};
name="spawn0";
type="Empty";
};
class Item3
{
position[]={7427.2207,54.307949,4312.021};
position[]={12156.554,4.1533175,11002.222};
name="spawn1";
type="Empty";
};
@@ -1203,91 +1203,75 @@ class Mission
};
class Item5
{
position[]={12012.802,21.99192,5682.3721};
position[]={7914.2358,9.5998287,7496.2734};
name="spawn3";
type="Empty";
};
class Item6
{
position[]={14423.152,0.26354748,8392.2637};
position[]={7867.2437,7.0066466,8968.2842};
name="spawn4";
type="Empty";
};
class Item7
{
position[]={11972.645,150.44453,8292.459};
name="Tradercitystary";
text="Trader City Stary";
type="mil_circle";
position[]={10015.868,5.0297446,5963.0625};
name="wholesaleSouth";
text="Wholesaler";
type="mil_dot";
colorName="ColorBlack";
};
class Item8
{
position[]={13443.702,0.10039671,4692.0508};
name="wholesaleSouth";
position[]={14853.64,37.77092,7646.6982};
name="boatTraderEast";
text="Wholesaler";
type="mil_dot";
colorName="ColorBlack";
};
class Item9
{
position[]={13532.614,3.0083523,6355.9497};
name="boatTraderEast";
text="Wholesaler";
type="mil_dot";
colorName="ColorBlack";
};
class Item10
{
position[]={13497.367,0.2706908,4004.9241};
position[]={11897.247,2.0606923,5307.1626};
name="BoatDealerSouth";
text="Boat Dealer";
type="mil_dot";
colorName="ColorBlack";
};
class Item11
class Item10
{
position[]={12060.471,158.85699,12638.533};
position[]={8294.4307,5.0005341,4347.4355};
name="AirVehicles";
text="Aircraft Dealer";
type="mil_dot";
colorName="ColorGreen";
};
class Item12
class Item11
{
position[]={12018.378,24.85491,15531.034};
position[]={13572.653,41.133896,7520.5161};
name="BanditDen";
text="Bandit Camp";
type="mil_dot";
colorName="ColorRed";
};
class Item13
class Item12
{
position[]={11447.91,317.27109,11364.536};
name="Klen";
text="Trader City Klen";
position[]={9660.5234,25.000839,10888.863};
name="Jesco";
text="Trader City Jesco";
type="mil_circle";
colorName="ColorGreen";
};
class Item14
class Item13
{
position[]={13441.16,1.1406164,5429.3013};
name="BoatDealerEast";
text="Boat Dealer";
type="mil_dot";
colorName="ColorBlack";
};
class Item15
{
position[]={7672.9351,23.871973,10941.484};
position[]={7979.0151,22.484041,10603.889};
name="TradercityBash";
text="Trader City Bash";
text="Trader City Berezniki";
type="mil_circle";
colorName="ColorBlack";
};
class Item16
class Item14
{
position[]={12944.227,210.19823,12766.889};
position[]={9728.8066,5.0182734,4045.4143};
name="HeroTrader";
text="Hero Camp";
type="mil_dot";
@@ -1296,27 +1280,10 @@ class Mission
};
class Sensors
{
items=3;
items=2;
class Item0
{
position[]={11971.841,150.1813,8290.7109};
a=100;
b=100;
activationBy="WEST";
repeating=1;
interruptable=1;
age="UNKNOWN";
name="zonestary";
expCond="(player distance zonestary) < 100;";
expActiv="TitleText[""Now entering trader city Stary"",""PLAIN DOWN""]; canbuild = false;";
expDesactiv="TitleText[""Now leaving trader city Stary"",""PLAIN DOWN""]; canbuild = true;";
class Effects
{
};
};
class Item1
{
position[]={7672.1323,23.481419,10939.736};
position[]={7987.2495,7.9986267,10603.404};
a=100;
b=100;
activationBy="WEST";
@@ -1325,15 +1292,16 @@ class Mission
age="UNKNOWN";
name="zonebash";
expCond="(player distance zonebash) < 100;";
expActiv="TitleText[""Now entering trader city Bash"",""PLAIN DOWN""]; canbuild = false;";
expActiv="TitleText[""Now entering trader city Berezniki"",""PLAIN DOWN""]; canbuild = false;";
expDesactiv="TitleText[""Now leaving trader city Bash"",""PLAIN DOWN""]; canbuild = true;";
class Effects
{
soundDet="arabian_market_3";
};
};
class Item2
class Item1
{
position[]={11447.472,317.26886,11364.504};
position[]={9656.8906,25.000839,10889.035};
a=100;
b=100;
activationBy="WEST";
@@ -1342,10 +1310,11 @@ class Mission
age="UNKNOWN";
name="zoneklen";
expCond="(player distance zoneklen) < 100;";
expActiv="TitleText[""Now entering trader city Klen"",""PLAIN DOWN""]; canbuild = false;";
expActiv="TitleText[""Now entering trader city Jesco"",""PLAIN DOWN""]; canbuild = false;";
expDesactiv="TitleText[""Now leaving trader city Klen"",""PLAIN DOWN""]; canbuild = true;";
class Effects
{
soundDet="arabian_market_3";
};
};
};

View File

@@ -0,0 +1,206 @@
// DayZ Epoch TRADERS for 19
serverTraders = ["Tanny_PMC","Soldier_GL_M16A2_PMC","Soldier_MG_PKM_PMC","CIV_Contractor2_BAF","RU_Farmwife4","GUE_Soldier_CO","GUE_Soldier_AR","GUE_Woodlander2","GUE_Soldier_Crew","GUE_Soldier_Pilot","GUE_Soldier_GL","Soldier_TL_PMC","GUE_Villager4","UN_CDF_Soldier_Pilot_EP1","Damsel5","Dr_Annie_Baker_EP1","Soldier_MG_PKM_PMC","Soldier_MG_PMC","GUE_Soldier_3","Farmwife4","GUE_Soldier_1","GUE_Villager3","TK_CIV_Takistani04_EP1","Pilot_EP1","RU_Profiteer4","GUE_Woodlander2","Dr_Hladik_EP1","Doctor","HouseWife1","Citizen3_EP1","ibr_lingorman6","ibr_lingorman6s","TK_CIV_Woman02_EP1","Damsel3"];
// Hero Vendor
menu_Tanny_PMC = [
[["Ammunition",478],["Clothes",476],["Helicopter Armed",493],["Military Armed",562],["Trucks Armed",479],["Weapons",477]],
[],
"hero"
];
// Ammunition Friendly
menu_Soldier_GL_M16A2_PMC = [
[["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]],
[],
"friendly"
];
// Weapons Friendly
menu_Soldier_MG_PKM_PMC = [
[["Assault Rifle",485],["Light Machine Gun",486],["Pistols",489],["Shotguns and Single-shot",574],["Sniper Rifle",487],["Submachine Guns",488]],
[],
"friendly"
];
// Friendly Vehicles
menu_CIV_Contractor2_BAF = [
[["Bikes and ATV",608],["Buses and Vans",563],["Cargo Trucks",564],["Compact Cars",578],["Economy Cars",583],["Fuel Trucks",492],["Luxury Cars",581],["Microcars",584],["Military Unarmed",491],["Trucks",495],["Used Cars",585],["Utility Vehicles",565]],
[],
"friendly"
];
// General Store
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]],
"neutral"
];
// Weapons neutral
menu_GUE_Soldier_CO = [
[["Assault Rifle",602],["Light Machine Gun",603],["Pistols",606],["Shotguns and Single-shot",607],["Sniper Rifle",605],["Submachine Guns",604]],
[],
"neutral"
];
// Ammunition Neutral
menu_GUE_Soldier_AR = [
[["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
menu_GUE_Woodlander2 = [
[["Building Supplies",508],["Toolbelt Items",510],["Vehicle Parts",509]],
[],
"neutral"
];
// Bandit Trader
menu_GUE_Soldier_Crew = [
[["Ammunition",577],["Clothing",575],["Helicopter Armed",512],["Military Armed",569],["Trucks Armed",534],["Weapons",627]],
[],
"hostile"
];
// Aircraft Dealer
menu_GUE_Soldier_Pilot = [
[["Airplanes",517],["Helicopter Unarmed",519]],
[],
"friendly"
];
// Vehicles Neutral
menu_GUE_Soldier_GL = [
[["Bikes and ATV",587],["Buses and Vans",588],["Cargo Trucks",586],["Compact Cars",560],["Economy Cars",523],["Fuel Trucks",589],["Luxury Cars",521],["Microcars",522],["Military Unarmed",598],["Trucks",590],["Used Cars",520],["Utility Vehicles",591]],
[],
"neutral"
];
// Black Market Vendor
menu_Soldier_TL_PMC = [
[["Black Market Ammo",527],["Black Market Weapons",526],["Explosives",529]],
[],
"neutral"
];
// Friendly Building/Parts
menu_GUE_Villager4 = [
[["Building Supplies",530],["Toolbelt Items",532],["Vehicle Parts",531]],
[],
"friendly"
];
// Friendly Vehicles 2
menu_UN_CDF_Soldier_Pilot_EP1 = [
[["Bikes and ATV",536],["Buses and Vans",592],["Cargo Trucks",570],["Compact Cars",593],["Economy Cars",594],["Fuel Trucks",595],["Luxury Cars",596],["Microcars",597],["Military Unarmed",599],["Trucks Unarmed",535],["Used Cars",600],["Utility Vehicles",568]],
[],
"friendly"
];
// General Store 2
menu_Damsel5 = [
[["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
"friendly"
];
// Medical Supplies
menu_Dr_Annie_Baker_EP1 = [
[["Chem-lites/Flares",542],["Medical Supplies",541],["Smoke Grenades",543]],
[["FoodBioMeat","ItemZombieParts",1,1,"buy","Zombie Parts","Bio Meat",101]],
"friendly"
];
// Weapons friendly 2
menu_Soldier_MG_PKM_PMC = [
[["Assault Rifle",615],["Light Machine Gun",616],["Pistols",617],["Shotguns and Single-shot",620],["Sniper Rifle",619],["Submachine Guns",618]],
[],
"friendly"
];
// Ammunition friendly 2
menu_Soldier_MG_PMC = [
[["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]],
[],
"friendly"
];
// East Wholesaler
menu_GUE_Soldier_3 = [
[["Wholesale",555]],
[],
"neutral"
];
// General Store 3
menu_Farmwife4 = [
[["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
"neutral"
];
// West Wholesaler
menu_GUE_Soldier_1 = [
[["Wholesale",636]],
[],
"neutral"
];
// Boat Vendor
menu_GUE_Villager3 = [
[["Boats Armed",558],["Boats Unarmed",557]],
[],
"neutral"
];
// Weapons neutral 2
menu_TK_CIV_Takistani04_EP1 = [
[["Assault Rifle",637],["Light Machine Gun",638],["Pistols",674],["Shotguns and Single-shot",641],["Sniper Rifle",640],["Submachine Guns",642]],
[],
"neutral"
];
// Ammunition Neutral 2
menu_Pilot_EP1 = [
[["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"
];
// Vehicles Neutral 2
menu_RU_Profiteer4 = [
[["Bikes and ATV",650],["Buses and Vans",651],["Cargo Trucks",653],["Compact Cars",652],["Economy Cars",654],["Fuel Trucks",655],["Luxury Cars",656],["Microcars",657],["Military Unarmed",658],["Trucks",659],["Used Cars",660],["Utility Vehicles",661]],
[],
"neutral"
];
// Neutral Building/Parts
menu_GUE_Woodlander2 = [
[["Building Supplies",662],["Toolbelt Items",663],["Vehicle Parts",664]],
[],
"neutral"
];
// Medical Supplies 2
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_Doctor = [
[["Chem-lites/Flares",669],["Medical Supplies",670],["Smoke Grenades",671]],
[["FoodBioMeat","ItemZombieParts",1,1,"buy","Zombie Parts","Bio Meat",101]],
"neutral"
];
// Boat Trader 2
menu_HouseWife1 = [
[["Boats Armed",673],["Boats Unarmed",672]],
[],
"neutral"
];
// Wholesale 3
menu_Citizen3_EP1 = [
[["Wholesale",675]],
[],
"neutral"
];
// Friendly Building/parts 2
menu_ibr_lingorman6 = [
[["Building Supplies",678],["Toolbelt Items",679],["Vehicle Parts",677]],
[],
"friendly"
];
// Friendly Building/Parts 3
menu_ibr_lingorman6s = [
[["Building Supplies",680],["Toolbelt Items",681],["Vehicle Parts",682]],
[],
"friendly"
];
// General Store 4
menu_TK_CIV_Woman02_EP1 = [
[["Backpacks",685],["Clothes",683],["Cooked Meats",686],["Drinks",684],["Packaged Food",687]],
[],
"neutral"
];
// General Store 5
menu_Damsel3 = [
[["Backpacks",688],["Clothes",689],["Cooked Meats",690],["Drinks",691],["Packaged Food",692]],
[],
"friendly"
];