+ Added Armored SUV to spawn tables
+ Lowered gear counts on armed suv to 400,20,10
+ Removed boats from takistan DVS table
+ Moved metals trader options to a "trade metals" menu on each trader.
+ Changed old metals trader to new Hero only trader, will have certain
clothes at first. and lower priced items.
+ Add crafting in progress lock to prevent duping.
+ changed wording of vault to safe
+ added Hero traders that only deal with 5000+ humanity
+ Updated to larger 10oz copper, silver, gold equipment icons.
+ Server Side changed allowed buildables to array
This commit is contained in:
vbawol
2013-02-23 08:45:41 -06:00
parent 16cfc75b26
commit 73594cc02c
29 changed files with 1028 additions and 259 deletions

View File

@@ -41,16 +41,13 @@ AllowedVehiclesList = [
["SUV_Orange",1], ["SUV_Orange",1],
["SUV_Charcoal",1], ["SUV_Charcoal",1],
["SUV_Blue",1], ["SUV_Blue",1],
["ArmoredSUV_PMC_DZ",2]
["UH1H_DZ",2], ["UH1H_DZ",2],
["Mi17_Civilian_DZ",3], ["Mi17_Civilian_DZ",3],
["Mi17_DZ",1], ["Mi17_DZ",1],
["LandRover_CZ_EP1",2], ["LandRover_CZ_EP1",2],
["HMMWV_Ambulance",2], ["HMMWV_Ambulance",2],
["HMMWV_DES_EP1",1], ["HMMWV_DES_EP1",1],
["PBX",3],
["Zodiac",2],
["RHIB",2],
["Fishing_Boat",2],
["Smallboat_1",2], ["Smallboat_1",2],
["Smallboat_2",2], ["Smallboat_2",2],
["M113Ambul_UN_EP1",1], ["M113Ambul_UN_EP1",1],

View File

@@ -16,7 +16,7 @@ player setVariable ["BIS_noCoreConversations", true];
//disable radio messages to be heard and shown in the left lower corner of the screen //disable radio messages to be heard and shown in the left lower corner of the screen
enableRadio false; enableRadio false;
// AMP config // DayZ Epochconfig
spawnShoremode = 0; // Default = 1 (on shore) spawnShoremode = 0; // Default = 1 (on shore)
spawnArea= 1000; // Default = 1500 spawnArea= 1000; // Default = 1500
MaxHeliCrashes= 5; // Default = 5 MaxHeliCrashes= 5; // Default = 5

View File

@@ -10,73 +10,64 @@ if (true) then
_vehicle_11 = objNull; _vehicle_11 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["Land_CncBlock", [9376.5977, 3314.7014, -0.032022446], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Land_CncBlock", [9377.7207, 3315.0002, -0.032022446], [], 0, "CAN_COLLIDE"];
_vehicle_11 = _this; _vehicle_11 = _this;
_this setDir -82.477379; _this setDir -82.477379;
_this setPos [9376.5977, 3314.7014, -0.032022446]; _this setPos [9377.7207, 3315.0002, -0.032022446];
}; };
_vehicle_14 = objNull; _vehicle_14 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["Land_CncBlock", [9376.9395, 3317.2864, 0.00012207031], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Land_CncBlock", [9378.7441, 3318.4812, 0.00012207031], [], 0, "CAN_COLLIDE"];
_vehicle_14 = _this; _vehicle_14 = _this;
_this setDir -82.477379; _this setDir -62.617638;
_this setPos [9376.9395, 3317.2864, 0.00012207031]; _this setPos [9378.7441, 3318.4812, 0.00012207031];
}; };
_vehicle_18 = objNull; _vehicle_18 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["Land_CncBlock", [9378.2578, 3322.1899], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Land_CncBlock", [9384.4199, 3325.4426], [], 0, "CAN_COLLIDE"];
_vehicle_18 = _this; _vehicle_18 = _this;
_this setDir -73.287727; _this setDir -39.924965;
_this setPos [9378.2578, 3322.1899]; _this setPos [9384.4199, 3325.4426];
}; };
_vehicle_19 = objNull; _vehicle_19 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["Land_CncBlock", [9377.5117, 3319.6938, -0.04075902], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Land_CncBlock", [9380.9639, 3322.313, -0.04075902], [], 0, "CAN_COLLIDE"];
_vehicle_19 = _this; _vehicle_19 = _this;
_this setDir -73.287727; _this setDir -53.025898;
_this setPos [9377.5117, 3319.6938, -0.04075902]; _this setPos [9380.9639, 3322.313, -0.04075902];
};
_vehicle_26 = objNull;
if (true) then
{
_this = createVehicle ["Land_CncBlock", [9375.8223, 3293.4751, 6.1035156e-005], [], 0, "CAN_COLLIDE"];
_vehicle_26 = _this;
_this setDir -93.785606;
_this setPos [9375.8223, 3293.4751, 6.1035156e-005];
}; };
_vehicle_27 = objNull; _vehicle_27 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["Land_CncBlock", [9375.6523, 3296.0774, 0.034088135], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Land_CncBlock", [9375.1826, 3293.5681, 0.034088135], [], 0, "CAN_COLLIDE"];
_vehicle_27 = _this; _vehicle_27 = _this;
_this setDir -93.785606; _this setDir -107.20562;
_this setPos [9375.6523, 3296.0774, 0.034088135]; _this setPos [9375.1826, 3293.5681, 0.034088135];
}; };
_vehicle_28 = objNull; _vehicle_28 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["Land_CncBlock", [9375.7432, 3298.5488, -0.003112793], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Land_CncBlock", [9374.8672, 3297.1799, -0.003112793], [], 0, "CAN_COLLIDE"];
_vehicle_28 = _this; _vehicle_28 = _this;
_this setDir -84.595947; _this setDir -87.24527;
_this setPos [9375.7432, 3298.5488, -0.003112793]; _this setPos [9374.8672, 3297.1799, -0.003112793];
}; };
_vehicle_29 = objNull; _vehicle_29 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["Land_CncBlock", [9375.9844, 3301.1431, 0.027832031], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Land_CncBlock", [9375.0029, 3300.4829, 0.027832031], [], 0, "CAN_COLLIDE"];
_vehicle_29 = _this; _vehicle_29 = _this;
_this setDir -84.595947; _this setDir -84.595947;
_this setPos [9375.9844, 3301.1431, 0.027832031]; _this setPos [9375.0029, 3300.4829, 0.027832031];
}; };
_vehicle_34 = objNull; _vehicle_34 = objNull;
@@ -136,10 +127,10 @@ if (true) then
_vehicle_52 = objNull; _vehicle_52 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["Land_Market_stalls_01_EP1", [9410.4482, 3320.9568, -0.067228124], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Land_Market_stalls_01_EP1", [9411.625, 3320.8118, -0.067228124], [], 0, "CAN_COLLIDE"];
_vehicle_52 = _this; _vehicle_52 = _this;
_this setDir 93.258224; _this setDir 91.786942;
_this setPos [9410.4482, 3320.9568, -0.067228124]; _this setPos [9411.625, 3320.8118, -0.067228124];
}; };
_vehicle_54 = objNull; _vehicle_54 = objNull;
@@ -203,9 +194,9 @@ _group_2 = createGroup _center_1;
_unit_5 = objNull; _unit_5 = objNull;
if (true) then if (true) then
{ {
_this = _group_2 createUnit ["TK_CIV_Takistani03_EP1", [9409.832, 3328.823, 6.1035156e-005], [], 0, "CAN_COLLIDE"]; _this = _group_2 createUnit ["TK_CIV_Takistani03_EP1", [9410.4297, 3328.6609, 6.1035156e-005], [], 0, "CAN_COLLIDE"];
_unit_5 = _this; _unit_5 = _this;
_this setDir 633.34467; _this setDir 629.40656;
_this setVehicleInit "this allowDammage false;"; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour "CARELESS"; _this setVehicleInit "this allowDammage false;"; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour "CARELESS";
_this setUnitAbility 0.60000002; _this setUnitAbility 0.60000002;
if (false) then {_group_2 selectLeader _this;}; if (false) then {_group_2 selectLeader _this;};
@@ -232,7 +223,7 @@ if (true) then
{ {
_this = _group_2 createUnit ["TK_CIV_Woman03_EP1", [9409.9043, 3317.147, 9.1552734e-005], [], 0, "CAN_COLLIDE"]; _this = _group_2 createUnit ["TK_CIV_Woman03_EP1", [9409.9043, 3317.147, 9.1552734e-005], [], 0, "CAN_COLLIDE"];
_unit_7 = _this; _unit_7 = _this;
_this setDir 269.65353; _this setDir 268.58902;
_this setVehicleInit "this allowDammage false;"; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour "CARELESS"; _this setVehicleInit "this allowDammage false;"; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour "CARELESS";
_this setUnitAbility 0.60000002; _this setUnitAbility 0.60000002;
if (true) then {_group_2 selectLeader _this;}; if (true) then {_group_2 selectLeader _this;};
@@ -246,14 +237,6 @@ if (true) then
_this setPos [9391.8125, 3328.0518, -0.11402398]; _this setPos [9391.8125, 3328.0518, -0.11402398];
}; };
_vehicle_73 = objNull;
if (true) then
{
_this = createVehicle ["Land_bouda3_ruins", [9399.9805, 3326.4473, -0.2055155], [], 0, "CAN_COLLIDE"];
_vehicle_73 = _this;
_this setPos [9399.9805, 3326.4473, -0.2055155];
};
_vehicle_74 = objNull; _vehicle_74 = objNull;
if (true) then if (true) then
{ {
@@ -265,9 +248,9 @@ if (true) then
_unit_9 = objNull; _unit_9 = objNull;
if (true) then if (true) then
{ {
_this = _group_2 createUnit ["TK_CIV_Woman02_EP1", [9408.6309, 3313.9167], [], 0, "CAN_COLLIDE"]; _this = _group_2 createUnit ["TK_CIV_Woman02_EP1", [9409.6855, 3313.2922], [], 0, "CAN_COLLIDE"];
_unit_9 = _this; _unit_9 = _this;
_this setDir 265.03082; _this setDir 265.93582;
_this setVehicleInit "this allowDammage false;"; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour "CARELESS"; _this setVehicleInit "this allowDammage false;"; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour "CARELESS";
_this setUnitAbility 0.60000002; _this setUnitAbility 0.60000002;
if (false) then {_group_2 selectLeader _this;}; if (false) then {_group_2 selectLeader _this;};
@@ -453,17 +436,6 @@ if (true) then
_this setPos [9401.0615, 3335.5154, -6.1035156e-005]; _this setPos [9401.0615, 3335.5154, -6.1035156e-005];
}; };
_unit_11 = objNull;
if (true) then
{
_this = _group_2 createUnit ["TK_CIV_Woman01_EP1", [9412.3633, 3321.0039, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
_unit_11 = _this;
_this setDir 282.46509;
_this setVehicleInit "this allowDammage false;"; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour "CARELESS";
_this setUnitAbility 0.60000002;
if (false) then {_group_2 selectLeader _this;};
};
_vehicle_136 = objNull; _vehicle_136 = objNull;
if (true) then if (true) then
{ {
@@ -473,11 +445,6 @@ if (true) then
_this setPos [9410.9727, 3320.7258, 0.0035711317]; _this setPos [9410.9727, 3320.7258, 0.0035711317];
}; };
_this = createCenter west;
_center_2 = _this;
_group_3 = createGroup _center_2;
_vehicle_541 = objNull; _vehicle_541 = objNull;
if (true) then if (true) then
{ {
@@ -750,13 +717,11 @@ if (true) then
_vehicle_623 = objNull; _vehicle_623 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["UH1Wreck", [472.86752, 5530.7593, -0.13926697], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["UH1Wreck", [474.27603, 5531.0093, -0.13926697], [], 0, "CAN_COLLIDE"];
_vehicle_623 = _this; _vehicle_623 = _this;
_this setPos [472.86752, 5530.7593, -0.13926697]; _this setPos [474.27603, 5531.0093, -0.13926697];
}; };
_group_4 = createGroup _center_1;
_unit_32 = objNull; _unit_32 = objNull;
if (true) then if (true) then
{ {
@@ -903,22 +868,6 @@ if (true) then
_this setPos [463.8385, 5526.502, 6.1035156e-005]; _this setPos [463.8385, 5526.502, 6.1035156e-005];
}; };
_vehicle_666 = objNull;
if (true) then
{
_this = createVehicle ["HeliHCivil", [450.67926, 5584.9604, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_666 = _this;
_this setPos [450.67926, 5584.9604, -3.0517578e-005];
};
_vehicle_667 = objNull;
if (true) then
{
_this = createVehicle ["HeliH", [455.12183, 5570.9292, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_667 = _this;
_this setPos [455.12183, 5570.9292, 3.0517578e-005];
};
_vehicle_676 = objNull; _vehicle_676 = objNull;
if (true) then if (true) then
{ {
@@ -1216,10 +1165,10 @@ if (true) then
_vehicle_744 = objNull; _vehicle_744 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["Hedgehog_EP1", [393.40479, 5593.5967, 0.024805665], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Hedgehog_EP1", [413.01926, 5575.9556, 0.024805665], [], 0, "CAN_COLLIDE"];
_vehicle_744 = _this; _vehicle_744 = _this;
_this setDir -87.678001; _this setDir -87.678001;
_this setPos [393.40479, 5593.5967, 0.024805665]; _this setPos [413.01926, 5575.9556, 0.024805665];
}; };
_vehicle_745 = objNull; _vehicle_745 = objNull;
@@ -1838,9 +1787,9 @@ if (true) then
_unit_55 = objNull; _unit_55 = objNull;
if (true) then if (true) then
{ {
_this = _group_2 createUnit ["TK_CIV_Takistani06_EP1", [9407.9082, 3290.2896, -3.0517578e-005], [], 0, "CAN_COLLIDE"]; _this = _group_2 createUnit ["TK_CIV_Takistani06_EP1", [9408.8145, 3291.5339, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_unit_55 = _this; _unit_55 = _this;
_this setDir -24.172441; _this setDir -75.515251;
_this setVehicleInit "this allowDammage false;"; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour "CARELESS"; _this setVehicleInit "this allowDammage false;"; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour "CARELESS";
_this setUnitAbility 0.60000002; _this setUnitAbility 0.60000002;
if (false) then {_group_2 selectLeader _this;}; if (false) then {_group_2 selectLeader _this;};
@@ -1849,9 +1798,9 @@ if (true) then
_unit_56 = objNull; _unit_56 = objNull;
if (true) then if (true) then
{ {
_this = _group_2 createUnit ["TK_CIV_Takistani04_EP1", [9405.5713, 3288.0291, -6.1035156e-005], [], 0, "CAN_COLLIDE"]; _this = _group_2 createUnit ["TK_CIV_Takistani04_EP1", [9403.1611, 3287.082, -6.1035156e-005], [], 0, "CAN_COLLIDE"];
_unit_56 = _this; _unit_56 = _this;
_this setDir -33.293148; _this setDir 12.637461;
_this setVehicleInit "this allowDammage false;"; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour "CARELESS"; _this setVehicleInit "this allowDammage false;"; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour "CARELESS";
_this setUnitAbility 0.60000002; _this setUnitAbility 0.60000002;
if (false) then {_group_2 selectLeader _this;}; if (false) then {_group_2 selectLeader _this;};
@@ -1860,28 +1809,28 @@ if (true) then
_vehicle_911 = objNull; _vehicle_911 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["Land_CncBlock_D", [9435.2549, 3298.7444, -9.1552734e-005], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Land_CncBlock_D", [9426.6797, 3301.1548, -9.1552734e-005], [], 0, "CAN_COLLIDE"];
_vehicle_911 = _this; _vehicle_911 = _this;
_this setDir 91.095497; _this setDir 98.074715;
_this setPos [9435.2549, 3298.7444, -9.1552734e-005]; _this setPos [9426.6797, 3301.1548, -9.1552734e-005];
}; };
_vehicle_913 = objNull; _vehicle_913 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["Land_CncBlock_D", [9423.9414, 3305.77, 0], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Land_CncBlock_D", [9418.8984, 3306.8628], [], 0, "CAN_COLLIDE"];
_vehicle_913 = _this; _vehicle_913 = _this;
_this setDir 88.123161; _this setDir 94.732773;
_this setPos [9423.9414, 3305.77, 0]; _this setPos [9418.8984, 3306.8628];
}; };
_vehicle_915 = objNull; _vehicle_915 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["Land_HBarrier5", [9419.5479, 3314.7319, -0.11571757], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Land_HBarrier5", [9419.4092, 3314.7166, -0.11571757], [], 0, "CAN_COLLIDE"];
_vehicle_915 = _this; _vehicle_915 = _this;
_this setDir 94.513664; _this setDir 94.513664;
_this setPos [9419.5479, 3314.7319, -0.11571757]; _this setPos [9419.4092, 3314.7166, -0.11571757];
}; };
_vehicle_917 = objNull; _vehicle_917 = objNull;
@@ -1938,14 +1887,6 @@ if (true) then
_this setPos [9416.04, 3284.8745, -0.053924561]; _this setPos [9416.04, 3284.8745, -0.053924561];
}; };
_vehicle_930 = objNull;
if (true) then
{
_this = createVehicle ["HeliHCivil", [9396.0107, 3316.1897, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_930 = _this;
_this setPos [9396.0107, 3316.1897, 3.0517578e-005];
};
_vehicle_932 = objNull; _vehicle_932 = objNull;
if (true) then if (true) then
{ {
@@ -1983,4 +1924,231 @@ if (true) then
if (false) then {_group_2 selectLeader _this;}; if (false) then {_group_2 selectLeader _this;};
}; };
_vehicle_937 = objNull;
if (true) then
{
_this = createVehicle ["HeliHCivil", [7844.7007, 5600.2061, -0.00012207031], [], 0, "CAN_COLLIDE"];
_vehicle_937 = _this;
_this setPos [7844.7007, 5600.2061, -0.00012207031];
};
_vehicle_939 = objNull;
if (true) then
{
_this = createVehicle ["FoldTable", [7849.8271, 5573.9502], [], 0, "CAN_COLLIDE"];
_vehicle_939 = _this;
_this setDir -38.440014;
_this setPos [7849.8271, 5573.9502];
};
_vehicle_940 = objNull;
if (true) then
{
_this = createVehicle ["FoldChair", [7851.1597, 5572.7661, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_940 = _this;
_this setDir 183.78395;
_this setPos [7851.1597, 5572.7661, -3.0517578e-005];
};
_vehicle_941 = objNull;
if (true) then
{
_this = createVehicle ["Land_Canister_EP1", [7850.7808, 5572.0874, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_941 = _this;
_this setDir -3.1480756;
_this setPos [7850.7808, 5572.0874, -3.0517578e-005];
};
_vehicle_942 = objNull;
if (true) then
{
_this = createVehicle ["Land_Misc_Well_L_EP1", [7830.873, 5639.7705, -0.24955584], [], 0, "CAN_COLLIDE"];
_vehicle_942 = _this;
_this setDir 102.9458;
_this setPos [7830.873, 5639.7705, -0.24955584];
};
_vehicle_943 = objNull;
if (true) then
{
_this = createVehicle ["Land_CamoNet_NATO_EP1", [7848.1143, 5571.1289], [], 0, "CAN_COLLIDE"];
_vehicle_943 = _this;
_this setDir 153.31274;
_this setPos [7848.1143, 5571.1289];
};
_vehicle_944 = objNull;
if (true) then
{
_this = createVehicle ["Misc_cargo_cont_net1", [7848.3442, 5569.7837, -0.00012207031], [], 0, "CAN_COLLIDE"];
_vehicle_944 = _this;
_this setDir -29.156359;
_this setPos [7848.3442, 5569.7837, -0.00012207031];
};
_vehicle_945 = objNull;
if (true) then
{
_this = createVehicle ["Sign_Direction_EP1", [7856.9189, 5581.5786, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_945 = _this;
_this setDir 283.91022;
_this setPos [7856.9189, 5581.5786, 3.0517578e-005];
};
_vehicle_946 = objNull;
if (true) then
{
_this = createVehicle ["RoadCone", [7849.2427, 5570.0947, -6.1035156e-005], [], 0, "CAN_COLLIDE"];
_vehicle_946 = _this;
_this setPos [7849.2427, 5570.0947, -6.1035156e-005];
};
_vehicle_948 = objNull;
if (true) then
{
_this = createVehicle ["RoadCone", [7848.9595, 5570.8271, 0], [], 0, "CAN_COLLIDE"];
_vehicle_948 = _this;
_this setPos [7848.9595, 5570.8271, 0];
};
_vehicle_950 = objNull;
if (true) then
{
_this = createVehicle ["RoadCone", [7849.3345, 5570.5083, -0.00012207031], [], 0, "CAN_COLLIDE"];
_vehicle_950 = _this;
_this setPos [7849.3345, 5570.5083, -0.00012207031];
};
_vehicle_953 = objNull;
if (true) then
{
_this = createVehicle ["Land_Fire_barrel", [7817.1982, 5606.8809, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_953 = _this;
_this setPos [7817.1982, 5606.8809, -3.0517578e-005];
};
_unit_59 = objNull;
if (true) then
{
_this = _group_2 createUnit ["TK_CIV_Takistani02_EP1", [7850.1875, 5573.4512, 0.22677676], [], 0, "CAN_COLLIDE"];
_unit_59 = _this;
_this setDir -44.618198;
_this setVehicleInit "this allowDammage false;"; _this disableAI 'FSM'; _this disableAI 'MOVE'; _this disableAI 'AUTOTARGET'; _this disableAI 'TARGET'; _this setBehaviour "CARELESS";
_this setUnitAbility 0.60000002;
if (false) then {_group_2 selectLeader _this;};
};
_vehicle_954 = objNull;
if (true) then
{
_this = createVehicle ["Misc_palletsfoiled", [7847.3687, 5571.292, -9.1552734e-005], [], 0, "CAN_COLLIDE"];
_vehicle_954 = _this;
_this setDir 57.436001;
_this setPos [7847.3687, 5571.292, -9.1552734e-005];
};
_vehicle_955 = objNull;
if (true) then
{
_this = createVehicle ["Misc_palletsfoiled_heap", [7844.251, 5570.5874, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_955 = _this;
_this setDir 147.25204;
_this setPos [7844.251, 5570.5874, -3.0517578e-005];
};
_vehicle_956 = objNull;
if (true) then
{
_this = createVehicle ["Land_Misc_GContainer_Big", [7853.4834, 5577.1143, -0.34381306], [], 0, "CAN_COLLIDE"];
_vehicle_956 = _this;
_this setDir 47.433353;
_this setPos [7853.4834, 5577.1143, -0.34381306];
};
_vehicle_957 = objNull;
if (true) then
{
_this = createVehicle ["Paleta2", [7846.2603, 5572.0957, -0.091502532], [], 0, "CAN_COLLIDE"];
_vehicle_957 = _this;
_this setDir 40.225201;
_this setPos [7846.2603, 5572.0957, -0.091502532];
};
_vehicle_958 = objNull;
if (true) then
{
_this = createVehicle ["Land_Fire_barrel", [433.34042, 5582.8208, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_958 = _this;
_this setPos [433.34042, 5582.8208, -3.0517578e-005];
};
_vehicle_959 = objNull;
if (true) then
{
_this = createVehicle ["Land_Ind_TankSmall", [411.64804, 5531.2388, -0.27032107], [], 0, "CAN_COLLIDE"];
_vehicle_959 = _this;
_this setDir 23.631126;
_this setPos [411.64804, 5531.2388, -0.27032107];
};
_vehicle_960 = objNull;
if (true) then
{
_this = createVehicle ["ClutterCutter_small_EP1", [464.64966, 5538.3481, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_960 = _this;
_this setPos [464.64966, 5538.3481, -3.0517578e-005];
};
_vehicle_961 = objNull;
if (true) then
{
_this = createVehicle ["Land_Ind_TankSmall", [5592.0718, 8956.5557, -7.6293945e-006], [], 0, "CAN_COLLIDE"];
_vehicle_961 = _this;
_this setDir 78.819687;
_this setPos [5592.0718, 8956.5557, -7.6293945e-006];
};
_vehicle_962 = objNull;
if (true) then
{
_this = createVehicle ["Land_Ind_TankSmall", [8242.8818, 7815.2549, -0.28311342], [], 0, "CAN_COLLIDE"];
_vehicle_962 = _this;
_this setDir -134.71858;
_this setPos [8242.8818, 7815.2549, -0.28311342];
};
_vehicle_963 = objNull;
if (true) then
{
_this = createVehicle ["Land_Ind_TankSmall", [6497.5806, 2089.6509, -0.28502855], [], 0, "CAN_COLLIDE"];
_vehicle_963 = _this;
_this setDir 3.8481729;
_this setPos [6497.5806, 2089.6509, -0.28502855];
};
_vehicle_964 = objNull;
if (true) then
{
_this = createVehicle ["Land_Ind_TankSmall", [9321.0664, 10065.901, -0.078782141], [], 0, "CAN_COLLIDE"];
_vehicle_964 = _this;
_this setDir 28.099548;
_this setPos [9321.0664, 10065.901, -0.078782141];
};
_vehicle_968 = objNull;
if (true) then
{
_this = createVehicle ["HeliHCivil", [7821.6479, 5578.4971, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_968 = _this;
_this setPos [7821.6479, 5578.4971, 3.0517578e-005];
};
_vehicle_972 = objNull;
if (true) then
{
_this = createVehicle ["HeliHCivil", [454.65253, 5569.8379, 9.1552734e-005], [], 0, "CAN_COLLIDE"];
_vehicle_972 = _this;
_this setPos [454.65253, 5569.8379, 9.1552734e-005];
};
processInitCommands; processInitCommands;

View File

@@ -1251,7 +1251,7 @@ class Mission
}; };
class Markers class Markers
{ {
items=13; items=16;
class Item0 class Item0
{ {
position[]={6622.5166,301.31479,6751.1309}; position[]={6622.5166,301.31479,6751.1309};
@@ -1330,6 +1330,84 @@ class Mission
name="spawn10"; name="spawn10";
type="Empty"; type="Empty";
}; };
class Item13
{
position[]={431.62454,303.29282,5554.8208};
name="tradercitykush";
text="Trader City Khush";
type="mil_circle";
colorName="ColorGreen";
};
class Item14
{
position[]={7818.2983,467.56793,5592.2051};
name="Trader_City_GurDur";
text="Trader City GurDur";
type="mil_circle";
colorName="ColorGreen";
};
class Item15
{
position[]={9397.8838,497.31366,3307.2654};
name="Trader_City_Manara";
text="Trader City Manara";
type="mil_circle";
colorName="ColorGreen";
};
};
class Sensors
{
items=3;
class Item0
{
position[]={436.03763,303.48236,5550.8608};
a=75;
b=75;
activationBy="WEST";
repeating=1;
interruptable=1;
age="UNKNOWN";
name="zone1";
expCond="(player distance zone1) < 75;";
expActiv="TitleText[""Now entering trader city Khush"",""PLAIN DOWN""]; placevault = false;";
expDesactiv="TitleText[""Now leaving trader city Khush"",""PLAIN DOWN""]; placevault = true;";
class Effects
{
soundDet="arabian_market_1";
};
};
class Item1
{
position[]={7817.9443,467.54111,5591.3789};
activationBy="WEST";
repeating=1;
interruptable=1;
age="UNKNOWN";
name="zone2";
expCond="(player distance zone2) < 50;";
expActiv="TitleText[""Now entering trader city GurDur"",""PLAIN DOWN""]; placevault = false;";
expDesactiv="TitleText[""Now leaving trader city GurDur"",""PLAIN DOWN""]; placevault = true;";
class Effects
{
soundDet="arabian_market_1";
};
};
class Item2
{
position[]={9398.1055,497.21521,3303.7666};
activationBy="WEST";
repeating=1;
interruptable=1;
age="UNKNOWN";
name="zone3";
expCond="(player distance zone3) < 50;";
expActiv="TitleText[""Now entering trader city Manara"",""PLAIN DOWN""]; placevault = false;";
expDesactiv="TitleText[""Now leaving trader city Manara"",""PLAIN DOWN""]; placevault = true;";
class Effects
{
soundDet="arabian_market_1";
};
};
}; };
}; };
class Intro class Intro

View File

@@ -7,6 +7,7 @@ serverTraders = [
"TK_CIV_Takistani05_EP1", "TK_CIV_Takistani05_EP1",
"Dr_Annie_Baker_EP1", "Dr_Annie_Baker_EP1",
"Woodlander2", "Woodlander2",
"TK_CIV_Takistani02_EP1",
"TK_CIV_Takistani03_EP1", "TK_CIV_Takistani03_EP1",
"TK_CIV_Takistani06_EP1", "TK_CIV_Takistani06_EP1",
"TK_CIV_Takistani04_EP1", "TK_CIV_Takistani04_EP1",
@@ -18,23 +19,9 @@ serverTraders = [
// Metals Traders // Metals Traders
menu_Functionary1 = [ menu_Functionary1 = [
[["Vaults",100411]], [["Clothes",100411]],
[ [],
"hero"
["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,1,"buy","10oz Copper","Silver",104],
["ItemCopperBar10oz","ItemSilverBar",1,1,"buy","Silver","10oz Copper",103],
["ItemGoldBar","ItemSilverBar10oz",1,3,"buy","10oz Silver","Gold",102],
["ItemSilverBar10oz","ItemGoldBar",3,1,"buy","Gold","10oz Silver",101]
],
"neutral"
]; ];
// High end Weapons // High end Weapons
@@ -79,7 +66,7 @@ menu_Woodlander2 = [
// Car Parts // Car Parts
menu_TK_CIV_Takistani03_EP1 = [ menu_TK_CIV_Takistani03_EP1 = [
[["Vehicle Parts",2121],["Building Supplies",2222]], [["Vehicle Parts",102121],["Building Supplies",102222]],
[], [],
"friendly" "friendly"
]; ];
@@ -96,7 +83,7 @@ menu_TK_CIV_Takistani04_EP1 = [
"friendly" "friendly"
]; ];
menu_TK_CIV_Woman03_EP1 = [ menu_TK_CIV_Woman03_EP1 = [
[["Food and Drinks",1515151],["Backpacks",1525252],["Toolbelt Items",1535353],["Clothes",1545454]], [["Food and Drinks",100055],["Backpacks",100056],["Toolbelt Items",100057],["Clothes",100058]],
[ [
["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101] ["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]
], ],
@@ -116,6 +103,13 @@ menu_RU_Profiteer2 = [
[], [],
"friendly" "friendly"
]; ];
// Car Parts
menu_TK_CIV_Takistani02_EP1 = [
[["Vehicle Parts",2122],["Building Supplies",2223]],
[],
"friendly"
];
menu_RU_Damsel4 = [ menu_RU_Damsel4 = [
[["Food and Drinks",105151],["Backpacks",105252],["Toolbelt Items",105353],["Clothes",105454]], [["Food and Drinks",105151],["Backpacks",105252],["Toolbelt Items",105353],["Clothes",105454]],
[ [

View File

@@ -41,6 +41,7 @@ AllowedVehiclesList = [
["SUV_Orange",1], ["SUV_Orange",1],
["SUV_Charcoal",1], ["SUV_Charcoal",1],
["SUV_Blue",1], ["SUV_Blue",1],
["ArmoredSUV_PMC_DZ",2]
["UH1H_DZ",2], ["UH1H_DZ",2],
["Mi17_Civilian_DZ",3], ["Mi17_Civilian_DZ",3],
["Mi17_DZ",1], ["Mi17_DZ",1],

View File

@@ -111,23 +111,9 @@ menu_Doctor = [
// Metals Traders // Metals Traders
menu_RU_Functionary1 = [ menu_RU_Functionary1 = [
[["Vaults",411]], [["Clothes",411]],
[ [],
"hero"
["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,1,"buy","10oz Copper","Silver",104],
["ItemCopperBar10oz","ItemSilverBar",1,1,"buy","Silver","10oz Copper",103],
["ItemGoldBar","ItemSilverBar10oz",1,3,"buy","10oz Silver","Gold",102],
["ItemSilverBar10oz","ItemGoldBar",3,1,"buy","Gold","10oz Silver",101]
],
"neutral"
]; ];
// Boat Traders // Boat Traders

View File

@@ -583,7 +583,7 @@ class _unit_12
objectType="unit"; objectType="unit";
class Arguments class Arguments
{ {
POSITION="[5085.2588, 3327.2937]"; POSITION="[9302.1982, 9981.0977]";
GROUP="_group_0"; GROUP="_group_0";
TYPE="BAF_Soldier_AA_DDPM"; TYPE="BAF_Soldier_AA_DDPM";
AZIMUT="-1.9901382"; AZIMUT="-1.9901382";
@@ -925,7 +925,7 @@ class _vehicle_623
objectType="vehicle"; objectType="vehicle";
class Arguments class Arguments
{ {
POSITION="[472.86752, 5530.7593, -0.13926697]"; POSITION="[474.27603, 5531.0093, -0.13926697]";
TYPE="UH1Wreck"; TYPE="UH1Wreck";
PARENT=""; PARENT="";
}; };
@@ -1109,26 +1109,6 @@ class _vehicle_664
PARENT=""; PARENT="";
}; };
}; };
class _vehicle_666
{
objectType="vehicle";
class Arguments
{
POSITION="[450.67926, 5584.9604, -3.0517578e-005]";
TYPE="HeliHCivil";
PARENT="";
};
};
class _vehicle_667
{
objectType="vehicle";
class Arguments
{
POSITION="[455.12183, 5570.9292, 3.0517578e-005]";
TYPE="HeliH";
PARENT="";
};
};
class _vehicle_676 class _vehicle_676
{ {
objectType="vehicle"; objectType="vehicle";
@@ -2401,16 +2381,6 @@ class _vehicle_929
PARENT=""; PARENT="";
}; };
}; };
class _vehicle_930
{
objectType="vehicle";
class Arguments
{
POSITION="[9396.0107, 3316.1897, 3.0517578e-005]";
TYPE="HeliHCivil";
PARENT="";
};
};
class _vehicle_932 class _vehicle_932
{ {
objectType="vehicle"; objectType="vehicle";
@@ -2454,6 +2424,7 @@ class _unit_57
AZIMUT="44.32386"; AZIMUT="44.32386";
INIT="this allowDammage false;this disableAI 'FSM';this disableAI 'MOVE';"; INIT="this allowDammage false;this disableAI 'FSM';this disableAI 'MOVE';";
SKILL="0.60000002"; SKILL="0.60000002";
PLAYER="true";
}; };
}; };
class _vehicle_937 class _vehicle_937
@@ -2466,6 +2437,288 @@ class _vehicle_937
PARENT=""; PARENT="";
}; };
}; };
class _unit_58
{
objectType="unit";
class Arguments
{
POSITION="[7833.1255, 5593.6997, 0]";
GROUP="_group_0";
TYPE="US_Soldier_AA_EP1";
SKILL="0.60000002";
PLAYER="true";
LEADER="true";
};
};
class _vehicle_939
{
objectType="vehicle";
class Arguments
{
POSITION="[7849.8271, 5573.9502]";
TYPE="FoldTable";
AZIMUT="-38.440014";
PARENT="";
};
};
class _vehicle_940
{
objectType="vehicle";
class Arguments
{
POSITION="[7851.1597, 5572.7661, -3.0517578e-005]";
TYPE="FoldChair";
AZIMUT="183.78395";
PARENT="";
};
};
class _vehicle_941
{
objectType="vehicle";
class Arguments
{
POSITION="[7850.7808, 5572.0874, -3.0517578e-005]";
TYPE="Land_Canister_EP1";
AZIMUT="-3.1480756";
PARENT="";
};
};
class _vehicle_942
{
objectType="vehicle";
class Arguments
{
POSITION="[7830.873, 5639.7705, -0.24955584]";
TYPE="Land_Misc_Well_L_EP1";
AZIMUT="102.9458";
PARENT="";
};
};
class _vehicle_943
{
objectType="vehicle";
class Arguments
{
POSITION="[7848.1143, 5571.1289]";
TYPE="Land_CamoNet_NATO_EP1";
AZIMUT="153.31274";
PARENT="";
};
};
class _vehicle_944
{
objectType="vehicle";
class Arguments
{
POSITION="[7848.3442, 5569.7837, -0.00012207031]";
TYPE="Misc_cargo_cont_net1";
AZIMUT="-29.156359";
PARENT="";
};
};
class _vehicle_945
{
objectType="vehicle";
class Arguments
{
POSITION="[7856.9189, 5581.5786, 3.0517578e-005]";
TYPE="Sign_Direction_EP1";
AZIMUT="283.91022";
PARENT="";
};
};
class _vehicle_946
{
objectType="vehicle";
class Arguments
{
POSITION="[7849.2427, 5570.0947, -6.1035156e-005]";
TYPE="RoadCone";
PARENT="";
};
};
class _vehicle_948
{
objectType="vehicle";
class Arguments
{
POSITION="[7848.9595, 5570.8271, 0]";
TYPE="RoadCone";
PARENT="";
};
};
class _vehicle_950
{
objectType="vehicle";
class Arguments
{
POSITION="[7849.3345, 5570.5083, -0.00012207031]";
TYPE="RoadCone";
PARENT="";
};
};
class _vehicle_953
{
objectType="vehicle";
class Arguments
{
POSITION="[7817.1982, 5606.8809, -3.0517578e-005]";
TYPE="Land_Fire_barrel";
PARENT="";
};
};
class _unit_59
{
objectType="unit";
class Arguments
{
POSITION="[7850.1875, 5573.4512, 0.22677676]";
GROUP="_group_2";
TYPE="TK_CIV_Takistani02_EP1";
AZIMUT="-44.618198";
INIT="this allowDammage false;this disableAI 'FSM';this disableAI 'MOVE';";
SKILL="0.60000002";
};
};
class _vehicle_954
{
objectType="vehicle";
class Arguments
{
POSITION="[7847.3687, 5571.292, -9.1552734e-005]";
TYPE="Misc_palletsfoiled";
AZIMUT="57.436001";
PARENT="";
};
};
class _vehicle_955
{
objectType="vehicle";
class Arguments
{
POSITION="[7844.251, 5570.5874, -3.0517578e-005]";
TYPE="Misc_palletsfoiled_heap";
AZIMUT="147.25204";
PARENT="";
};
};
class _vehicle_956
{
objectType="vehicle";
class Arguments
{
POSITION="[7853.4834, 5577.1143, -0.34381306]";
TYPE="Land_Misc_GContainer_Big";
AZIMUT="47.433353";
PARENT="";
};
};
class _vehicle_957
{
objectType="vehicle";
class Arguments
{
POSITION="[7846.2603, 5572.0957, -0.091502532]";
TYPE="Paleta2";
AZIMUT="40.225201";
PARENT="";
};
};
class _vehicle_958
{
objectType="vehicle";
class Arguments
{
POSITION="[433.34042, 5582.8208, -3.0517578e-005]";
TYPE="Land_Fire_barrel";
PARENT="";
};
};
class _vehicle_959
{
objectType="vehicle";
class Arguments
{
POSITION="[411.64804, 5531.2388, -0.27032107]";
TYPE="Land_Ind_TankSmall";
AZIMUT="23.631126";
PARENT="";
};
};
class _vehicle_960
{
objectType="vehicle";
class Arguments
{
POSITION="[464.64966, 5538.3481, -3.0517578e-005]";
TYPE="ClutterCutter_small_EP1";
PARENT="";
};
};
class _vehicle_961
{
objectType="vehicle";
class Arguments
{
POSITION="[5592.0718, 8956.5557, -7.6293945e-006]";
TYPE="Land_Ind_TankSmall";
AZIMUT="78.819687";
PARENT="";
};
};
class _vehicle_962
{
objectType="vehicle";
class Arguments
{
POSITION="[8242.8818, 7815.2549, -0.28311342]";
TYPE="Land_Ind_TankSmall";
AZIMUT="-134.71858";
PARENT="";
};
};
class _vehicle_963
{
objectType="vehicle";
class Arguments
{
POSITION="[6497.5806, 2089.6509, -0.28502855]";
TYPE="Land_Ind_TankSmall";
AZIMUT="3.8481729";
PARENT="";
};
};
class _vehicle_964
{
objectType="vehicle";
class Arguments
{
POSITION="[9321.0664, 10065.901, -0.078782141]";
TYPE="Land_Ind_TankSmall";
AZIMUT="28.099548";
PARENT="";
};
};
class _vehicle_968
{
objectType="vehicle";
class Arguments
{
POSITION="[7821.6479, 5578.4971, 3.0517578e-005]";
TYPE="HeliHCivil";
PARENT="";
};
};
class _vehicle_972
{
objectType="vehicle";
class Arguments
{
POSITION="[454.65253, 5569.8379, 9.1552734e-005]";
TYPE="HeliHCivil";
PARENT="";
};
};
class _postfix_0 class _postfix_0
{ {
objectType="postfix"; objectType="postfix";

View File

@@ -459,7 +459,7 @@ if (true) then
_unit_12 = objNull; _unit_12 = objNull;
if (true) then if (true) then
{ {
_this = _group_0 createUnit ["BAF_Soldier_AA_DDPM", [5085.2588, 3327.2937], [], 0, "CAN_COLLIDE"]; _this = _group_0 createUnit ["BAF_Soldier_AA_DDPM", [9302.1982, 9981.0977], [], 0, "CAN_COLLIDE"];
_unit_12 = _this; _unit_12 = _this;
_this setDir -1.9901382; _this setDir -1.9901382;
_this setUnitAbility 0.60000002; _this setUnitAbility 0.60000002;
@@ -739,9 +739,9 @@ if (true) then
_vehicle_623 = objNull; _vehicle_623 = objNull;
if (true) then if (true) then
{ {
_this = createVehicle ["UH1Wreck", [472.86752, 5530.7593, -0.13926697], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["UH1Wreck", [474.27603, 5531.0093, -0.13926697], [], 0, "CAN_COLLIDE"];
_vehicle_623 = _this; _vehicle_623 = _this;
_this setPos [472.86752, 5530.7593, -0.13926697]; _this setPos [474.27603, 5531.0093, -0.13926697];
}; };
_unit_32 = objNull; _unit_32 = objNull;
@@ -890,22 +890,6 @@ if (true) then
_this setPos [463.8385, 5526.502, 6.1035156e-005]; _this setPos [463.8385, 5526.502, 6.1035156e-005];
}; };
_vehicle_666 = objNull;
if (true) then
{
_this = createVehicle ["HeliHCivil", [450.67926, 5584.9604, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_666 = _this;
_this setPos [450.67926, 5584.9604, -3.0517578e-005];
};
_vehicle_667 = objNull;
if (true) then
{
_this = createVehicle ["HeliH", [455.12183, 5570.9292, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_667 = _this;
_this setPos [455.12183, 5570.9292, 3.0517578e-005];
};
_vehicle_676 = objNull; _vehicle_676 = objNull;
if (true) then if (true) then
{ {
@@ -1948,14 +1932,6 @@ if (true) then
_this setPos [9416.04, 3284.8745, -0.053924561]; _this setPos [9416.04, 3284.8745, -0.053924561];
}; };
_vehicle_930 = objNull;
if (true) then
{
_this = createVehicle ["HeliHCivil", [9396.0107, 3316.1897, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_930 = _this;
_this setPos [9396.0107, 3316.1897, 3.0517578e-005];
};
_vehicle_932 = objNull; _vehicle_932 = objNull;
if (true) then if (true) then
{ {
@@ -1991,6 +1967,7 @@ if (true) then
_this setVehicleInit "this allowDammage false;this disableAI 'FSM';this disableAI 'MOVE';"; _this setVehicleInit "this allowDammage false;this disableAI 'FSM';this disableAI 'MOVE';";
_this setUnitAbility 0.60000002; _this setUnitAbility 0.60000002;
if (false) then {_group_2 selectLeader _this;}; if (false) then {_group_2 selectLeader _this;};
if (true) then {selectPlayer _this;};
}; };
_vehicle_937 = objNull; _vehicle_937 = objNull;
@@ -2001,6 +1978,235 @@ if (true) then
_this setPos [7844.7007, 5600.2061, -0.00012207031]; _this setPos [7844.7007, 5600.2061, -0.00012207031];
}; };
_unit_58 = objNull;
if (true) then
{
_this = _group_0 createUnit ["US_Soldier_AA_EP1", [7833.1255, 5593.6997, 0], [], 0, "CAN_COLLIDE"];
_unit_58 = _this;
_this setUnitAbility 0.60000002;
if (true) then {_group_0 selectLeader _this;};
if (true) then {selectPlayer _this;};
};
_vehicle_939 = objNull;
if (true) then
{
_this = createVehicle ["FoldTable", [7849.8271, 5573.9502], [], 0, "CAN_COLLIDE"];
_vehicle_939 = _this;
_this setDir -38.440014;
_this setPos [7849.8271, 5573.9502];
};
_vehicle_940 = objNull;
if (true) then
{
_this = createVehicle ["FoldChair", [7851.1597, 5572.7661, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_940 = _this;
_this setDir 183.78395;
_this setPos [7851.1597, 5572.7661, -3.0517578e-005];
};
_vehicle_941 = objNull;
if (true) then
{
_this = createVehicle ["Land_Canister_EP1", [7850.7808, 5572.0874, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_941 = _this;
_this setDir -3.1480756;
_this setPos [7850.7808, 5572.0874, -3.0517578e-005];
};
_vehicle_942 = objNull;
if (true) then
{
_this = createVehicle ["Land_Misc_Well_L_EP1", [7830.873, 5639.7705, -0.24955584], [], 0, "CAN_COLLIDE"];
_vehicle_942 = _this;
_this setDir 102.9458;
_this setPos [7830.873, 5639.7705, -0.24955584];
};
_vehicle_943 = objNull;
if (true) then
{
_this = createVehicle ["Land_CamoNet_NATO_EP1", [7848.1143, 5571.1289], [], 0, "CAN_COLLIDE"];
_vehicle_943 = _this;
_this setDir 153.31274;
_this setPos [7848.1143, 5571.1289];
};
_vehicle_944 = objNull;
if (true) then
{
_this = createVehicle ["Misc_cargo_cont_net1", [7848.3442, 5569.7837, -0.00012207031], [], 0, "CAN_COLLIDE"];
_vehicle_944 = _this;
_this setDir -29.156359;
_this setPos [7848.3442, 5569.7837, -0.00012207031];
};
_vehicle_945 = objNull;
if (true) then
{
_this = createVehicle ["Sign_Direction_EP1", [7856.9189, 5581.5786, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_945 = _this;
_this setDir 283.91022;
_this setPos [7856.9189, 5581.5786, 3.0517578e-005];
};
_vehicle_946 = objNull;
if (true) then
{
_this = createVehicle ["RoadCone", [7849.2427, 5570.0947, -6.1035156e-005], [], 0, "CAN_COLLIDE"];
_vehicle_946 = _this;
_this setPos [7849.2427, 5570.0947, -6.1035156e-005];
};
_vehicle_948 = objNull;
if (true) then
{
_this = createVehicle ["RoadCone", [7848.9595, 5570.8271, 0], [], 0, "CAN_COLLIDE"];
_vehicle_948 = _this;
_this setPos [7848.9595, 5570.8271, 0];
};
_vehicle_950 = objNull;
if (true) then
{
_this = createVehicle ["RoadCone", [7849.3345, 5570.5083, -0.00012207031], [], 0, "CAN_COLLIDE"];
_vehicle_950 = _this;
_this setPos [7849.3345, 5570.5083, -0.00012207031];
};
_vehicle_953 = objNull;
if (true) then
{
_this = createVehicle ["Land_Fire_barrel", [7817.1982, 5606.8809, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_953 = _this;
_this setPos [7817.1982, 5606.8809, -3.0517578e-005];
};
_unit_59 = objNull;
if (true) then
{
_this = _group_2 createUnit ["TK_CIV_Takistani02_EP1", [7850.1875, 5573.4512, 0.22677676], [], 0, "CAN_COLLIDE"];
_unit_59 = _this;
_this setDir -44.618198;
_this setVehicleInit "this allowDammage false;this disableAI 'FSM';this disableAI 'MOVE';";
_this setUnitAbility 0.60000002;
if (false) then {_group_2 selectLeader _this;};
};
_vehicle_954 = objNull;
if (true) then
{
_this = createVehicle ["Misc_palletsfoiled", [7847.3687, 5571.292, -9.1552734e-005], [], 0, "CAN_COLLIDE"];
_vehicle_954 = _this;
_this setDir 57.436001;
_this setPos [7847.3687, 5571.292, -9.1552734e-005];
};
_vehicle_955 = objNull;
if (true) then
{
_this = createVehicle ["Misc_palletsfoiled_heap", [7844.251, 5570.5874, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_955 = _this;
_this setDir 147.25204;
_this setPos [7844.251, 5570.5874, -3.0517578e-005];
};
_vehicle_956 = objNull;
if (true) then
{
_this = createVehicle ["Land_Misc_GContainer_Big", [7853.4834, 5577.1143, -0.34381306], [], 0, "CAN_COLLIDE"];
_vehicle_956 = _this;
_this setDir 47.433353;
_this setPos [7853.4834, 5577.1143, -0.34381306];
};
_vehicle_957 = objNull;
if (true) then
{
_this = createVehicle ["Paleta2", [7846.2603, 5572.0957, -0.091502532], [], 0, "CAN_COLLIDE"];
_vehicle_957 = _this;
_this setDir 40.225201;
_this setPos [7846.2603, 5572.0957, -0.091502532];
};
_vehicle_958 = objNull;
if (true) then
{
_this = createVehicle ["Land_Fire_barrel", [433.34042, 5582.8208, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_958 = _this;
_this setPos [433.34042, 5582.8208, -3.0517578e-005];
};
_vehicle_959 = objNull;
if (true) then
{
_this = createVehicle ["Land_Ind_TankSmall", [411.64804, 5531.2388, -0.27032107], [], 0, "CAN_COLLIDE"];
_vehicle_959 = _this;
_this setDir 23.631126;
_this setPos [411.64804, 5531.2388, -0.27032107];
};
_vehicle_960 = objNull;
if (true) then
{
_this = createVehicle ["ClutterCutter_small_EP1", [464.64966, 5538.3481, -3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_960 = _this;
_this setPos [464.64966, 5538.3481, -3.0517578e-005];
};
_vehicle_961 = objNull;
if (true) then
{
_this = createVehicle ["Land_Ind_TankSmall", [5592.0718, 8956.5557, -7.6293945e-006], [], 0, "CAN_COLLIDE"];
_vehicle_961 = _this;
_this setDir 78.819687;
_this setPos [5592.0718, 8956.5557, -7.6293945e-006];
};
_vehicle_962 = objNull;
if (true) then
{
_this = createVehicle ["Land_Ind_TankSmall", [8242.8818, 7815.2549, -0.28311342], [], 0, "CAN_COLLIDE"];
_vehicle_962 = _this;
_this setDir -134.71858;
_this setPos [8242.8818, 7815.2549, -0.28311342];
};
_vehicle_963 = objNull;
if (true) then
{
_this = createVehicle ["Land_Ind_TankSmall", [6497.5806, 2089.6509, -0.28502855], [], 0, "CAN_COLLIDE"];
_vehicle_963 = _this;
_this setDir 3.8481729;
_this setPos [6497.5806, 2089.6509, -0.28502855];
};
_vehicle_964 = objNull;
if (true) then
{
_this = createVehicle ["Land_Ind_TankSmall", [9321.0664, 10065.901, -0.078782141], [], 0, "CAN_COLLIDE"];
_vehicle_964 = _this;
_this setDir 28.099548;
_this setPos [9321.0664, 10065.901, -0.078782141];
};
_vehicle_968 = objNull;
if (true) then
{
_this = createVehicle ["HeliHCivil", [7821.6479, 5578.4971, 3.0517578e-005], [], 0, "CAN_COLLIDE"];
_vehicle_968 = _this;
_this setPos [7821.6479, 5578.4971, 3.0517578e-005];
};
_vehicle_972 = objNull;
if (true) then
{
_this = createVehicle ["HeliHCivil", [454.65253, 5569.8379, 9.1552734e-005], [], 0, "CAN_COLLIDE"];
_vehicle_972 = _this;
_this setPos [454.65253, 5569.8379, 9.1552734e-005];
};
processInitCommands; processInitCommands;
runInitScript; runInitScript;
finishMissionInit; finishMissionInit;

View File

@@ -4,6 +4,9 @@
*/ */
private["_onLadder","_canDo","_recipe_ItemTinBar","_recipe_ItemAluminumBar","_recipe_ItemBronzeBar","_recipe_ItemGoldBar10oz","_recipe_ItemGoldBar","_recipe_FoodChickenNoodle","_recipe_FoodBeefBakedBeans","_item","_config","_create","_selectedRecipe","_recipe_","_selectedRecipeOutput","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_itemOut","_countOut"]; private["_onLadder","_canDo","_recipe_ItemTinBar","_recipe_ItemAluminumBar","_recipe_ItemBronzeBar","_recipe_ItemGoldBar10oz","_recipe_ItemGoldBar","_recipe_FoodChickenNoodle","_recipe_FoodBeefBakedBeans","_item","_config","_create","_selectedRecipe","_recipe_","_selectedRecipeOutput","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_itemOut","_countOut"];
if(TradeInprogress) exitWith { cutText ["Crafting already in progress." , "PLAIN DOWN"]; };
TradeInprogress = true;
// Recipes // Recipes
// 6 Tin cans = Tin Bar // 6 Tin cans = Tin Bar
@@ -171,11 +174,17 @@ if (inflamed cursorTarget and _canDo) then {
} forEach _selectedRecipeOutput; } forEach _selectedRecipeOutput;
// get display name
_textCreate = getText(configFile >> "CfgMagazines" >> _create >> "displayName");
// Add crafted item // Add crafted item
cutText [format["Crafted Item: %1",_create], "PLAIN DOWN"]; cutText [format["Crafted Item: %1 x %2",_textCreate,_countOut], "PLAIN DOWN"];
} else { } else {
cutText [format["Missing component: %1 x %2",_missing,_missingQty], "PLAIN DOWN"]; _textMissing = getText(configFile >> "CfgMagazines" >> _missing >> "displayName");
cutText [format["Missing component: %1 x %2",_textMissing,_missingQty], "PLAIN DOWN"];
}; };
} else { } else {
cutText ["Crafting needs a fire", "PLAIN DOWN"]; cutText ["Crafting needs a fire", "PLAIN DOWN"];
}; };
TradeInprogress = false;

View File

@@ -16,7 +16,7 @@ _rfriendlies = _target getVariable ["friendlies", []];
if (!(_callerID in _rfriendlies)) then { if (!(_callerID in _rfriendlies)) then {
// caller // caller
titleText [format["You have tagged %1 as friendly. Waiting for %1 to accept that.",(name _target)], "PLAIN DOWN"]; titleText [format["You have tagged %1 as friendly. Waiting for %1 to accept.",(name _target)], "PLAIN DOWN"];
// target // target
[_caller,_target,"loc",rTITLETEXT,format["%1 wants to tag you as friendly. To accept, tag %1 as friendly.", (name _caller)],"PLAIN DOWN"] call RE; [_caller,_target,"loc",rTITLETEXT,format["%1 wants to tag you as friendly. To accept, tag %1 as friendly.", (name _caller)],"PLAIN DOWN"] call RE;
}; };

View File

@@ -15,7 +15,7 @@ _textPartIn = (_this select 3) select 5;
_textPartOut = (_this select 3) select 6; _textPartOut = (_this select 3) select 6;
//_traderID = (_this select 3) select 7; //_traderID = (_this select 3) select 7;
_counter = 0;
_success = false; _success = false;
_failed = false; _failed = false;
@@ -39,37 +39,38 @@ if (_qty >= _qty_in) then {
player removeMagazine _part_in; player removeMagazine _part_in;
}; };
_counter = 0;
// check for space if buying and do not check if selling // check for space if buying and do not check if selling
for "_x" from 1 to _qty_out do { for "_x" from 1 to _qty_out do {
if(_buy_o_sell == "buy") then { if(_buy_o_sell == "buy") then {
_isOk = [player,_part_out] call BIS_fnc_invAdd; _isOk = [player,_part_out] call BIS_fnc_invAdd;
if (!_isOk) exitWith { _failed = true; }; if (_isOk) then {
_counter = _counter + 1; _counter = _counter + 1;
};
if (!_isOk) exitWith { _failed = true; };
} else { } else {
player addMagazine _part_out; player addMagazine _part_out;
}; };
}; };
// revert trade since it failed // revert trade since it failed
if(_failed) then { if(!_failed) then {
// add back currency _total_in = _total_in + _qty_in;
_total_out = _total_out + _qty_out;
} else {
// Return currency
for "_x" from 1 to _qty_in do { for "_x" from 1 to _qty_in do {
player addMagazine _part_in; player addMagazine _part_in;
}; };
// remove partial trade
for "_x" from 1 to _counter do { for "_x" from 1 to _counter do {
player removeMagazine _part_out; player removeMagazine _part_out;
}; };
cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"];
} else {
_total_in = _total_in + _qty_in;
_total_out = _total_out + _qty_out;
_success = true;
}; };
if (_failed) exitWith {};
}; };
if(_success) then { if(_total_out > 0) then {
cutText [format[("Traded %1 %2 for %3 %4"),_total_in,_textPartIn,_total_out,_textPartOut], "PLAIN DOWN"]; cutText [format[("Traded %1 %2 for %3 %4"),_total_in,_textPartIn,_total_out,_textPartOut], "PLAIN DOWN"];
}; };

View File

@@ -0,0 +1,32 @@
private["_none"];
{player removeAction _x} forEach s_player_parts;s_player_parts = [];
s_player_parts_crtl = 1;
_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,1,"buy","10oz Copper","Silver",104],
["ItemCopperBar10oz","ItemSilverBar",1,1,"buy","Silver","10oz Copper",103],
["ItemGoldBar","ItemSilverBar10oz",1,3,"buy","10oz Silver","Gold",102],
["ItemSilverBar10oz","ItemGoldBar",3,1,"buy","Gold","10oz Silver",101]
];
// Static Menu
{
diag_log format["DEBUG TRADER: %1", _x];
_buy = player addAction [format["Trade %1 %2 for %3 %4",(_x select 3),(_x select 5),(_x select 2),(_x select 6)], "\z\addons\dayz_code\actions\trade_items_wo_db.sqf",[(_x select 0),(_x select 1),(_x select 2),(_x select 3),(_x select 4),(_x select 5),(_x select 6)], (_x select 7), true, true, "",""];
s_player_parts set [count s_player_parts,_buy];
} forEach _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];

View File

@@ -135,12 +135,12 @@ if(!_cancel) then {
["dayzPublishObj",[dayz_playerUID,_tent,[_dir,_location],"VaultStorageLocked"]] call callRpcProcedure; ["dayzPublishObj",[dayz_playerUID,_tent,[_dir,_location],"VaultStorageLocked"]] call callRpcProcedure;
cutText ["You have setup your vault", "PLAIN DOWN"]; cutText ["You have setup your Safe", "PLAIN DOWN"];
} else { } else {
cutText ["You cannot place a Vault here. The area must be flat, and free of other objects", "PLAIN DOWN"]; cutText ["You cannot place a Safe here. The area must be flat, and free of other objects", "PLAIN DOWN"];
}; };
} else { } else {
cutText ["Canceled construction of vault.", "PLAIN DOWN"]; cutText ["Canceled construction of Safe.", "PLAIN DOWN"];
}; };

View File

@@ -269,6 +269,17 @@ class Citizen1; // External class reference
transportmaxbackpacks = 2; transportmaxbackpacks = 2;
class Turrets {}; class Turrets {};
}; };
class ArmoredSUV_Base_PMC;
class ArmoredSUV_PMC_DZ : ArmoredSUV_Base_PMC {
scope = 2;
side = 2;
faction = "PMC_BAF";
crew = "";
typicalCargo[] = {};
transportMaxWeapons = 20;
transportMaxMagazines = 400;
transportmaxbackpacks = 10;
};
class HMMWV_Base; class HMMWV_Base;
class HMMWV_DZ: HMMWV_Base { class HMMWV_DZ: HMMWV_Base {
accuracy = 0.32; accuracy = 0.32;

View File

@@ -236,7 +236,7 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 6))
//Allow owner to unlock vault //Allow owner to unlock vault
if(cursorTarget isKindOf "VaultStorageLocked" and _canDo and _ownerID != "0" and _ownerID == dayz_playerUID and !UnlockInprogress) then { if(cursorTarget isKindOf "VaultStorageLocked" and _canDo and _ownerID != "0" and _ownerID == dayz_playerUID and !UnlockInprogress) then {
if (s_player_unlockvault < 0 and (player distance cursorTarget < 3)) then { if (s_player_unlockvault < 0 and (player distance cursorTarget < 3)) then {
s_player_unlockvault = player addAction ["Unlock Vault", "\z\addons\dayz_code\actions\vault_unlock.sqf",cursorTarget, 0, false, true, "",""]; s_player_unlockvault = player addAction ["Unlock Safe", "\z\addons\dayz_code\actions\vault_unlock.sqf",cursorTarget, 0, false, true, "",""];
}; };
} else { } else {
player removeAction s_player_unlockvault; player removeAction s_player_unlockvault;
@@ -247,10 +247,10 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 6))
if(cursorTarget isKindOf "VaultStorage" and _canDo and _ownerID != "0" and _ownerID == dayz_playerUID and (player distance cursorTarget < 3)) then { if(cursorTarget isKindOf "VaultStorage" and _canDo and _ownerID != "0" and _ownerID == dayz_playerUID and (player distance cursorTarget < 3)) then {
if (s_player_lockvault < 0) then { if (s_player_lockvault < 0) then {
s_player_lockvault = player addAction ["Lock Vault", "\z\addons\dayz_code\actions\vault_lock.sqf",cursorTarget, 0, false, true, "",""]; s_player_lockvault = player addAction ["Lock Safe", "\z\addons\dayz_code\actions\vault_lock.sqf",cursorTarget, 0, false, true, "",""];
}; };
if (s_player_packvault < 0) then { if (s_player_packvault < 0) then {
s_player_packvault = player addAction ["<t color='#ff0000'>Pack Vault</t>", "\z\addons\dayz_code\actions\vault_pack.sqf",cursorTarget, 0, false, true, "",""]; s_player_packvault = player addAction ["<t color='#ff0000'>Pack Safe</t>", "\z\addons\dayz_code\actions\vault_pack.sqf",cursorTarget, 0, false, true, "",""];
}; };
} else { } else {
player removeAction s_player_packvault; player removeAction s_player_packvault;
@@ -342,6 +342,12 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 6))
_humanity_logic = true; _humanity_logic = true;
}; };
}; };
if((_traderMenu select 2) == "hero") then {
_low_high = "low";
if (_humanity < 5000) then {
_humanity_logic = true;
};
};
if(_humanity_logic) then { if(_humanity_logic) then {
_cancel = player addAction ["Your humanity is too " + _low_high + " this trader refuses to talk to you.", "\z\addons\dayz_code\actions\trade_cancel.sqf",["na"], 0, true, false, "",""]; _cancel = player addAction ["Your humanity is too " + _low_high + " this trader refuses to talk to you.", "\z\addons\dayz_code\actions\trade_cancel.sqf",["na"], 0, true, false, "",""];
s_player_parts set [count s_player_parts,_cancel]; s_player_parts set [count s_player_parts,_cancel];
@@ -361,7 +367,8 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 6))
} forEach (_traderMenu select 0); } forEach (_traderMenu select 0);
// Add static metals trader options under sub menu // Add static metals trader options under sub menu
_metals_trader = player addAction ["Trade Metals", "\z\addons\dayz_code\actions\trade_metals.sqf",["na"], 0, true, false, "",""];
s_player_parts set [count s_player_parts,_metals_trader];
}; };

View File

@@ -14,7 +14,7 @@ s_player_lockvault = -1;
if(_ownerID == dayz_playerUID) then { if(_ownerID == dayz_playerUID) then {
_alreadyPacking = _obj getVariable["packing",0]; _alreadyPacking = _obj getVariable["packing",0];
if (_alreadyPacking == 1) exitWith {cutText ["That vault is already being locked." , "PLAIN DOWN"]}; if (_alreadyPacking == 1) exitWith {cutText ["That Safe is already being locked." , "PLAIN DOWN"]};
_obj setVariable["packing",1]; _obj setVariable["packing",1];
@@ -53,7 +53,7 @@ if(_ownerID == dayz_playerUID) then {
_holder setVariable ["BackpackCargo", _backpacks, true]; _holder setVariable ["BackpackCargo", _backpacks, true];
}; };
cutText ["Your vault has been locked", "PLAIN DOWN"]; cutText ["Your Safe has been locked", "PLAIN DOWN"];
} else { } else {
cutText ["You cannot lock this vault, it is not yours", "PLAIN DOWN"]; cutText ["You cannot lock this Safe, it is not yours", "PLAIN DOWN"];
}; };

View File

@@ -12,17 +12,17 @@ s_player_packvault = 1;
if(_ownerID == dayz_playerUID) then { if(_ownerID == dayz_playerUID) then {
_alreadyPacking = _obj getVariable["packing",0]; _alreadyPacking = _obj getVariable["packing",0];
if (_alreadyPacking == 1) exitWith {cutText ["That vault is already being packed." , "PLAIN DOWN"]}; if (_alreadyPacking == 1) exitWith {cutText ["That Safe is already being packed." , "PLAIN DOWN"]};
_obj setVariable["packing",1]; _obj setVariable["packing",1];
cutText ["Packing vault move from this position to cancel within 5 seconds.", "PLAIN DOWN"]; cutText ["Packing Safe move from this position to cancel within 5 seconds.", "PLAIN DOWN"];
sleep 1; sleep 1;
_location1 = getPosATL player; _location1 = getPosATL player;
sleep 5; sleep 5;
_location2 = getPosATL player; _location2 = getPosATL player;
if(_location1 distance _location2 > 0.1) exitWith { if(_location1 distance _location2 > 0.1) exitWith {
cutText ["Packing vault canceled." , "PLAIN DOWN"] cutText ["Packing Safe canceled." , "PLAIN DOWN"]
}; };
player playActionNow "Medic"; player playActionNow "Medic";
@@ -84,9 +84,9 @@ if(_ownerID == dayz_playerUID) then {
*/ */
cutText ["Your vault has been packed", "PLAIN DOWN"]; cutText ["Your Safe has been packed", "PLAIN DOWN"];
} else { } else {
cutText ["You cannot pack this vault, it is not yours", "PLAIN DOWN"]; cutText ["You cannot pack this Safe, it is not yours", "PLAIN DOWN"];
}; };
s_player_packvault = -1; s_player_packvault = -1;

View File

@@ -16,7 +16,7 @@ UnlockInprogress = true;
if (_ownerID == dayz_playerUID) then { if (_ownerID == dayz_playerUID) then {
_alreadyPacking = _obj getVariable["packing",0]; _alreadyPacking = _obj getVariable["packing",0];
if (_alreadyPacking == 1) exitWith {cutText ["That vault is already being unlocked." , "PLAIN DOWN"]}; if (_alreadyPacking == 1) exitWith {cutText ["That Safe is already being unlocked." , "PLAIN DOWN"]};
_obj setVariable["packing",1]; _obj setVariable["packing",1];
@@ -79,14 +79,14 @@ if (_ownerID == dayz_playerUID) then {
} forEach _objWpnTypes; } forEach _objWpnTypes;
}; };
cutText ["Vault has been unlocked.", "PLAIN DOWN"]; cutText ["Safe has been unlocked.", "PLAIN DOWN"];
} else { } else {
player playActionNow "Medic"; player playActionNow "Medic";
sleep 3; sleep 3;
[player,"repair",0,false] call dayz_zombieSpeak; [player,"repair",0,false] call dayz_zombieSpeak;
null = [player,25,true,(getPosATL player)] spawn player_alertZombies; null = [player,25,true,(getPosATL player)] spawn player_alertZombies;
sleep 5; sleep 5;
cutText ["Combination incorrect, vault is still locked.", "PLAIN DOWN"]; cutText ["Combination incorrect, Safe is still locked.", "PLAIN DOWN"];
}; };
s_player_unlockvault = -1; s_player_unlockvault = -1;

View File

@@ -33,7 +33,7 @@ class CfgMods
hidePicture = 0; hidePicture = 0;
hideName = 0; hideName = 0;
action = "http://www.dayzepoch.com"; action = "http://www.dayzepoch.com";
version = "0.976"; version = "0.977";
hiveVersion = 0.96; //0.93 hiveVersion = 0.96; //0.93
}; };
}; };

View File

@@ -32,8 +32,6 @@ TK_INS_Warlord_EP1_DZ = "TK_INS_Warlord_EP1_DZ";
AllPlayers = ["SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ"]; AllPlayers = ["SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ"];
AllPlayersVehicles = ["SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","AllVehicles"]; AllPlayersVehicles = ["SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","AllVehicles"];
dayz_allowedObjects = ["TentStorage", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ"];
PZombie_VB = "PZombie_VB"; PZombie_VB = "PZombie_VB";

View File

@@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version class DAYZ_Version : CA_Version
{ {
idc = -1; idc = -1;
text = "DayZ Epoch 0.976 (1.7.5.1)"; text = "DayZ Epoch 0.977 (1.7.5.1)";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
}; };
class CA_TitleMainMenu; class CA_TitleMainMenu;

View File

@@ -1403,7 +1403,7 @@ class CfgMagazines
type = 256; type = 256;
displayName = "10oz Gold"; displayName = "10oz Gold";
model = "\dayz_equip\models\gold_bar_10oz.p3d"; model = "\dayz_equip\models\gold_bar_10oz.p3d";
picture = "\dayz_equip\textures\equip_bar_gold_CA.paa"; picture = "\dayz_equip\textures\equip_bar_gold10oz_CA.paa";
descriptionShort = "10oz Gold Bar"; descriptionShort = "10oz Gold Bar";
class ItemActions class ItemActions
{ {
@@ -1442,7 +1442,7 @@ class CfgMagazines
type = 256; type = 256;
displayName = "10oz Silver"; displayName = "10oz Silver";
model = "\dayz_equip\models\silver_bar_10oz.p3d"; model = "\dayz_equip\models\silver_bar_10oz.p3d";
picture = "\dayz_equip\textures\equip_bar_silver_CA.paa"; picture = "\dayz_equip\textures\equip_bar_silver10oz_CA.paa";
descriptionShort = "10oz Silver Bar"; descriptionShort = "10oz Silver Bar";
class ItemActions class ItemActions
{ {
@@ -1481,7 +1481,7 @@ class CfgMagazines
type = 256; type = 256;
displayName = "10oz Copper"; displayName = "10oz Copper";
model = "\dayz_equip\models\copper_bar_10oz.p3d"; model = "\dayz_equip\models\copper_bar_10oz.p3d";
picture = "\dayz_equip\textures\equip_bar_copper_CA.paa"; picture = "\dayz_equip\textures\equip_bar_copper10oz_CA.paa";
descriptionShort = "10oz Copper Bar"; descriptionShort = "10oz Copper Bar";
class ItemActions class ItemActions
{ {
@@ -1729,6 +1729,29 @@ class CfgMagazines
{ {
descriptionShort = "12 x 30Rnd_556x45_StanagSD"; descriptionShort = "12 x 30Rnd_556x45_StanagSD";
}; };
class bulk_ItemSandbag: bulk
{
descriptionShort = "12 x SandBag";
};
class bulk_ItemGPS: bulk
{
descriptionShort = "12 x GPS";
};
class bulk_ItemMap: bulk
{
descriptionShort = "12 x Map";
};
class bulk_ItemEtool: bulk
{
descriptionShort = "12 x E-Tool";
};
class bulk_17Rnd_9x19_glock17: bulk
{
descriptionShort = "12 x 17Rnd_9x19_glock17";
};
class ItemGenerator: CA_Magazine class ItemGenerator: CA_Magazine
{ {
scope = 2; scope = 2;
@@ -1745,15 +1768,15 @@ class CfgMagazines
scope = 2; scope = 2;
count = 1; count = 1;
type = "(256 * 12)"; type = "(256 * 12)";
displayName = "Vault"; displayName = "Safe";
model = "\dayz_equip\models\safe1_onside.p3d"; model = "\dayz_equip\models\safe1_onside.p3d";
picture = "\dayz_equip\textures\equip_safe_ca.paa"; picture = "\dayz_equip\textures\equip_safe_ca.paa";
descriptionShort = "Personal Vault"; descriptionShort = "Personal Safe";
class ItemActions class ItemActions
{ {
class Pitch class Pitch
{ {
text = "Place Vault"; text = "Place Safe";
script = "spawn player_vaultPitch;"; script = "spawn player_vaultPitch;";
}; };
}; };
@@ -2158,7 +2181,7 @@ class CfgVehicles
class WeaponHolder_ItemVault: WeaponHolderBase class WeaponHolder_ItemVault: WeaponHolderBase
{ {
scope = 2; scope = 2;
displayName = "Vault"; displayName = "Safe";
model = "\dayz_equip\models\safe1.p3d"; model = "\dayz_equip\models\safe1.p3d";
class eventHandlers class eventHandlers
{ {
@@ -2311,7 +2334,7 @@ class CfgVehicles
class VaultStorage: Land_A_tent class VaultStorage: Land_A_tent
{ {
vehicleClass = "Survival"; vehicleClass = "Survival";
displayName = "Vault"; displayName = "Safe";
model = "\dayz_equip\models\safe1.p3d"; model = "\dayz_equip\models\safe1.p3d";
destrType = "DestructNo"; destrType = "DestructNo";
armor = 800; armor = 800;
@@ -2322,7 +2345,7 @@ class CfgVehicles
class VaultStorageLocked: Land_A_tent class VaultStorageLocked: Land_A_tent
{ {
vehicleClass = "Survival"; vehicleClass = "Survival";
displayName = "Locked Vault"; displayName = "Locked Safe";
model = "\dayz_equip\models\safe1.p3d"; model = "\dayz_equip\models\safe1.p3d";
destrType = "DestructNo"; destrType = "DestructNo";
armor = 800; armor = 800;

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -24,7 +24,9 @@ _key call server_hiveWrite;
_object setVariable ["ObjectUID", _uid,true]; _object setVariable ["ObjectUID", _uid,true];
if ((typeOf _object) in dayz_allowedObjects) then { _allowedObjects = ["TentStorage", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ"];
if ((typeOf _object) in _allowedObjects) then {
_object addMPEventHandler ["MPKilled",{_this call vehicle_handleServerKilled;}]; _object addMPEventHandler ["MPKilled",{_this call vehicle_handleServerKilled;}];
}; };

View File

@@ -49,7 +49,7 @@ vehicle_handleServerKilled = {
}; };
check_publishobject = { check_publishobject = {
private["_allowed","_object","_playername"]; private["_allowed","_object","_playername","_allowedObjects"];
_object = _this select 0; _object = _this select 0;
_playername = _this select 1; _playername = _this select 1;
@@ -57,8 +57,9 @@ check_publishobject = {
_allowed = false; _allowed = false;
diag_log format ["DEBUG: Checking if Object: %1 is allowed published by %2", _object, _playername]; diag_log format ["DEBUG: Checking if Object: %1 is allowed published by %2", _object, _playername];
_allowedObjects = ["TentStorage", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ"];
if ((typeOf _object) in dayz_allowedObjects) then { if ((typeOf _object) in _allowedObjects) then {
diag_log format ["DEBUG: Object: %1 published by %2 is Safe",_object, _playername]; diag_log format ["DEBUG: Object: %1 published by %2 is Safe",_object, _playername];
_allowed = true; _allowed = true;
}; };

View File

@@ -25,6 +25,8 @@ waitUntil{initialized}; //means all the functions are now defined
diag_log "HIVE: Starting"; diag_log "HIVE: Starting";
_allowedObjects = ["TentStorage", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ"];
//Stream in objects //Stream in objects
/* STREAM OBJECTS */ /* STREAM OBJECTS */
//Send the key //Send the key
@@ -98,7 +100,7 @@ diag_log "HIVE: Starting";
clearWeaponCargoGlobal _object; clearWeaponCargoGlobal _object;
clearMagazineCargoGlobal _object; clearMagazineCargoGlobal _object;
if ((typeOf _object) in dayz_allowedObjects) then { if ((typeOf _object) in _allowedObjects) then {
// Forces object to ground may not be needed // Forces object to ground may not be needed
_pos set [2,0]; _pos set [2,0];
// Must be set to damage buildables // Must be set to damage buildables