diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyCargoTrucks.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyCargoTrucks.hpp index a26820779..b8b9957be 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyCargoTrucks.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyCargoTrucks.hpp @@ -49,7 +49,7 @@ class Category_564 { buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; }; - class Kamaz { + class Kamaz_DZE { type = "trade_any_vehicle"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/ATV_CZ_EP1.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/ATV_CZ_EP1.hpp index 2aa43bf2d..b9748f319 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Bikes/ATV_CZ_EP1.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/ATV_CZ_EP1.hpp @@ -5,7 +5,9 @@ class ATV_CZ_EP1: ATV_Base_EP1 { maxspeed = 80; scope = public; side = 1; - typicalcargo[] = {""}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class HitPoints: Hitpoints { class HitBody { armor = 1; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/ATV_US_EP1.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/ATV_US_EP1.hpp index 29c70a2c2..331629af2 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Bikes/ATV_US_EP1.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/ATV_US_EP1.hpp @@ -5,7 +5,9 @@ class ATV_US_EP1: ATV_Base_EP1 { maxspeed = 80; scope = public; side = 1; - typicalcargo[] = {""}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class HitPoints: Hitpoints { class HitBody { armor = 1; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/M1030.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/M1030.hpp index ec240b509..42d0da681 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Bikes/M1030.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/M1030.hpp @@ -1,4 +1,8 @@ class M1030: Motorcycle { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class HitPoints { class HitEngine { armor = 1.2; @@ -52,4 +56,11 @@ class M1030: Motorcycle { visual = "Pravy zadni"; }; }; +}; + +class M1030_US_DES_EP1: M1030_base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/MMT_Civ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/MMT_Civ.hpp new file mode 100644 index 000000000..4fa7620c0 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/MMT_Civ.hpp @@ -0,0 +1,6 @@ +class MMT_Civ: MMT_base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/Old_bike.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/Old_bike.hpp new file mode 100644 index 000000000..c0e394dee --- /dev/null +++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/Old_bike.hpp @@ -0,0 +1,13 @@ +class Old_bike_TK_CIV_EP1: Old_bike_base_EP1 { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; + +class Old_bike_TK_INS_EP1: Old_bike_base_EP1 { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/Old_moto.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/Old_moto.hpp new file mode 100644 index 000000000..e3436f25a --- /dev/null +++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/Old_moto.hpp @@ -0,0 +1,6 @@ +class Old_moto_TK_Civ_EP1 : Old_moto_base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/TT650_Civ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/TT650_Civ.hpp index 2e695fc11..7a80daffb 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Bikes/TT650_Civ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/TT650_Civ.hpp @@ -4,7 +4,9 @@ class TT650_Civ: TT650_Base { rarityurban = 0.8; scope = public; side = 3; - typicalcargo[] = {}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; maxspeed = 180; class HitPoints { @@ -60,4 +62,11 @@ class TT650_Civ: TT650_Base { visual = "Pravy zadni"; }; }; +}; + +class TT650_TK_CIV_EP1: TT650_Base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/TT650_Ins.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/TT650_Ins.hpp index 5c41d7067..aa26f5f74 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Bikes/TT650_Ins.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/TT650_Ins.hpp @@ -6,7 +6,9 @@ class TT650_Ins: TT650_Base { maxspeed = 180; scope = public; side = 0; - typicalcargo[] = {}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class HitPoints { class HitEngine { diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/Fishing_Boat.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/Fishing_Boat.hpp index f3543d965..eb1b718d6 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Boat/Fishing_Boat.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/Fishing_Boat.hpp @@ -36,7 +36,9 @@ class Fishing_Boat: Ship { textplural = "Ships"; textsingular = "Ship"; transportsoldier = 7; - typicalcargo[] = {}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; vehicleclass = "Ship"; class Library { libtextdesc = "Simple boat used to catch fish in the sea. According to the international Food and Agriculture Organization there are about 4 million of commercial fishing boats worldwide. This is one of them."; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/JetSkiYanahui.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/JetSkiYanahui.hpp new file mode 100644 index 000000000..902b99a52 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/JetSkiYanahui.hpp @@ -0,0 +1,29 @@ +class JetSkiYanahui_Case; + +class JetSkiYanahui_Case_Yellow : JetSkiYanahui_Case { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; + +class JetSkiYanahui_Case_Green : JetSkiYanahui_Case { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; + +class JetSkiYanahui_Case_Blue : JetSkiYanahui_Case { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; + +class JetSkiYanahui_Case_Red : JetSkiYanahui_Case { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/PBX.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/PBX.hpp index 99461adcc..005287572 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Boat/PBX.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/PBX.hpp @@ -13,8 +13,9 @@ class PBX: RubberBoat { scope = public; side = 0; transportsoldier = 3; - typicalcargo[] = {}; + typicalCargo[] = {}; class TransportMagazines {}; + class TransportWeapons {}; class Library { libtextdesc = "The PBX is a Combat Rubber Craft very similar to the CRRC in design. It is intended to be used for maritime raids and infiltration, as well as riverine operations."; }; @@ -26,4 +27,11 @@ class PBX: RubberBoat { transportMaxWeapons = 5; transportMaxBackpacks = 1; fuelCapacity = 23; +}; + +class Zodiac : RubberBoat { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp index 1cdfd80ba..3c9cb7a1f 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp @@ -263,10 +263,18 @@ class Boat : Ship class RHIB: Boat { displayName = "RHIB"; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; }; class RHIB2Turret: RHIB { displayName = "RHIB (Mk19)"; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; }; class RHIB_DZ : Boat @@ -275,7 +283,7 @@ class RHIB_DZ : Boat displayName = "RHIB"; vehicleClass = "Ship"; accuracy = 0.5; - crew = "USMC_Soldier"; + crew = ""; faction = "USMC"; side = 1; model = "\ca\water\rhib"; @@ -401,10 +409,9 @@ class RHIB_DZ : Boat maxSpeed = 60; enableGPS = 1; transportSoldier = 10; - typicalCargo[] = { - "USMC_Soldier", - "USMC_Soldier_AT" - }; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; supplyRadius = 3; class Exhausts { @@ -415,44 +422,6 @@ class RHIB_DZ : Boat effect = ""; }; }; - class TransportMagazines - { - class _xx_30Rnd_556x45_Stanag - { - magazine = "30Rnd_556x45_Stanag"; - count = "30*1"; - }; - class _xx_200Rnd_556x45_M249 - { - magazine = "200Rnd_556x45_M249"; - count = "5*1"; - }; - class _xx_HandGrenade_west - { - magazine = "HandGrenade_west"; - count = "10*1"; - }; - class _xx_5Rnd_762x51_M24 - { - magazine = "5Rnd_762x51_M24"; - count = "10*1"; - }; - class _xx_15rnd_9x19_M9 - { - magazine = "15rnd_9x19_M9"; - count = "15*1"; - }; - class _xx_M136 - { - magazine = "M136"; - count = "3*1"; - }; - class _xx_1Rnd_HE_M203 - { - magazine = "1Rnd_HE_M203"; - count = "3*1"; - }; - }; cost = 10000; armor = 30; class AnimationSources diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/smallboat.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/smallboat.hpp index 0579f52e0..c18357d4b 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Boat/smallboat.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/smallboat.hpp @@ -2,8 +2,10 @@ class Smallboat_1: Ship { displayName = "$STR_DN_SMALLBOATA"; - crew = "Worker1"; - typicalCargo[] = {"Worker1"}; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class Library { libTextDesc = "$STR_LIB_SMALLBOAT"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/ArmoredSUV.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/ArmoredSUV.hpp index 1c880e8fc..9534e6074 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/ArmoredSUV.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/ArmoredSUV.hpp @@ -263,6 +263,8 @@ class ArmoredSUV_PMC_DZ: ArmoredSUV_Base_PMC crew = ""; armor = 80; typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; enableGPS = 1; transportMaxWeapons = 20; transportMaxMagazines = 150; @@ -331,6 +333,8 @@ class ArmoredSUV_PMC_DZE: ArmoredSUV_Base_PMC displayName = "SUV (Armored) AL"; crew = ""; typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; enableGPS = 1; transportMaxWeapons = 20; transportMaxMagazines = 150; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/BTR90.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/BTR90.hpp index 52ce141d0..551c148bb 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/BTR90.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/BTR90.hpp @@ -10,7 +10,8 @@ class BTR90_DZ: BTR90 { crew = ""; typicalCargo[] = {}; - class TransportMagazines{}; + class TransportMagazines {}; + class TransportWeapons {}; transportMaxMagazines = 100; // Default: 100 transportMaxWeapons = 10; // Default: 10 @@ -31,7 +32,8 @@ class BTR90_HQ_DZ: BTR90_HQ { crew = ""; typicalCargo[] = {}; - class TransportMagazines{}; + class TransportMagazines {}; + class TransportWeapons {}; transportSoldier = 6; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp index 14f2388a2..6c2e3815d 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp @@ -4,7 +4,9 @@ faction = "CIV"; maxspeed = 125; scope = public; - typicalcargo[] = {}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class Upgrades { ItemORP[] = {"car_hatchback_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp index 548b3cc2a..b12026227 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp @@ -4,7 +4,9 @@ class car_sedan : SkodaBase { faction = "CIV"; maxspeed = 125; scope = public; - typicalcargo[] = {}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class Upgrades { ItemORP[] = {"car_sedan_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Gaz_Vodnik.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Gaz_Vodnik.hpp index 157e26fba..829b54c31 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Gaz_Vodnik.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Gaz_Vodnik.hpp @@ -70,7 +70,7 @@ mapSize = 6.5; side = 0; faction = "RU"; vehicleClass = "Armored"; -crew = "RU_Soldier"; +crew = ""; maxSpeed = 100; canFloat = 1; fuelCapacity = 220; @@ -711,6 +711,9 @@ hiddenSelectionsTextures[] = { class GAZ_Vodnik_DZ : GAZ_Vodnik_HMG { + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; model = "\ca\wheeled2\GAZ39371\GAZ39371_Vodnik.p3d"; displayname = "Vodnik (2xPK) DZ"; picture = "\Ca\wheeled2\data\UI\Picture_GAZ39371_CA.paa"; @@ -856,6 +859,9 @@ class AnimationSources : AnimationSources class GAZ_Vodnik_DZE : GAZ_Vodnik_HMG { + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; model = "\ca\wheeled2\GAZ39371\GAZ39371_Vodnik.p3d"; displayname = "Vodnik (2xPK) AL"; picture = "\Ca\wheeled2\data\UI\Picture_GAZ39371_CA.paa"; @@ -995,3 +1001,11 @@ class AnimationSources : AnimationSources }; }; }; + +class GAZ_Vodnik; +class GAZ_Vodnik_MedEvac : GAZ_Vodnik { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/HMMWV.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/HMMWV.hpp index 1775eeca4..76044115d 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/HMMWV.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/HMMWV.hpp @@ -11,8 +11,8 @@ class HMMWV_Base: Car mapSize = 5; displayName = "HMMWV"; vehicleClass = "Car"; - crew = "USMC_Soldier"; - typicalCargo[] = {"USMC_Soldier","USMC_Soldier","USMC_Soldier_AT","USMC_Soldier_Officer"}; + crew = ""; + typicalCargo[] = {}; damperSize = 0.2; damperForce = 1; damperDamping = 1; @@ -321,6 +321,8 @@ class HMMWV_DZ: HMMWV_Base { side = 2; crew = ""; typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; transportMaxWeapons = 10; transportMaxMagazines = 50; transportmaxbackpacks = 4; @@ -884,6 +886,8 @@ class HMMWV_M1151_M2_DES_Base_EP1_DZ: HMMWV_Base faction = "BIS_US"; crew = ""; typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class Turrets: Turrets { class MainTurret: MainTurret @@ -931,32 +935,6 @@ class HMMWV_M1151_M2_DES_Base_EP1_DZ: HMMWV_Base weapon = "M2"; }; }; - class TransportMagazines - { - class _xx_30Rnd_556x45_Stanag - { - magazine = "30Rnd_556x45_Stanag"; - count = 15; - }; - class _xx_HandGrenade_West - { - magazine = "HandGrenade_West"; - count = 2; - }; - class _xx_SmokeShellGreen - { - magazine = "SmokeShellGreen"; - count = 2; - }; - class _xx_SmokeShell - { - magazine = "SmokeShell"; - count = 2; - }; - }; - class TransportWeapons - { - }; class Damage { tex[] = {}; @@ -1110,3 +1088,33 @@ class HMMWV_M2_DZ: HMMWV_M2 { armor = 40; damageResistance = 0.00581; }; + +class HMMWV_M1035_DES_EP1 : HMMWV_base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; + +class HMMWV_Ambulance : HMMWV_base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; + +class HMMWV; +class HMMWV_DES_EP1 : HMMWV { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; + +class HMMWV_Ambulance_base; +class HMMWV_Ambulance_CZ_DES_EP1 : HMMWV_Ambulance_base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp new file mode 100644 index 000000000..a78cc175a --- /dev/null +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp @@ -0,0 +1,13 @@ +class Ikarus: Car { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; + +class Ikarus_TK_CIV_EP1: Ikarus_base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Kamaz.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Kamaz.hpp index 1051087d3..8fb571103 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Kamaz.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Kamaz.hpp @@ -19,6 +19,10 @@ class KamazOpen_DZE : Kamaz_Base { }; class Kamaz_DZE: Kamaz_Base { scope = public; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; cargoAction[] = {"Truck_Cargo01","Truck_Cargo01","Truck_Cargo02","Truck_Cargo03","Truck_Cargo02","Truck_Cargo02","Truck_Cargo03","Truck_Cargo02","Truck_Cargo03","Truck_Cargo02","Truck_Cargo02","Truck_Cargo03"}; class Upgrades { ItemORP[] = {"Kamaz_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/LAV25.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/LAV25.hpp index 9936348e7..031a92210 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/LAV25.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/LAV25.hpp @@ -10,7 +10,8 @@ class LAV25_DZ: LAV25 { crew = ""; typicalCargo[] = {}; - class TransportMagazines{}; + class TransportMagazines {}; + class TransportWeapons {}; transportMaxMagazines = 100; // Default: 100 transportMaxWeapons = 10; // Default: 10 @@ -31,7 +32,8 @@ class LAV25_HQ_DZ: LAV25_HQ { crew = ""; typicalCargo[] = {}; - class TransportMagazines{}; + class TransportMagazines {}; + class TransportWeapons {}; transportSoldier = 6; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Lada.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Lada.hpp index a563f9984..aed2e1410 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Lada.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Lada.hpp @@ -10,8 +10,10 @@ class Lada_base: Car { side = 3; faction = "CIV"; vehicleClass = "Car"; - crew = "Citizen1"; - typicalCargo[] = {"Citizen1"}; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; maxSpeed = 120; terrainCoef = 6; turnCoef = 2; @@ -191,8 +193,8 @@ class Lada_base_alt: Car { side = 3; faction = "CIV"; vehicleClass = "Car"; - crew = "Citizen1"; - typicalCargo[] = {"Citizen1"}; + crew = ""; + typicalCargo[] = {}; maxSpeed = 120; terrainCoef = 6; turnCoef = 2; @@ -810,3 +812,5 @@ class Lada1_TK_CIV_EP1_DZE4: Lada1_TK_CIV_EP1_DZE3 { class Lada2_TK_CIV_EP1_DZE4: Lada2_TK_CIV_EP1_DZE3 { fuelCapacity = 150; // car 50 }; + +class GLT_M300_LT : Lada_base {}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/LandRover.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/LandRover.hpp index fa3c7964a..dd977fda1 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/LandRover.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/LandRover.hpp @@ -233,6 +233,16 @@ class LandRover_Base: Car threat[] = {0,0,0}; }; +class LandRover_CZ_EP1: LandRover_Base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; +class LandRover_TK_CIV_EP1: LandRover_CZ_EP1 {}; +class BAF_Offroad_D: LandRover_CZ_EP1 {}; +class BAF_Offroad_W: BAF_Offroad_D {}; + class LandRover_Special_CZ_EP1_DZ: LandRover_Base { scope = public; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/M113.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/M113.hpp index 71f2e1d04..fe70708af 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/M113.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/M113.hpp @@ -358,14 +358,16 @@ class M113_Base : Tank { class M113Ambul_Base : M113_Base { accuracy = 1000; // accuracy needed to recognize type of this target + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; vehicleClass = "Support"; picture = "\ca\tracked_e\Data\ui\Picture_m113_amb_CA.paa"; Icon = "\Ca\tracked_e\Data\ui\Icon_m113_amb_CA.paa"; mapSize = 5; scope = private; displayName = $STR_DN_M113_AMB; - - class TransportMagazines {}; attendant = true; hasGunner = false; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Mtvr.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Mtvr.hpp index e6cb2e6e8..c79d20181 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Mtvr.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Mtvr.hpp @@ -1,11 +1,28 @@ +class MTVR : Truck { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; + +class MTVR_base; +class MTVR_DES_EP1 : MTVR_base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; + class MtvrRefuel; class MtvrRefuel_base : MtvrRefuel { scope = private; side = 4; expansion = 1; - crew = "Civilian"; + crew = ""; typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; }; class MtvrRefuel_DES_EP1_DZ : MtvrRefuel_base { diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Offroad_DSHKM_INS.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Offroad_DSHKM_INS.hpp index b6330f01f..7464bd088 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Offroad_DSHKM_INS.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Offroad_DSHKM_INS.hpp @@ -11,7 +11,9 @@ class Offroad_DSHKM_Gue_DZ: Offroad_DSHKM_base side = 2; faction = "GUE"; crew = ""; - typicalCargo[] = {""}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; displayName = "Off-road (DShKM) DZ"; hiddenSelectionsTextures[] = {"\ca\wheeled\hilux_armed\data\coyota_trup4_CO.paa"}; class Damage @@ -55,6 +57,8 @@ class Offroad_DSHKM_Gue_DZE: Offroad_DSHKM_base faction = "GUE"; crew = ""; typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; displayName = "Off-road (DShKM) AL"; hiddenSelectionsTextures[] = {"\ca\wheeled\hilux_armed\data\coyota_trup4_CO.paa"}; class Damage diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/S1203.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/S1203.hpp new file mode 100644 index 000000000..ac18ed215 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/S1203.hpp @@ -0,0 +1,13 @@ +class S1203_TK_CIV_EP1: Car { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; + +class S1203_ambulance_EP1: S1203_TK_CIV_EP1 { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/SUV_DZ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/SUV_DZ.hpp index e477dd320..c01dc81ca 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/SUV_DZ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/SUV_DZ.hpp @@ -4,7 +4,9 @@ class SUV_DZ: SUV_Base_EP1 { rarityurban = 0.8; scope = public; side = 3; - typicalcargo[] = {}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class HitPoints : HitPoints { class HitLFWheel:HitLFWheel { armor = 0.15; @@ -82,6 +84,8 @@ class SUV_TK_CIV_EP1: SUV_Base_EP1 { scope = public; crew = ""; typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; rarityUrban = 0.8; faction = "BIS_TK_CIV"; side = 3; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Skoda.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Skoda.hpp index 8cde27c44..a4611d9f7 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Skoda.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Skoda.hpp @@ -1,8 +1,10 @@ class SkodaBase: Car { scope = private; faction = "CIV"; - crew = "Citizen2"; - typicalCargo[] = {"Citizen2"}; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; maxSpeed = 110; side = 3; armor = 20; @@ -13,9 +15,7 @@ class SkodaBase: Car { class Skoda: SkodaBase { scope = public; accuracy = 1000; - crew = "Citizen1"; faction = "CIV"; - typicalCargo[] = {"Citizen1"}; model = "\ca\wheeled\skodovka"; picture = "\Ca\wheeled\data\ico\skodovka_CA.paa"; Icon = "\Ca\wheeled\data\map_ico\icomap_skoda_CA.paa"; @@ -37,9 +37,7 @@ class Skoda: SkodaBase { class SkodaBlue: SkodaBase { scope = public; accuracy = 1000; - crew = "Villager2"; faction = "CIV"; - typicalCargo[] = {"Villager2"}; model = "\ca\wheeled\skodovka_blue"; picture = "\Ca\wheeled\data\ico\skodovka_CA.paa"; Icon = "\Ca\wheeled\data\map_ico\icomap_skoda_CA.paa"; @@ -64,8 +62,6 @@ class SkodaRed: SkodaBase { picture = "\Ca\wheeled\data\ico\skodovka_CA.paa"; Icon = "\Ca\wheeled\data\map_ico\icomap_skoda_CA.paa"; mapSize = 6; - crew = "Villager1"; - typicalCargo[] = {"Villager1"}; displayName = "Car (red)"; displayNameShort = "Car"; class Damage { @@ -85,8 +81,6 @@ class SkodaGreen: SkodaBase { picture = "\Ca\wheeled\data\ico\skodovka_CA.paa"; Icon = "\Ca\wheeled\data\map_ico\icomap_skoda_CA.paa"; mapSize = 6; - crew = "Villager3"; - typicalCargo[] = {"Villager3"}; displayName = "Car (green)"; displayNameShort = "Car"; class Damage { @@ -382,3 +376,5 @@ class SkodaRed_DZE4: SkodaRed_DZE3 { class SkodaGreen_DZE4: SkodaGreen_DZE3 { fuelCapacity = 210; // car 100 }; + +class GLT_M300_ST : SkodaBase {}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Tractor.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Tractor.hpp new file mode 100644 index 000000000..606227c4c --- /dev/null +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Tractor.hpp @@ -0,0 +1,6 @@ +class Tractor: Car { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/UAZ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/UAZ.hpp index 1292b4e68..c57df18b5 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/UAZ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/UAZ.hpp @@ -88,7 +88,9 @@ class UAZ_CDF: UAZ_Unarmed_Base { hiddenselectionstextures[] = {"\ca\wheeled\data\Uaz_main_002_CO.paa"}; scope = public; side = 1; - typicalcargo[] = {}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class Upgrades { ItemORP[] = {"UAZ_CDF_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; @@ -102,6 +104,8 @@ class UAZ_INS: UAZ_Unarmed_Base { accuracy = 0.3; crew = ""; typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; hiddenSelectionsTextures[] = {"\ca\wheeled\data\Uaz_main_001_CO.paa"}; class Upgrades { @@ -115,6 +119,8 @@ class UAZ_RU: UAZ_Unarmed_Base { faction = "RU"; crew = ""; typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; hiddenSelectionsTextures[] = {"\ca\wheeled\data\Uaz_main_CO.paa"}; class Upgrades { @@ -128,7 +134,7 @@ class UAZ_Unarmed_TK_EP1: UAZ_Unarmed_Base { side = 0; faction = "BIS_TK"; accuracy = 0.3; - crew = "TK_Soldier_EP1"; + crew = ""; typicalCargo[] = {}; hiddenSelectionsTextures[] = {"\CA\wheeled_E\UAZ\Data\Uaz_main_IND_CO.paa"}; class TransportMagazines {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp index c9deaede5..5a038eb56 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp @@ -1,3 +1,28 @@ +class UralCivil: Ural_Base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; +class Ural_CDF: Ural_Base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; +class Ural_TK_CIV_EP1: Ural_Base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; +class Ural_UN_EP1: Ural_Base { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; + class UralCivil_DZ: UralCivil { scope = public; side=TCivilian; @@ -21,7 +46,7 @@ class UralCivil_DZ: UralCivil { "\ca\wheeled\data\ural_plachta_civ1_co.paa" }; }; -class Ural_Base; + class UralCivil_DZE : Ural_Base { scope = public; side = 3; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp index c746f6bb2..5c447641e 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp @@ -4,13 +4,27 @@ class V3S_Civ: V3S_Base { rarityurban = 0.3; scope = public; side = 3; - typicalcargo[] = {}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class Library { libtextdesc = $STR_EP1_LIB_V3S; }; }; class V3S_Base_EP1; +class V3S_Open_TK_CIV_EP1: V3S_Base_EP1 { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; +class V3S_Open_TK_EP1: V3S_Base_EP1 { + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; +}; class V3S_TK_EP1_DZE: V3S_Base_EP1 { scope = public; side = 0; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/VWGolf.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/VWGolf.hpp index fcc7ed33d..98f065ecd 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/VWGolf.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/VWGolf.hpp @@ -29,6 +29,8 @@ class VWGolf : Car { vehicleClass = "Car"; crew = ""; typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; maxSpeed = 241; terrainCoef = 6; turnCoef = 2; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Volha.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Volha.hpp index 559aea9ee..7f8828427 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Volha.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Volha.hpp @@ -14,8 +14,10 @@ class Volha_TK_CIV_Base_EP1: Car { Icon = "\CA\wheeled_e\Data\UI\Icon_volha_CA.paa"; Picture = "\CA\wheeled_e\Data\UI\Picture_volha_CA.paa"; faction = "BIS_TK_CIV"; - crew = "TK_CIV_Takistani01_EP1"; - typicalCargo[] = {"TK_CIV_Takistani01_EP1","TK_CIV_Takistani01_EP1"}; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; maxSpeed = 150; terrainCoef = 5; turnCoef = 2; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/datsun.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/datsun.hpp index 63e315923..cbace5d36 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/datsun.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/datsun.hpp @@ -1,6 +1,10 @@ class datsun1_civil_1_open; class datsun1_civil_1_open_DZE: datsun1_civil_1_open { terrainCoef = 2.5; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class HitPoints; class Upgrades { @@ -11,6 +15,10 @@ class datsun1_civil_1_open_DZE: datsun1_civil_1_open { class datsun1_civil_2_covered; class datsun1_civil_2_covered_DZE: datsun1_civil_2_covered { terrainCoef = 2.5; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class HitPoints; class Upgrades { @@ -21,6 +29,10 @@ class datsun1_civil_2_covered_DZE: datsun1_civil_2_covered { class datsun1_civil_3_open; class datsun1_civil_3_open_DZE: datsun1_civil_3_open { terrainCoef = 2.5; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class HitPoints; class Upgrades { diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/hilux.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/hilux.hpp index 7d8da407c..94bc013b2 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/hilux.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/hilux.hpp @@ -1,6 +1,10 @@ class hilux1_civil_1_open; class hilux1_civil_1_open_DZE: hilux1_civil_1_open { terrainCoef = 2.5; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class HitPoints; class Upgrades { @@ -11,6 +15,10 @@ class hilux1_civil_1_open_DZE: hilux1_civil_1_open { class hilux1_civil_2_covered; class hilux1_civil_2_covered_DZE: hilux1_civil_2_covered { terrainCoef = 2.5; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class HitPoints; class Upgrades { @@ -21,6 +29,10 @@ class hilux1_civil_2_covered_DZE: hilux1_civil_2_covered { class hilux1_civil_3_open; class hilux1_civil_3_open_DZE: hilux1_civil_3_open { terrainCoef = 2.5; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; class HitPoints; class Upgrades { diff --git a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp index 7e1859336..16ced11f2 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp @@ -381,7 +381,7 @@ class CfgVehicles { smokeLauncherOnTurret = 1; smokeLauncherAngle = 120; }; - + class Truck; //External Class //class SkodaBase; //in Car\Skoda.hpp @@ -427,7 +427,6 @@ class CfgVehicles { }; }; - class UralCivil; //class Ship; //class Bag_Base_EP1; //class Bag_Base_BAF; @@ -447,6 +446,15 @@ class CfgVehicles { class BuiltItems; class Building; class ReammoBox; + + class M1030_base; + class MMT_base; + class Old_bike_base_EP1; + class Old_moto_base; + class Ikarus_base; + //class Volha_TK_CIV_Base_EP1; + //class LandRover_CZ_EP1; + class Ural_Base; #include "RepairParts.hpp" //names for all reapir parts. Needs moving to hitpoints //ZEDS @@ -471,12 +479,15 @@ class CfgVehicles { #include "Car\datsun.hpp" #include "Car\Gaz_Vodnik.hpp" #include "Car\hilux.hpp" + #include "Car\Ikarus.hpp" #include "Car\Kamaz.hpp" #include "Car\Lada.hpp" #include "Car\LandRover.hpp" #include "Car\LAV25.hpp" #include "Car\M113.hpp" #include "Car\Mtvr.hpp" + #include "Car\S1203.hpp" + #include "Car\Tractor.hpp" #include "Car\UAZ_MG.hpp" #include "Car\Volha.hpp" #include "Car\VWGolf.hpp" @@ -513,6 +524,9 @@ class CfgVehicles { //Bikes #include "Bikes\ATV_US_EP1.hpp" #include "Bikes\ATV_CZ_EP1.hpp" + #include "Bikes\MMT_Civ.hpp" + #include "Bikes\Old_bike.hpp" + #include "Bikes\Old_moto.hpp" #include "Bikes\TT650_Ins.hpp" #include "Bikes\TT650_Civ.hpp" #include "Bikes\M1030.hpp" @@ -521,6 +535,7 @@ class CfgVehicles { #include "Boat\PBX.hpp" #include "Boat\Fishing_Boat.hpp" #include "Boat\smallboat.hpp" + #include "Boat\JetSkiYanahui.hpp" //Includes all Building Stuff // This parent class is made to make referring to these objects easier later with allMissionObjects diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/CSJ_GyroAC.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/CSJ_GyroAC.hpp index 6bfbae254..5f9896bc5 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/DZE/CSJ_GyroAC.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/CSJ_GyroAC.hpp @@ -2,8 +2,11 @@ class CSJ_GyroP: Plane { scope = 2; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; faction = "CIV"; - crew = "Pilot"; + crew = ""; cabinOpening = 0; driverAction = "UH60_Pilot"; vehicleClass = "CSJ_Air"; @@ -157,7 +160,7 @@ class CSJ_GyroC: Helicopter Icon = "\CSJ_GyroAC\data\Cicon.paa"; nameSound = "chopper"; faction = "CIV"; - crew = "Pilot"; + crew = ""; accuracy = 0.3; armor = 30; damageResistance = 0.003; @@ -184,6 +187,8 @@ class CSJ_GyroC: Helicopter soundEngineOffInt[] = {"\z\addons\dayz_code\Configs\CfgVehicles\DZE\UH1_v1stop",1,1}; soundEngineOffExt[] = {"\z\addons\dayz_code\Configs\CfgVehicles\DZE\UH1_v1stop",1,1,800}; typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; weapons[] = {"GyroGrenadeLauncher"}; magazines[] = {"3Rnd_GyroGrenade"}; transportMaxMagazines = 0; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/BAF_Merlin.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/BAF_Merlin.hpp index 22077f603..a3fbcde77 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/BAF_Merlin.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/BAF_Merlin.hpp @@ -2,7 +2,9 @@ class BAF_Merlin_HC3_D; class BAF_Merlin_DZE : BAF_Merlin_HC3_D { scope = public; crew = ""; - typicalCargo[] = {}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; commanderCanSee = 2+16+32; gunnerCanSee = 2+16+32; driverCanSee = 2+16+32; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH47.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH47.hpp index 46d9b9a94..340061209 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH47.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH47.hpp @@ -127,7 +127,9 @@ class CH_47F_EP1_DZ : CH_47F_EP1 { scope = public; displayName = "CH-47F DZ"; crew = ""; - typicalCargo[] = {}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; commanderCanSee = 2+16+32; gunnerCanSee = 2+16+32; driverCanSee = 2+16+32; @@ -147,7 +149,9 @@ class CH_47F_EP1_DZE: CH47_base_EP1 icon = "\ca\air_e\data\UI\Icon_ch47f_CA.paa"; mapSize = 24; crew = ""; - typicalCargo[] = {}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; driverAction = "CH47_Pilot_EP1"; commanderCanSee = 2+16+32; gunnerCanSee = 2+16+32; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH60.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH60.hpp index 10f1e9378..93c473b39 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH60.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH60.hpp @@ -250,8 +250,8 @@ class UH60M_base_EP1: UH60_Base { class Library { libTextDesc = "The Blackhawk is the US Army�s front-line utility helicopter used for transport roles, medical evacuation and even air support.
It is capable of carrying 11 combat-equipped soldiers. Easy to maintain in the field, the Blackhawk performs well in a variety of roles including air assault and medical evacuation."; }; - crew = "US_Soldier_Pilot_EP1"; - typicalCargo[] = {"US_Soldier_Pilot_EP1","US_Soldier_Pilot_EP1"}; + crew = ""; + typicalCargo[] = {}; gunnerAction = "ManActTestDriver"; transportMaxBackpacks = 10; transportSoldier = 13; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Plane/C130.hpp b/SQF/dayz_code/Configs/CfgVehicles/Plane/C130.hpp index 4348ed7ef..41a9c79ed 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Plane/C130.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Plane/C130.hpp @@ -4,4 +4,8 @@ class C130J_US_EP1_DZ: C130J_US_EP1 { transportMaxMagazines = 400; transportmaxbackpacks = 20; fuelCapacity = 34095; + crew = ""; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; }; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp b/SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp index 438122b87..45930879f 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp @@ -4,7 +4,9 @@ class MV22_DZ : MV22 { scope = public; displayName = "MV-22"; crew = ""; - typicalCargo[] = {}; + typicalCargo[] = {}; + class TransportMagazines {}; + class TransportWeapons {}; commanderCanSee = 2+16+32; gunnerCanSee = 2+16+32; driverCanSee = 2+16+32; diff --git a/SQF/dayz_server/system/dynamic_vehicle.sqf b/SQF/dayz_server/system/dynamic_vehicle.sqf index 60af69ad9..3561c765f 100644 --- a/SQF/dayz_server/system/dynamic_vehicle.sqf +++ b/SQF/dayz_server/system/dynamic_vehicle.sqf @@ -45,7 +45,7 @@ AllowedVehiclesList = [ ["HMMWV_M998A2_SOV_DES_EP1_DZE",_Ratio1], ["Ikarus",_Ratio3], ["Ikarus_TK_CIV_EP1",_Ratio3], - ["Kamaz",_Ratio3], + ["Kamaz_DZE",_Ratio3], ["KamazRefuel_DZ",_Ratio1], ["Lada1",_Ratio3], ["Lada1_TK_CIV_EP1",_Ratio3], diff --git a/Server Files/SQL/1.0.6_Updates.sql b/Server Files/SQL/1.0.6_Updates.sql index 4c7d3892d..02972c82f 100644 --- a/Server Files/SQL/1.0.6_Updates.sql +++ b/Server Files/SQL/1.0.6_Updates.sql @@ -80,7 +80,7 @@ UPDATE `object_data` SET `Classname` = 'ArmoredSUV_PMC_DZE3' WHERE `Classname` = UPDATE `object_data` SET `Classname` = 'ArmoredSUV_PMC_DZE3' WHERE `Classname` = 'ArmoredSUV_PMC_DZE'; -- ---------------------------- --- Swap datsun and hilux to upgradeable _DZE versions +-- Swap datsun, Kamaz and hilux to upgradeable _DZE versions -- ---------------------------- UPDATE `object_data` SET `Classname` = 'hilux1_civil_1_open_DZE' WHERE `Classname` = 'hilux1_civil_1_open'; UPDATE `object_data` SET `Classname` = 'hilux1_civil_2_covered_DZE' WHERE `Classname` = 'hilux1_civil_2_covered'; @@ -88,6 +88,7 @@ UPDATE `object_data` SET `Classname` = 'hilux1_civil_3_open_DZE' WHERE `Classnam UPDATE `object_data` SET `Classname` = 'datsun1_civil_1_open_DZE' WHERE `Classname` = 'datsun1_civil_1_open'; UPDATE `object_data` SET `Classname` = 'datsun1_civil_2_covered_DZE' WHERE `Classname` = 'datsun1_civil_2_covered'; UPDATE `object_data` SET `Classname` = 'datsun1_civil_3_open_DZE' WHERE `Classname` = 'datsun1_civil_3_open'; +UPDATE `object_data` SET `Classname` = 'Kamaz_DZE' WHERE `Classname` = 'Kamaz'; DELETE FROM `Traders_DATA` WHERE item = '["hilux1_civil_1_open"]'; INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["hilux1_civil_1_open_DZE",2]', 2, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 495, 'trade_any_vehicle'); INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["hilux1_civil_1_open_DZE",2]', 2, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 535, 'trade_any_vehicle'); @@ -118,6 +119,11 @@ INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["datsun1_civil_3_open_DZE",2]' INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["datsun1_civil_3_open_DZE",2]', 2, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 535, 'trade_any_vehicle'); INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["datsun1_civil_3_open_DZE",2]', 2, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 590, 'trade_any_vehicle'); INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["datsun1_civil_3_open_DZE",2]', 2, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 659, 'trade_any_vehicle'); +DELETE FROM `Traders_DATA` WHERE item = '["Kamaz"]'; +INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["Kamaz_DZE",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 564, 'trade_any_vehicle'); +INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["Kamaz_DZE",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 570, 'trade_any_vehicle'); +INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["Kamaz_DZE",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 586, 'trade_any_vehicle'); +INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["Kamaz_DZE",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 653, 'trade_any_vehicle'); -- ---------------------------- -- Add new attachments category to DB traders diff --git a/Server Files/SQL/epoch.sql b/Server Files/SQL/epoch.sql index 390acd5ed..79421fdff 100644 --- a/Server Files/SQL/epoch.sql +++ b/Server Files/SQL/epoch.sql @@ -606,7 +606,7 @@ INSERT INTO `Traders_DATA` VALUES(5653, '["Ural_TK_CIV_EP1",2]', 2, '[2,"ItemGol INSERT INTO `Traders_DATA` VALUES(5654, '["Ural_UN_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 564, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5655, '["V3S_Open_TK_CIV_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 564, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5656, '["V3S_Open_TK_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 564, 'trade_any_vehicle'); -INSERT INTO `Traders_DATA` VALUES(5657, '["Kamaz",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 564, 'trade_any_vehicle'); +INSERT INTO `Traders_DATA` VALUES(5657, '["Kamaz_DZE",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 564, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5658, '["MTVR_DES_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 564, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5664, '["SUV_TK_CIV_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 565, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5665, '["SUV_Blue",2]', 2, '[2,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 565, 'trade_any_vehicle'); @@ -647,7 +647,7 @@ INSERT INTO `Traders_DATA` VALUES(5714, '["Ural_TK_CIV_EP1",2]', 2, '[2,"ItemGol INSERT INTO `Traders_DATA` VALUES(5715, '["Ural_UN_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 570, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5716, '["V3S_Open_TK_CIV_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 570, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5717, '["V3S_Open_TK_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 570, 'trade_any_vehicle'); -INSERT INTO `Traders_DATA` VALUES(5718, '["Kamaz",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 570, 'trade_any_vehicle'); +INSERT INTO `Traders_DATA` VALUES(5718, '["Kamaz_DZE",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 570, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5719, '["MTVR_DES_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 570, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5737, '["CH_47F_EP1_DZE",2]', 2, '[4,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 512, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5738, '["UH1H_DZE",2]', 2, '[2,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 512, 'trade_any_vehicle'); @@ -721,7 +721,7 @@ INSERT INTO `Traders_DATA` VALUES(5949, '["Ural_TK_CIV_EP1",2]', 2, '[2,"ItemGol INSERT INTO `Traders_DATA` VALUES(5950, '["Ural_UN_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 586, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5951, '["V3S_Open_TK_CIV_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 586, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5952, '["V3S_Open_TK_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 586, 'trade_any_vehicle'); -INSERT INTO `Traders_DATA` VALUES(5953, '["Kamaz",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 586, 'trade_any_vehicle'); +INSERT INTO `Traders_DATA` VALUES(5953, '["Kamaz_DZE",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 586, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5954, '["MTVR_DES_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 586, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(5960, '["MMT_Civ",2]', 2, '[4,"ItemSilverBar",1]', '[2,"ItemSilverBar",1]', 0, 587, 'trade_any_bicycle'); INSERT INTO `Traders_DATA` VALUES(5961, '["Old_bike_TK_INS_EP1",2]', 2, '[4,"ItemSilverBar",1]', '[2,"ItemSilverBar",1]', 0, 587, 'trade_any_bicycle'); @@ -1221,7 +1221,7 @@ INSERT INTO `Traders_DATA` VALUES(6590, '["Ural_TK_CIV_EP1",2]', 2, '[2,"ItemGol INSERT INTO `Traders_DATA` VALUES(6591, '["Ural_UN_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 653, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(6592, '["V3S_Open_TK_CIV_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 653, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(6593, '["V3S_Open_TK_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 653, 'trade_any_vehicle'); -INSERT INTO `Traders_DATA` VALUES(6594, '["Kamaz",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 653, 'trade_any_vehicle'); +INSERT INTO `Traders_DATA` VALUES(6594, '["Kamaz_DZE",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 653, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(6595, '["MTVR_DES_EP1",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 653, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(6622, '["KamazRefuel_DZ",2]', 2, '[7,"ItemGoldBar10oz",1]', '[3,"ItemGoldBar10oz",1]', 0, 655, 'trade_any_vehicle'); INSERT INTO `Traders_DATA` VALUES(6623, '["MtvrRefuel_DES_EP1_DZ",2]', 2, '[7,"ItemGoldBar10oz",1]', '[3,"ItemGoldBar10oz",1]', 0, 655, 'trade_any_vehicle');