diff --git a/README.md b/README.md index 2ab9873c3..049c75648 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Included Custom Addons * German Technical Relief Pack (THW Pack) by Marseille77 - http://www.armaholic.com/page.php?id=15466 * German Firefighters Pack by Marseille77 - http://www.armaholic.com/page.php?id=20391 * German Civil Pack by Marseille77 - http://www.armaholic.com/page.php?id=9793 - +* Sahrani Rearmed: Sahrani Civilians by Marseille77 - http://www.armaholic.com/page.php?id=24325 -------------------------- Included Custom Islands diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Vehicles.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Vehicles.hpp index 53ba00c56..439a470d9 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Vehicles.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Vehicles.hpp @@ -31,6 +31,7 @@ class Category_38 { class Volha_2_TK_CIV_EP1_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class VWGolf_DZE {type = "trade_any_vehicle";buy[] = {3,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; class car_hatchback_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; + class car_hatchback_red_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class car_sedan_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class GLT_M300_ST_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class GLT_M300_LT_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; @@ -45,7 +46,9 @@ class Category_38 { class Category_39 { class datsun1_civil_3_open_DZE {type = "trade_any_vehicle";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; class datsun1_civil_1_open_DZE {type = "trade_any_vehicle";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class datsun1_green_open_DZE {type = "trade_any_vehicle";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; class datsun1_civil_2_covered_DZE {type = "trade_any_vehicle";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class datsun1_red_covered_DZE {type = "trade_any_vehicle";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; class hilux1_civil_1_open_DZE {type = "trade_any_vehicle";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; class hilux1_civil_3_open_DZE {type = "trade_any_vehicle";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; class hilux1_civil_2_covered_DZE {type = "trade_any_vehicle";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; @@ -133,18 +136,20 @@ class Category_44 { class LandRover_Ambulance_Des_ACR_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; class BTR40_TK_INS_EP1_DZE {type = "trade_any_vehicle";buy[] = {4,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; class BTR40_TK_GUE_EP1_DZE {type = "trade_any_vehicle";buy[] = {4,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; + class GAZ_Vodnik_MedEvac_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; class HMMWV_M1035_DES_EP1_DZE {type = "trade_any_vehicle";buy[] = {4,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; class HMMWV_Ambulance_DZE {type = "trade_any_vehicle";buy[] = {4,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; class HMMWV_Ambulance_CZ_DES_EP1_DZE {type = "trade_any_vehicle";buy[] = {4,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; class HMMWV_DES_EP1_DZE {type = "trade_any_vehicle";buy[] = {4,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; class HMMWV_DZ {type = "trade_any_vehicle";buy[] = {4,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; - class GAZ_Vodnik_MedEvac_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class Hummer_DZE {type = "trade_any_vehicle";buy[] = {4,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; }; //Miscellaneous class Category_45 { class Ikarus_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; class Ikarus_TK_CIV_EP1_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; + class Ikarus_White_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; class S1203_TK_CIV_EP1_DZE {type = "trade_any_vehicle";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; class S1203_ambulance_EP1_DZE {type = "trade_any_vehicle";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; class tractor_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp index e5b91a8f0..265aaf758 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp @@ -1,7 +1,7 @@ class car_hatchback; class car_hatchback_DZE: car_hatchback { scope = public; - displayname = $STR_VEH_NAME_HATCHBACK; + displayname = $STR_VEH_NAME_HATCHBACK_YELLOW; vehicleClass = "DayZ Epoch Vehicles"; maxspeed = 125; armor = 20; @@ -102,3 +102,102 @@ class car_hatchback_DZE3: car_hatchback_DZE2 { class car_hatchback_DZE4: car_hatchback_DZE3 { fuelCapacity = 210; // car 100 }; + +class car_hatchback_red_DZE: car_hatchback_DZE { + displayname = $STR_VEH_NAME_HATCHBACK_RED; + + hiddenSelections[] = {"Camo1"}; + hiddenSelectionsTextures[] = {"\sra_civilian\wheeled\data\hatchback_co.paa"}; + + class HitPoints; + class HitLFWheel; + class HitLBWheel; + class HitRFWheel; + class HitRBWheel; + class HitFuel; + class HitEngine; + class HitGlass1; + class HitGlass2; + class HitGlass3; + class HitGlass4; + + class Upgrades { + ItemORP[] = {"car_hatchback_red_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; + }; +}; + +// Performance 1 +class car_hatchback_red_DZE1: car_hatchback_red_DZE { + original = "car_hatchback_red_DZE"; + maxspeed = 150; // max engine limit 125-130 + terrainCoef = 2.5; + + class Upgrades { + ItemAVE[] = {"car_hatchback_red_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}}; + }; +}; + +// Armor 2 +class car_hatchback_red_DZE2: car_hatchback_red_DZE1 { + armor = 50; // car 20 + class HitPoints: HitPoints { + class HitLFWheel: HitLFWheel { + armor = 0.3; + }; + class HitLBWheel: HitLBWheel { + armor = 0.3; + }; + class HitRFWheel: HitRFWheel { + armor = 0.3; + }; + class HitRBWheel: HitRBWheel { + armor = 0.3; + }; + class HitFuel { + armor = 0.28; + material = -1; + name = "palivo"; + visual = ""; + passThrough = 1; + }; + class HitEngine { + armor = 1; + material = -1; + name = "motor"; + visual = ""; + passThrough = 1; + }; + class HitGlass1: HitGlass1 { + armor = 0.1; + }; + class HitGlass2: HitGlass2 { + armor = 0.1; + }; + class HitGlass3: HitGlass3 { + armor = 0.1; + }; + class HitGlass4: HitGlass4 { + armor = 0.1; + }; + }; + + class Upgrades { + ItemLRK[] = {"car_hatchback_red_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}}; + }; +}; + +// Cargo 3 +class car_hatchback_red_DZE3: car_hatchback_red_DZE2 { + transportMaxWeapons = 20; // car 10 + transportMaxMagazines = 100; // car 50 + transportmaxbackpacks = 4; // car 2 + + class Upgrades { + ItemTNK[] = {"car_hatchback_red_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}}; + }; +}; + +// Fuel 4 +class car_hatchback_red_DZE4: car_hatchback_red_DZE3 { + fuelCapacity = 210; // car 100 +}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/HMMWV.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/HMMWV.hpp index 80dbae146..e0dfe2b6a 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/HMMWV.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/HMMWV.hpp @@ -310,7 +310,6 @@ class HMMWV_DZE_Base: Car class HMMWV_DZ: HMMWV_DZE_Base { accuracy = 0.32; displayname = $STR_VEH_NAME_HMMWV; - displaynameshort = $STR_VEH_NAME_HMMWV; hasgunner = 0; hiddenselections[] = {"Camo1"}; hiddenselectionstextures[] = {"\ca\wheeled\hmmwv\data\hmmwv_body_co.paa"}; @@ -334,6 +333,91 @@ class HMMWV_DZ: HMMWV_DZE_Base { }; }; +class Hummer_DZE: HMMWV_DZ { + displayname = $STR_VEH_NAME_HUMMER; + hiddenSelections[] = {"camo1","camo2","camo3"}; + hiddenSelectionsTextures[] = {"\sra_civilian\wheeled\hmmwv\hmmwv_body_co.paa","\sra_civilian\wheeled\hmmwv\hmmwv_hood_co.paa","\sra_civilian\wheeled\hmmwv\hmmwv_regular_co.paa"}; + icon = "\SRA_civilian\Wheeled\data\icomap_hmwv_CA.paa"; + model = "\SRA_civilian\Wheeled\HMMWV\hmmwv"; + picture = "\Ca\wheeled\data\ico\HMMWV_CA.paa"; + + class HitPoints: HitPoints + { + class HitBody + { + armor = 2; + material = -1; + name = "karoserie"; + passThrough = 0; + visual = "karoserie"; + }; + class HitEngine: HitBody + { + name = "motor"; + visual = "motor"; + }; + class HitFuel: HitBody + { + armor = 1; + name = "palivo"; + visual = "palivo"; + }; + class HitGlass1: HitGlass1 + { + armor = 1; + name = "glass1"; + visual = "glass1"; + passThrough = 0; + }; + class HitGlass2: HitGlass1 + { + name = "glass2"; + visual = "glass2"; + }; + class HitGlass3: HitGlass1 + { + name = "glass3"; + visual = "glass3"; + }; + class HitGlass4: HitGlass1 + { + name = "glass4"; + visual = "glass4"; + }; + class HitGlass5: HitGlass1 + { + name = "glass5"; + visual = "glass5"; + }; + class HitLFWheel + { + armor = 0.35; + material = -1; + name = "levy predni tlumic"; + passThrough = 0.3; + visual = ""; + }; + class HitLBWheel: HitLFWheel + { + name = "levy zadni tlumic"; + }; + class HitRFWheel: HitLFWheel + { + name = "pravy predni tlumic"; + }; + class HitRBWheel: HitLFWheel + { + name = "pravy zadni tlumic"; + }; + }; + + class Damage + { + tex[] = {}; + mat[] = {"sra_civilian\wheeled\hmmwv\hmmwv_body.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_body_damage.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_body_destruct.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_clocks.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_clocks.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_clocks_destruct.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_glass.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_glass_damage.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_glass_destruct.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_glass_in.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_glass_in.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_glass_in_half_d.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_hood.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_hood_damage.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_hood_destruct.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_regular.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_regular_damage.rvmat","sra_civilian\wheeled\hmmwv\hmmwv_regular_destruct.rvmat"}; + }; +}; + class HMMWV_M998A2_SOV_DES_EP1_DZ: HMMWV_DZE_Base { expansion = 1; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp index 3cb43d2ed..f460e9c01 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp @@ -18,4 +18,204 @@ class Ikarus_TK_CIV_EP1_DZE: Ikarus_TK_CIV_EP1 { class TransportMagazines {}; class TransportWeapons {}; supplyRadius = 1.8; +}; + +class Ikarus_White_DZE: Ikarus_DZE { + displayname = $STR_VEH_NAME_IKARUS_WHITE; + model = "\sra_civilian\wheeled\bus\bus_city.p3d"; + class AnimationSources + { + class HitGlass1 + { + hitpoint = "HitGlass1"; + raw = 1; + source = "Hit"; + }; + class HitGlass2: HitGlass1 + { + hitpoint = "HitGlass2"; + }; + class HitGlass3: HitGlass1 + { + hitpoint = "HitGlass3"; + }; + class HitGlass4: HitGlass1 + { + hitpoint = "HitGlass4"; + }; + class HitGlass5: HitGlass1 + { + hitpoint = "HitGlass5"; + }; + class HitGlass6: HitGlass1 + { + hitpoint = "HitGlass6"; + }; + class HitGlass7: HitGlass1 + { + hitpoint = "HitGlass7"; + }; + class HitGlass8: HitGlass1 + { + hitpoint = "HitGlass8"; + }; + class HitGlass9: HitGlass1 + { + hitpoint = "HitGlass9"; + }; + class HitGlass10: HitGlass1 + { + hitpoint = "HitGlass10"; + }; + class HitGlass11: HitGlass1 + { + hitpoint = "HitGlass11"; + }; + class HitGlass12: HitGlass1 + { + hitpoint = "HitGlass12"; + }; + class HitLFWheel + { + hitpoint = "HitLFWheel"; + raw = 1; + source = "Hit"; + }; + class HitRFWheel: HitLFWheel + { + hitpoint = "HitRFWheel"; + }; + class HitLBWheel: HitLFWheel + { + hitpoint = "HitLBWheel"; + }; + class HitRBWheel: HitLFWheel + { + hitpoint = "HitRBWheel"; + }; + }; + class Damage + { + tex[] = {}; + mat[] = {"sra_civilian\wheeled\bus\detailmapy\bus_city_ext.rvmat","sra_civilian\wheeled\bus\detailmapy\bus_city_ext.rvmat","sra_civilian\wheeled\bus\detailmapy\bus_city_ext_destruct.rvmat","sra_civilian\wheeled\bus\detailmapy\bus_city_int.rvmat","sra_civilian\wheeled\bus\detailmapy\bus_city_int.rvmat","sra_civilian\wheeled\bus\detailmapy\bus_city_int_destruct.rvmat","sra_civilian\wheeled\data\auta_skla.rvmat","sra_civilian\wheeled\data\auta_skla_damage.rvmat","sra_civilian\wheeled\data\auta_skla_damage.rvmat","sra_civilian\wheeled\data\auta_skla_in.rvmat","sra_civilian\wheeled\data\auta_skla_in_damage.rvmat","sra_civilian\wheeled\data\auta_skla_in_damage.rvmat"}; + }; + class HitPoints + { + class HitGlass1 + { + armor = 0.1; + material = -1; + name = "sklo_p"; + passThrough = 0; + visual = "sklo_p"; + }; + class HitGlass2: HitGlass1 + { + name = "sklo_p1"; + visual = "sklo_p1"; + }; + class HitGlass3: HitGlass1 + { + name = "sklo_p2"; + visual = "sklo_p2"; + }; + class HitGlass4: HitGlass1 + { + name = "sklo_p3"; + visual = "sklo_p3"; + }; + class HitGlass5: HitGlass1 + { + name = "sklo_p4"; + visual = "sklo_p4"; + }; + class HitGlass6: HitGlass1 + { + name = "sklo_p5"; + visual = "sklo_p5"; + }; + class HitGlass7: HitGlass1 + { + name = "sklo_l1"; + visual = "sklo_l1"; + }; + class HitGlass8: HitGlass1 + { + name = "sklo_l2"; + visual = "sklo_l2"; + }; + class HitGlass9: HitGlass1 + { + name = "sklo_l3"; + visual = "sklo_l3"; + }; + class HitGlass10: HitGlass1 + { + name = "sklo_l4"; + visual = "sklo_l4"; + }; + class HitGlass11: HitGlass1 + { + name = "sklo_l5"; + visual = "sklo_l5"; + }; + class HitGlass12: HitGlass1 + { + name = "sklo_z"; + visual = "sklo_z"; + }; + class HitRGlass: HitGlass1{}; + class HitLGlass: HitGlass1{}; + class HitBody + { + armor = 1; + material = -1; + name = "karoserie"; + passThrough = 1; + visual = "karoserie"; + }; + class HitFuel + { + armor = 0.3; + material = -1; + name = "palivo"; + passThrough = 0.5; + visual = "palivo"; + }; + class HitEngine + { + armor = 0.4; + material = -1; + name = "motor"; + passThrough = 0.2; + visual = "motor"; + }; + class HitLFWheel + { + armor = 0.15; + material = -1; + name = "levy predni tlumic"; + passThrough = 0.3; + visual = "levy predni"; + }; + class HitLBWheel: HitLFWheel + { + name = "levy zadni tlumic"; + visual = "levy zadni"; + }; + class HitRFWheel: HitLFWheel + { + name = "pravy predni tlumic"; + visual = "pravy predni"; + }; + class HitRBWheel: HitLFWheel + { + name = "pravy zadni tlumic"; + visual = "pravy zadni"; + }; + class HitLF2Wheel: HitLFWheel{}; + class HitRF2Wheel: HitLFWheel{}; + class HitLMWheel: HitLFWheel{}; + class HitRMWheel: HitLFWheel{}; + }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/datsun.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/datsun.hpp index 739659f1e..1b4d9fbc5 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/datsun.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/datsun.hpp @@ -16,6 +16,117 @@ class datsun1_civil_1_open_DZE: datsun1_civil_1_open { ItemARM[] = {"Pickup_PK_GUE_DZE",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; + +class datsun1_green_open_DZE: datsun1_civil_1_open_DZE { + displayname = $STR_VEH_NAME_PICKUP_GREEN; + model = "\sra_civilian\wheeled\datsun\datsun1_civil_3_open"; + class Damage + { + tex[] = {}; + mat[] = {"sra_civilian\wheeled\datsun\datsun_trup3.rvmat","sra_civilian\wheeled\datsun\datsun_trup3.rvmat","sra_civilian\wheeled\datsun\datsun_trup_destruct.rvmat","sra_civilian\wheeled\datsun\datsun_interier.rvmat","sra_civilian\wheeled\datsun\datsun_interier.rvmat","sra_civilian\wheeled\datsun\datsun_interier_destruct.rvmat","sra_civilian\wheeled\datsun\datsun_pristroje.rvmat","sra_civilian\wheeled\datsun\datsun_pristroje.rvmat","sra_civilian\wheeled\datsun\datsun_pristroje_destruct.rvmat","sra_civilian\wheeled\data\auta_skla.rvmat","sra_civilian\wheeled\data\auta_skla_damage.rvmat","sra_civilian\wheeled\data\auta_skla_damage.rvmat","sra_civilian\wheeled\data\auta_skla_in.rvmat","sra_civilian\wheeled\data\auta_skla_in_damage.rvmat","sra_civilian\wheeled\data\auta_skla_in_damage.rvmat"}; + }; + + class AnimationSources + { + class HitLFWheel + { + hitpoint = "HitLFWheel"; + raw = 1; + source = "Hit"; + }; + class HitRFWheel: HitLFWheel + { + hitpoint = "HitRFWheel"; + }; + class HitLBWheel: HitLFWheel + { + hitpoint = "HitLBWheel"; + }; + class HitRBWheel: HitLFWheel + { + hitpoint = "HitRBWheel"; + }; + class HitGlass1 + { + hitpoint = "HitGlass1"; + raw = 1; + source = "Hit"; + }; + class HitGlass2: HitGlass1 + { + hitpoint = "HitGlass2"; + }; + }; + class HitPoints + { + class HitGlass1 + { + armor = 0.1; + material = -1; + name = "glass1"; + passThrough = 0; + visual = "glass1"; + }; + class HitGlass2: HitGlass1 + { + name = "glass2"; + visual = "glass2"; + }; + class HitRGlass: HitGlass1{}; + class HitLGlass: HitGlass1{}; + class HitBody: HitGlass1 + { + armor = 1; + name = "karoserie"; + passThrough = 1; + visual = ""; + }; + class HitFuel: HitGlass1 + { + armor = 0.3; + name = "palivo"; + passThrough = 0.5; + visual = ""; + }; + class HitEngine: HitGlass1 + { + armor = 0.4; + name = "motor"; + passThrough = 0.2; + visual = ""; + }; + class HitLFWheel + { + armor = 0.15; + material = -1; + name = "levy predni tlumic"; + passThrough = 0.3; + visual = ""; + }; + class HitLBWheel: HitLFWheel + { + name = "levy zadni tlumic"; + }; + class HitRFWheel: HitLFWheel + { + name = "pravy predni tlumic"; + }; + class HitRBWheel: HitLFWheel + { + name = "pravy zadni tlumic"; + }; + class HitLF2Wheel: HitLFWheel{}; + class HitRF2Wheel: HitLFWheel{}; + class HitLMWheel: HitLFWheel{}; + class HitRMWheel: HitLFWheel{}; + }; + + class Upgrades { + ItemORP[] = {"datsun1_green_open_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + }; +}; + class datsun1_civil_2_covered; class datsun1_civil_2_covered_DZE: datsun1_civil_2_covered { displayname = $STR_VEH_NAME_PICKUP_COVERED_TAN; @@ -34,6 +145,117 @@ class datsun1_civil_2_covered_DZE: datsun1_civil_2_covered { ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; + +class datsun1_red_covered_DZE: datsun1_civil_2_covered_DZE { + displayname = $STR_VEH_NAME_PICKUP_COVERED_RED; + model = "\sra_civilian\wheeled\datsun\datsun1_civil_2_covered"; + + class AnimationSources + { + class HitLFWheel + { + hitpoint = "HitLFWheel"; + raw = 1; + source = "Hit"; + }; + class HitRFWheel: HitLFWheel + { + hitpoint = "HitRFWheel"; + }; + class HitLBWheel: HitLFWheel + { + hitpoint = "HitLBWheel"; + }; + class HitRBWheel: HitLFWheel + { + hitpoint = "HitRBWheel"; + }; + class HitGlass1 + { + hitpoint = "HitGlass1"; + raw = 1; + source = "Hit"; + }; + class HitGlass2: HitGlass1 + { + hitpoint = "HitGlass2"; + }; + }; + class HitPoints + { + class HitGlass1 + { + armor = 0.1; + material = -1; + name = "glass1"; + passThrough = 0; + visual = "glass1"; + }; + class HitGlass2: HitGlass1 + { + name = "glass2"; + visual = "glass2"; + }; + class HitRGlass: HitGlass1{}; + class HitLGlass: HitGlass1{}; + class HitBody: HitGlass1 + { + armor = 1; + name = "karoserie"; + passThrough = 1; + visual = ""; + }; + class HitFuel: HitGlass1 + { + armor = 0.3; + name = "palivo"; + passThrough = 0.5; + visual = ""; + }; + class HitEngine: HitGlass1 + { + armor = 0.4; + name = "motor"; + passThrough = 0.2; + visual = ""; + }; + class HitLFWheel + { + armor = 0.15; + material = -1; + name = "levy predni tlumic"; + passThrough = 0.3; + visual = ""; + }; + class HitLBWheel: HitLFWheel + { + name = "levy zadni tlumic"; + }; + class HitRFWheel: HitLFWheel + { + name = "pravy predni tlumic"; + }; + class HitRBWheel: HitLFWheel + { + name = "pravy zadni tlumic"; + }; + class HitLF2Wheel: HitLFWheel{}; + class HitRF2Wheel: HitLFWheel{}; + class HitLMWheel: HitLFWheel{}; + class HitRMWheel: HitLFWheel{}; + }; + + class Damage + { + tex[] = {}; + mat[] = {"sra_civilian\wheeled\datsun\datsun_addons.rvmat","sra_civilian\wheeled\datsun\datsun_addons.rvmat","sra_civilian\wheeled\datsun\datsun_addons_destruct.rvmat","sra_civilian\wheeled\datsun\datsun_trup2.rvmat","sra_civilian\wheeled\datsun\datsun_trup2.rvmat","sra_civilian\wheeled\datsun\datsun_trup_destruct.rvmat","sra_civilian\wheeled\datsun\datsun_interier.rvmat","sra_civilian\wheeled\datsun\datsun_interier.rvmat","sra_civilian\wheeled\datsun\datsun_interier_destruct.rvmat","sra_civilian\wheeled\datsun\datsun_pristroje.rvmat","sra_civilian\wheeled\datsun\datsun_pristroje.rvmat","sra_civilian\wheeled\datsun\datsun_pristroje_destruct.rvmat","sra_civilian\wheeled\data\auta_skla.rvmat","sra_civilian\wheeled\data\auta_skla_damage.rvmat","sra_civilian\wheeled\data\auta_skla_damage.rvmat","sra_civilian\wheeled\data\auta_skla_in.rvmat","sra_civilian\wheeled\data\auta_skla_in_damage.rvmat","sra_civilian\wheeled\data\auta_skla_in_damage.rvmat"}; + }; + + class Upgrades { + ItemORP[] = {"datsun1_red_covered_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; + }; +}; + class datsun1_civil_3_open; class datsun1_civil_3_open_DZE: datsun1_civil_3_open { displayname = $STR_VEH_NAME_PICKUP_GREY; @@ -76,6 +298,30 @@ class datsun1_civil_1_open_DZE1: datsun1_civil_1_open_DZE { ItemARM[] = {"Pickup_PK_GUE_DZE1",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; + +class datsun1_green_open_DZE1: datsun1_green_open_DZE { + original = "datsun1_green_open_DZE"; + maxspeed = 150; // max engine limit 125-130 + terrainCoef = 1.8; + class HitPoints: HitPoints { + class HitLFWheel; + class HitLBWheel; + class HitRFWheel; + class HitRBWheel; + class HitFuel; + class HitEngine; + class HitGlass1; + class HitGlass2; + class HitGlass3; + class HitGlass4; + }; + + class Upgrades { + ItemAVE[] = {"datsun1_green_open_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE1",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + }; +}; + class datsun1_civil_2_covered_DZE1: datsun1_civil_2_covered_DZE { original = "datsun1_civil_2_covered_DZE"; maxspeed = 150; // car 100 @@ -98,6 +344,29 @@ class datsun1_civil_2_covered_DZE1: datsun1_civil_2_covered_DZE { ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE1",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; + +class datsun1_red_covered_DZE1: datsun1_red_covered_DZE { + original = "datsun1_red_covered_DZE"; + maxspeed = 150; // car 100 + terrainCoef = 1.8; + class HitPoints: HitPoints { + class HitLFWheel; + class HitLBWheel; + class HitRFWheel; + class HitRBWheel; + class HitFuel; + class HitEngine; + class HitGlass1; + class HitGlass2; + class HitGlass3; + class HitGlass4; + }; + + class Upgrades { + ItemAVE[] = {"datsun1_red_covered_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}}; + }; +}; + class datsun1_civil_3_open_DZE1: datsun1_civil_3_open_DZE { original = "datsun1_civil_3_open_DZE"; maxspeed = 150; // car 100 @@ -171,6 +440,57 @@ class datsun1_civil_1_open_DZE2: datsun1_civil_1_open_DZE1 { ItemARM[] = {"Pickup_PK_GUE_DZE2",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; + +class datsun1_green_open_DZE2: datsun1_green_open_DZE1 { + armor = 55; // car 20 + damageResistance = 0.02099; + class HitPoints: HitPoints { + class HitLFWheel: HitLFWheel { + armor = 0.3; + }; + class HitLBWheel: HitLBWheel { + armor = 0.3; + }; + class HitRFWheel: HitRFWheel { + armor = 0.3; + }; + class HitRBWheel: HitRBWheel { + armor = 0.3; + }; + class HitFuel { + armor = 0.28; + material = -1; + name = "palivo"; + visual = ""; + passThrough = 1; + }; + class HitEngine { + armor = 1; + material = -1; + name = "motor"; + visual = ""; + passThrough = 1; + }; + class HitGlass1: HitGlass1 { + armor = 0.1; + }; + class HitGlass2: HitGlass2 { + armor = 0.1; + }; + class HitGlass3: HitGlass3 { + armor = 0.1; + }; + class HitGlass4: HitGlass4 { + armor = 0.1; + }; + }; + + class Upgrades { + ItemLRK[] = {"datsun1_green_open_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE2",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + }; +}; + class datsun1_civil_2_covered_DZE2: datsun1_civil_2_covered_DZE1 { armor = 55; // car 20 damageResistance = 0.02099; @@ -220,6 +540,56 @@ class datsun1_civil_2_covered_DZE2: datsun1_civil_2_covered_DZE1 { ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE2",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; + +class datsun1_red_covered_DZE2: datsun1_red_covered_DZE1 { + armor = 55; // car 20 + damageResistance = 0.02099; + class HitPoints: HitPoints { + class HitLFWheel: HitLFWheel { + armor = 0.3; + }; + class HitLBWheel: HitLBWheel { + armor = 0.3; + }; + class HitRFWheel: HitRFWheel { + armor = 0.3; + }; + class HitRBWheel: HitRBWheel { + armor = 0.3; + }; + class HitFuel { + armor = 0.28; + material = -1; + name = "palivo"; + visual = ""; + passThrough = 1; + }; + class HitEngine { + armor = 1; + material = -1; + name = "motor"; + visual = ""; + passThrough = 1; + }; + class HitGlass1: HitGlass1 { + armor = 0.1; + }; + class HitGlass2: HitGlass2 { + armor = 0.1; + }; + class HitGlass3: HitGlass3 { + armor = 0.1; + }; + class HitGlass4: HitGlass4 { + armor = 0.1; + }; + }; + + class Upgrades { + ItemLRK[] = {"datsun1_red_covered_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}}; + }; +}; + class datsun1_civil_3_open_DZE2: datsun1_civil_3_open_DZE1 { armor = 55; // car 20 damageResistance = 0.02099; @@ -281,6 +651,16 @@ class datsun1_civil_1_open_DZE3: datsun1_civil_1_open_DZE2 { ItemARM[] = {"Pickup_PK_GUE_DZE3",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; +class datsun1_green_open_DZE3: datsun1_green_open_DZE2 { + transportMaxWeapons = 20; // car 10 + transportMaxMagazines = 100; // car 50 + transportmaxbackpacks = 4; // car 2 + + class Upgrades { + ItemTNK[] = {"datsun1_green_open_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE3",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + }; +}; class datsun1_civil_2_covered_DZE3: datsun1_civil_2_covered_DZE2 { transportMaxWeapons = 20; // car 10 transportMaxMagazines = 100; // car 50 @@ -291,6 +671,15 @@ class datsun1_civil_2_covered_DZE3: datsun1_civil_2_covered_DZE2 { ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE3",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; +class datsun1_red_covered_DZE3: datsun1_red_covered_DZE2 { + transportMaxWeapons = 20; // car 10 + transportMaxMagazines = 100; // car 50 + transportmaxbackpacks = 4; // car 2 + + class Upgrades { + ItemTNK[] = {"datsun1_red_covered_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}}; + }; +}; class datsun1_civil_3_open_DZE3: datsun1_civil_3_open_DZE2 { transportMaxWeapons = 20; // car 10 transportMaxMagazines = 100; // car 50 @@ -310,6 +699,13 @@ class datsun1_civil_1_open_DZE4: datsun1_civil_1_open_DZE3 { ItemARM[] = {"Pickup_PK_GUE_DZE4",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; +class datsun1_green_open_DZE4: datsun1_green_open_DZE3 { + fuelCapacity = 210; // car 100 + + class Upgrades { + ItemARM[] = {"Pickup_PK_GUE_DZE4",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + }; +}; class datsun1_civil_2_covered_DZE4: datsun1_civil_2_covered_DZE3 { fuelCapacity = 210; // car 100 @@ -317,6 +713,11 @@ class datsun1_civil_2_covered_DZE4: datsun1_civil_2_covered_DZE3 { ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE4",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; +class datsun1_red_covered_DZE4: datsun1_red_covered_DZE3 { + fuelCapacity = 210; // car 100 + + class Upgrades {}; +}; class datsun1_civil_3_open_DZE4: datsun1_civil_3_open_DZE3 { fuelCapacity = 210; // car 100 diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 7b455856e..e4d0e2691 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -8074,6 +8074,9 @@ Humvee Militar Humvee (Waldtarn) + + Hummer + HMMWV SOV (Desert) Хамви SOV (Пустынный) @@ -8139,6 +8142,11 @@ Пикап (синий) Pick-up (blau) + + Pick-up (green) + Пикап (зеленая) + Pick-up (grün) + Pick-up (grey) Пикап (серый) @@ -8172,6 +8180,10 @@ Bus (Blue) Bus (Blau) + + Bus (White) + Bus (Weiß) + Kamaz open (Woodland) Камаз открытый (Лесной камуфляж) @@ -8618,17 +8630,16 @@ Sedan Taxi Sedan Такси - - Kombilimousine - Old hatchback - Utilitaria - Liftback - Voiture avec hayon - Starý hatchback - Старый хэтчбек - Stary hatchback - Kupé + + Old hatchback (yellow) + Kombilimousine (gelb) + Старый хэтчбек (желтый) + + Old hatchback (red) + Kombilimousine (rot) + Старый хэтчбек (красный) + BTR-40 DSHKM (Green) BTR-40 DSHKM (Зеленый) diff --git a/SQF/dayz_server/system/dynamic_vehicle.sqf b/SQF/dayz_server/system/dynamic_vehicle.sqf index 0068b9750..a3c99b5ae 100644 --- a/SQF/dayz_server/system/dynamic_vehicle.sqf +++ b/SQF/dayz_server/system/dynamic_vehicle.sqf @@ -120,6 +120,10 @@ AllowedVehiclesList = [ ["ATV_CIV_Yellow_CP_DZE",_Ratio1], ["ATV_CIV_Purple_CP_DZE",_Ratio1], ["ATV_CIV_Black_CP_DZE",_Ratio1], + ["Ikarus_White_DZE",_Ratio1], + ["car_hatchback_red_DZE",_Ratio1], + ["datsun1_red_covered_DZE",_Ratio1], + ["datsun1_green_open_DZE",_Ratio1], ["Octavia_ACR_DZE",_Ratio1], ["T810A_ACR_DZE",_Ratio1], ["T810A_ACR_DES_DZE",_Ratio1], @@ -180,7 +184,8 @@ AllowedVehiclesList = [ ["BAF_Jackal2_L2A1_D_DZE",_Ratio1], ["BAF_Jackal2_L2A1_W_DZE",_Ratio1], ["BAF_Jackal2_GMG_D_DZE",_Ratio1], - ["BAF_Jackal2_GMG_W_DZE",_Ratio1] + ["BAF_Jackal2_GMG_W_DZE",_Ratio1], + ["Hummer_DZE",_Ratio1] ]; // There are no good spawn locations for C130 on Namalsk or Caribou Frontier.