diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp index 7ebf2f2e6..02c699d69 100644 --- a/SQF/dayz_code/Configs/cfgVehicles.hpp +++ b/SQF/dayz_code/Configs/cfgVehicles.hpp @@ -57,7 +57,7 @@ class CfgVehicles { class Mi17_DZ: Mi17_base { displayname = "Mi-17"; - displaynameshort = "Mi17_DZ"; + displaynameshort = "Mi17_DZE"; scope = 2; side = 2; crew = ""; @@ -84,6 +84,21 @@ class CfgVehicles { }; }; }; + class Mi17_DZE: Mi17_DZ + { + class Turrets : Turrets + { + class MainTurret : MainTurret + { + magazines[] = {}; + }; + class BackTurret : BackTurret + { + magazines[] = {}; + }; + }; + }; + class Mi17_Civilian; class Mi17_Civilian_DZ: Mi17_Civilian { @@ -154,7 +169,20 @@ class CfgVehicles { }; }; }; - + class UH1Y_DZE: UH1Y_DZ + { + class Turrets : Turrets + { + class MainTurret : MainTurret + { + magazines[] = {}; + }; + class RightDoorGun : RightDoorGun + { + magazines[] = {}; + }; + }; + }; class UH1H_base: Helicopter { class Turrets: Turrets @@ -199,6 +227,20 @@ class CfgVehicles { }; }; }; + class UH1H_DZE: UH1H_DZ + { + class Turrets : Turrets + { + class MainTurret : MainTurret + { + magazines[] = {}; + }; + class LeftDoorGun : LeftDoorGun + { + magazines[] = {}; + }; + }; + }; class AH6_Base_EP1; //class AH6X_EP1: AH6_Base_EP1 {}; class AH6X_DZ: AH6_Base_EP1 diff --git a/SQF/dayz_server/compile/server_publishVehicle2.sqf b/SQF/dayz_server/compile/server_publishVehicle2.sqf index 03e26d154..abc4595a9 100644 --- a/SQF/dayz_server/compile/server_publishVehicle2.sqf +++ b/SQF/dayz_server/compile/server_publishVehicle2.sqf @@ -1,4 +1,4 @@ -private ["_isOK","_object","_worldspace","_location","_dir","_class","_uid","_key","_keySelected","_characterID"]; +private ["_isOK","_object","_worldspace","_location","_dir","_class","_uid","_key","_keySelected","_characterID","_donotusekey"]; _object = _this select 0; _worldspace = _this select 1; @@ -35,8 +35,8 @@ diag_log ("HIVE: WRITE: "+ str(_key)); _key call server_hiveWrite; // Switched to spawn so we can wait a bit for the ID -[_object,_uid,_characterID,_class,_dir,_location] spawn { - private ["_object","_uid","_characterID","_done","_retry","_key","_result","_outcome","_oid","_class","_location","_object_para"]; +[_object,_uid,_characterID,_class,_dir,_location,_donotusekey] spawn { + private ["_object","_uid","_characterID","_done","_retry","_key","_result","_outcome","_oid","_class","_location","_object_para","_donotusekey"]; _object = _this select 0; _uid = _this select 1; @@ -44,6 +44,7 @@ _key call server_hiveWrite; _class = _this select 3; //_dir = _this select 4; _location = _this select 5; + _donotusekey = _this select 6; _done = false; _retry = 0; @@ -90,7 +91,7 @@ _key call server_hiveWrite; clearWeaponCargoGlobal _object; clearMagazineCargoGlobal _object; - _object setVehicleAmmo DZE_vehicleAmmo; + // _object setVehicleAmmo DZE_vehicleAmmo; _object setVariable ["ObjectID", _oid, true]; diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index 6f1750cc4..123da93d2 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -279,7 +279,7 @@ spawn_vehicles = { clearWeaponCargoGlobal _veh; clearMagazineCargoGlobal _veh; - _veh setVehicleAmmo DZE_vehicleAmmo; + // _veh setVehicleAmmo DZE_vehicleAmmo; // Add 0-3 loots to vehicle using random cfgloots _num = floor(random 4); diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index 11fc44e8d..19ee802ce 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -167,7 +167,7 @@ if (isServer and isNil "sm_done") then { clearWeaponCargoGlobal _object; clearMagazineCargoGlobal _object; - _object setVehicleAmmo DZE_vehicleAmmo; + // _object setVehicleAmmo DZE_vehicleAmmo; if ((typeOf _object) in dayz_allowedObjects) then { _object addMPEventHandler ["MPKilled",{_this call object_handleServerKilled;}]; diff --git a/Server Files/Battleye/attachto.txt b/Server Files/Battleye/attachto.txt index aed2414e4..3c182dbae 100644 --- a/Server Files/Battleye/attachto.txt +++ b/Server Files/Battleye/attachto.txt @@ -1,8 +1,8 @@ 1 "" !="VaultStorageLocked" !="LockboxStorageLocked" !="Hedgehog_DZ" !="Sandbag1_DZ" !="Fort_RazorWire" !="WoodGate_DZ" !="Land_HBarrier1_DZ" 5 "Ikarus" -5 "UH1H_DZ" +5 "UH1H_DZE" 5 "Mi17_Civilian_DZ" -5 "Mi17_DZ" +5 "Mi17_DZE" 5 "PBX" 5 "Zodiac" 5 "RHIB" diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/dynamic_vehicle.sqf index 77ad214df..2424ef63d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/dynamic_vehicle.sqf @@ -52,7 +52,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",1], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",1], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -91,8 +91,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/dynamic_vehicle.sqf index 77ad214df..2424ef63d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/dynamic_vehicle.sqf @@ -52,7 +52,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",1], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",1], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -91,8 +91,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/dynamic_vehicle.sqf index 107c54dee..e4b7bc570 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/dynamic_vehicle.sqf @@ -53,7 +53,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",10], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -97,8 +97,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/dynamic_vehicle.sqf index 107c54dee..e4b7bc570 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/dynamic_vehicle.sqf @@ -53,7 +53,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",10], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -97,8 +97,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/dynamic_vehicle.sqf index 107c54dee..e4b7bc570 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/dynamic_vehicle.sqf @@ -53,7 +53,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",10], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -97,8 +97,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/dynamic_vehicle.sqf index 107c54dee..e4b7bc570 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/dynamic_vehicle.sqf @@ -53,7 +53,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",10], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -97,8 +97,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/dynamic_vehicle.sqf index 107c54dee..e4b7bc570 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/dynamic_vehicle.sqf @@ -53,7 +53,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",10], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -97,8 +97,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/dynamic_vehicle.sqf index 107c54dee..e4b7bc570 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/dynamic_vehicle.sqf @@ -53,7 +53,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",10], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -97,8 +97,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_18.Sara/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_18.Sara/dynamic_vehicle.sqf index 107c54dee..e4b7bc570 100644 --- a/Server Files/MPMissions/DayZ_Epoch_18.Sara/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_18.Sara/dynamic_vehicle.sqf @@ -53,7 +53,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",10], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -97,8 +97,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/dynamic_vehicle.sqf index 107c54dee..e4b7bc570 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/dynamic_vehicle.sqf @@ -53,7 +53,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",10], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -97,8 +97,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/dynamic_vehicle.sqf index 107c54dee..e4b7bc570 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/dynamic_vehicle.sqf @@ -53,7 +53,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",10], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -97,8 +97,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/dynamic_vehicle.sqf index 77ad214df..2424ef63d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/dynamic_vehicle.sqf @@ -52,7 +52,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",1], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",1], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -91,8 +91,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/dynamic_vehicle.sqf index 77ad214df..2424ef63d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/dynamic_vehicle.sqf @@ -52,7 +52,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",1], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",1], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -91,8 +91,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/dynamic_vehicle.sqf index 77ad214df..2424ef63d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/dynamic_vehicle.sqf @@ -52,7 +52,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",1], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",1], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -91,8 +91,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/dynamic_vehicle.sqf index 107c54dee..e4b7bc570 100644 --- a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/dynamic_vehicle.sqf @@ -53,7 +53,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",10], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -97,8 +97,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/dynamic_vehicle.sqf index 107c54dee..e4b7bc570 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/dynamic_vehicle.sqf @@ -53,7 +53,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",10], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -97,8 +97,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/dynamic_vehicle.sqf index 77ad214df..2424ef63d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/dynamic_vehicle.sqf @@ -52,7 +52,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",1], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",1], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -91,8 +91,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/dynamic_vehicle.sqf b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/dynamic_vehicle.sqf index 77ad214df..2424ef63d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/dynamic_vehicle.sqf @@ -52,7 +52,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",1], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",1], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -91,8 +91,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/TEMPLATE/dynamic_vehicle.sqf b/Server Files/MPMissions/TEMPLATE/dynamic_vehicle.sqf index e1096f39b..32f806813 100644 --- a/Server Files/MPMissions/TEMPLATE/dynamic_vehicle.sqf +++ b/Server Files/MPMissions/TEMPLATE/dynamic_vehicle.sqf @@ -49,7 +49,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",5], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -93,8 +93,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/MPMissions/TEMPLATE/dynamic_vehicle_no_boats.sqf b/Server Files/MPMissions/TEMPLATE/dynamic_vehicle_no_boats.sqf index d2de3a22b..f235424ef 100644 --- a/Server Files/MPMissions/TEMPLATE/dynamic_vehicle_no_boats.sqf +++ b/Server Files/MPMissions/TEMPLATE/dynamic_vehicle_no_boats.sqf @@ -48,7 +48,7 @@ AllowedVehiclesList = [ ["M1030_US_DES_EP1",2], ["MH6J_DZ",1], ["Mi17_Civilian_DZ",1], -["Mi17_DZ",1], +["Mi17_DZE",1], ["MMT_Civ",10], ["MtvrRefuel_DES_EP1_DZ",1], ["MTVR_DES_EP1",1], @@ -88,8 +88,8 @@ AllowedVehiclesList = [ ["UAZ_Unarmed_TK_CIV_EP1",1], ["UAZ_Unarmed_TK_EP1",1], ["UAZ_Unarmed_UN_EP1",1], -["UH1H_DZ",1], -["UH1Y_DZ",1], +["UH1H_DZE",1], +["UH1Y_DZE",1], ["UH60M_EP1_DZ",1], ["UralRefuel_TK_EP1_DZ",1], ["Ural_CDF",1], diff --git a/Server Files/mysql/epoch.sql b/Server Files/mysql/epoch.sql index 2f68a4565..7cecb46bc 100644 --- a/Server Files/mysql/epoch.sql +++ b/Server Files/mysql/epoch.sql @@ -388,10 +388,10 @@ INSERT INTO `Traders_DATA` VALUES(5094, '["MtvrRefuel_DES_EP1_DZ",2]', 10, '[7," INSERT INTO `Traders_DATA` VALUES(5095, '["UralRefuel_TK_EP1_DZ",2]', 10, '[7,"ItemGoldBar10oz",1]', '[3,"ItemGoldBar10oz",1]', 0, 492, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5096, '["V3S_Refuel_TK_GUE_EP1_DZ",2]', 10, '[7,"ItemGoldBar10oz",1]', '[3,"ItemGoldBar10oz",1]', 0, 492, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5097, '["CH_47F_EP1_DZ",2]', 10, '[2,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 493, 'trade_any_vehicle'); -INSERT INTO `Traders_DATA` VALUES(5098, '["UH1H_DZ",2]', 10, '[2,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 493, 'trade_any_vehicle'); -INSERT INTO `Traders_DATA` VALUES(5099, '["Mi17_DZ",2]', 10, '[6,"ItemGoldBar10oz",1]', '[3,"ItemGoldBar10oz",1]', 0, 493, 'trade_any_vehicle'); +INSERT INTO `Traders_DATA` VALUES(5098, '["UH1H_DZE",2]', 10, '[2,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 493, 'trade_any_vehicle'); +INSERT INTO `Traders_DATA` VALUES(5099, '["Mi17_DZE",2]', 10, '[6,"ItemGoldBar10oz",1]', '[3,"ItemGoldBar10oz",1]', 0, 493, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5100, '["UH60M_EP1_DZ",2]', 10, '[2,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 493, 'trade_any_vehicle'); -INSERT INTO `Traders_DATA` VALUES(5101, '["UH1Y_DZ",2]', 10, '[2,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 493, 'trade_any_vehicle'); +INSERT INTO `Traders_DATA` VALUES(5101, '["UH1Y_DZE",2]', 10, '[2,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 493, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5116, '["DZ_Patrol_Pack_EP1",2]', 10, '[5,"ItemCopperBar",1]', '[3,"ItemCopperBar",1]', 0, 496, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(5117, '["CZ_VestPouch_EP1",2]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 496, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(5118, '["DZ_ALICE_Pack_EP1",2]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 496, 'trade_backpacks'); @@ -717,10 +717,10 @@ INSERT INTO `Traders_DATA` VALUES(5722, '["VIL_Star_S2000o",2]', 10, '[2,"ItemGo INSERT INTO `Traders_DATA` VALUES(5723, '["VIL_Star_S2000",2]', 10, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 570, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5724, '["VIL_sprinter_cargo",2]', 10, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 570, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5737, '["CH_47F_EP1_DZ",2]', 10, '[4,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 512, 'trade_any_vehicle'); -INSERT INTO `Traders_DATA` VALUES(5738, '["UH1H_DZ",2]', 10, '[4,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 512, 'trade_any_vehicle'); -INSERT INTO `Traders_DATA` VALUES(5739, '["Mi17_DZ",2]', 10, '[1,"ItemBriefcase100oz",1]', '[3,"ItemGoldBar10oz",1]', 0, 512, 'trade_any_vehicle'); +INSERT INTO `Traders_DATA` VALUES(5738, '["UH1H_DZE",2]', 10, '[4,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 512, 'trade_any_vehicle'); +INSERT INTO `Traders_DATA` VALUES(5739, '["Mi17_DZE",2]', 10, '[1,"ItemBriefcase100oz",1]', '[3,"ItemGoldBar10oz",1]', 0, 512, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5740, '["UH60M_EP1_DZ",2]', 10, '[4,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 512, 'trade_any_vehicle'); -INSERT INTO `Traders_DATA` VALUES(5741, '["UH1Y_DZ",2]', 10, '[4,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 512, 'trade_any_vehicle'); +INSERT INTO `Traders_DATA` VALUES(5741, '["UH1Y_DZE",2]', 10, '[4,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 512, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5742, '["ArmoredSUV_PMC_DZ",2]', 10, '[4,"ItemBriefcase100oz",1]', '[2,"ItemBriefcase100oz",1]', 0, 534, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5749, '["Pickup_PK_TK_GUE_EP1",2]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 534, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5751, '["Offroad_DSHKM_Gue",2]', 10, '[4,"ItemGoldBar10oz",1]', '[2,"ItemGoldBar10oz",1]', 0, 534, 'trade_any_vehicle');