From c4e5b2a56ba260ef6aa3251253ccbe7134278eb6 Mon Sep 17 00:00:00 2001 From: AirwavesMan Date: Mon, 29 Mar 2021 08:58:15 +0200 Subject: [PATCH 1/5] Fix seat number of new vehicles --- SQF/dayz_code/Configs/CfgVehicles/Boat/Submarine.hpp | 4 ++-- SQF/dayz_code/Configs/CfgVehicles/Car/Jeep.hpp | 2 +- SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp | 2 +- SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/Submarine.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/Submarine.hpp index 527bf737a..6335d08d1 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Boat/Submarine.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/Submarine.hpp @@ -52,7 +52,7 @@ class Submarine_DZE_base: Submarine //crew getInAction = GetInLow; getOutAction = GetOutLow; - transportSoldier = 3; + transportSoldier = 2; typicalCargo[] = {RU_Soldier,RU_Soldier_AR,RU_Soldier_AR}; driverAction = PBX_Driver; cargoAction[] = {Truck_Cargo04,Truck_Cargo01,Truck_Cargo01}; @@ -132,7 +132,7 @@ class Submarine_DZE_base: Submarine { armor = 0.85; material = -1; - name = "telo"; + name = "karoserie"; visual = "zbytek"; passThrough = 1; }; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Jeep.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Jeep.hpp index 8340f8f3b..910643d2c 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Jeep.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Jeep.hpp @@ -5,7 +5,7 @@ class Jeep_base: epoch_car model = "\z\addons\dayz_epoch_v\vehicles\jeep\h4_jeep"; picture = "\dayz_epoch_c\icons\vehicles\jeep.paa"; armor = 25; - transportsoldier = 2; + transportsoldier = 1; transportmaxweapons = 15; transportmaxmagazines = 50; transportmaxbackpacks = 5; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp index 89c9a2971..db631d086 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp @@ -4,7 +4,7 @@ class Mini_Cooper_base: epoch_car displayname = "Mini Cooper"; model = "\z\addons\dayz_epoch_v\vehicles\mini\dze_cooper_s"; picture = "\dayz_epoch_c\icons\vehicles\minicooper.paa"; - transportsoldier = 2; + transportsoldier = 1; fuelCapacity = 100; class HitPoints; class HitLFWheel; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp index 01832a69e..41aba55c1 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp @@ -347,6 +347,7 @@ class V3S_Camper_DZE : V3S_RA_TK_GUE_EP1_DZE { displayname = "$STR_VEH_NAME_V3S_CAMPER"; armor = 40; damageResistance = 0.00231; + transportsoldier = 1; transportMaxWeapons = 10; transportMaxMagazines = 50; From e4458a24e3ef1b53116ec65804983db85ee7deb8 Mon Sep 17 00:00:00 2001 From: AirwavesMan Date: Mon, 29 Mar 2021 08:58:45 +0200 Subject: [PATCH 2/5] Fix removeAction for salvage and repair --- SQF/dayz_code/actions/repair_vehicle.sqf | 2 +- SQF/dayz_code/actions/salvage_vehicle.sqf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SQF/dayz_code/actions/repair_vehicle.sqf b/SQF/dayz_code/actions/repair_vehicle.sqf index bd6a3a6c6..dc45b5eef 100644 --- a/SQF/dayz_code/actions/repair_vehicle.sqf +++ b/SQF/dayz_code/actions/repair_vehicle.sqf @@ -2,11 +2,11 @@ private ["_part","_cancel","_color","_string","_handle","_damage","_cmpt","_vehi _vehicle = _this select 3; dayz_myCursorTarget = _vehicle; +{dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = []; _hitpoints = _vehicle call vehicle_getHitpoints; if (count _hitpoints < 1) exitwith {}; -{dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = []; { _hitpoint = _x; diff --git a/SQF/dayz_code/actions/salvage_vehicle.sqf b/SQF/dayz_code/actions/salvage_vehicle.sqf index 9c95ad8da..681461bef 100644 --- a/SQF/dayz_code/actions/salvage_vehicle.sqf +++ b/SQF/dayz_code/actions/salvage_vehicle.sqf @@ -2,15 +2,15 @@ private ["_isMotorcycle","_hits","_part","_color","_vehicle","_PlayerNear","_hit "_6WheelTypeArray","_NoGlassArray","_RemovedPartsArray","_damage","_cmpt","_configVeh","_damagePercent","_string","_handle","_cancel","_type"]; _vehicle = _this select 3; +dayz_myCursorTarget = _vehicle; +{dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = []; _PlayerNear = {isPlayer _x} count ((getPosATL _vehicle) nearEntities ["CAManBase", 12]) > 1; if (_PlayerNear) exitWith {dayz_myCursorTarget = objNull; localize "str_pickup_limit_5" call dayz_rollingMessages;}; -dayz_myCursorTarget = _vehicle; _hitpoints = _vehicle call vehicle_getHitpoints; if (count _hitpoints < 1) exitwith {}; -{dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = []; _type = typeOf _vehicle; _isMotorcycle = _vehicle isKindOf "Motorcycle"; From 90b76d4ed5ab6dc9b0869ec68d70f79e07fe31d4 Mon Sep 17 00:00:00 2001 From: AirwavesMan Date: Mon, 29 Mar 2021 17:26:19 +0200 Subject: [PATCH 3/5] Add isNull check --- SQF/dayz_code/actions/remove.sqf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SQF/dayz_code/actions/remove.sqf b/SQF/dayz_code/actions/remove.sqf index f9bdc26ad..618319a31 100644 --- a/SQF/dayz_code/actions/remove.sqf +++ b/SQF/dayz_code/actions/remove.sqf @@ -11,6 +11,9 @@ player removeAction s_player_deleteBuild; s_player_deleteBuild = 1; _obj = _this select 3; + +if (isNull _obj) exitWith {dayz_actionInProgress = false; systemChat localize "str_cursorTargetNotFound";}; + _objOwnerID = "0"; _isOwnerOfObj = false; From 932707200bec437369c7d4033ba436edaa02cd36 Mon Sep 17 00:00:00 2001 From: AirwavesMan Date: Mon, 29 Mar 2021 17:26:49 +0200 Subject: [PATCH 4/5] Correct armored bus seats --- SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp index 4ecd209e4..d91837633 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp @@ -256,7 +256,14 @@ class Ikarus_Armored_DZE: epoch_car transportMaxMagazines = 120; transportmaxbackpacks = 10; transportSoldier = 12; - hiddenselections[] = {"camo1"}; + driverAction = CityBus_Driver; + cargoAction[] = + { + Truck_Cargo03,Truck_Cargo01,Truck_Cargo04,Truck_Cargo01,Truck_Cargo01, + Truck_Cargo03,Truck_Cargo01,Truck_Cargo04,Truck_Cargo01,Truck_Cargo02, + Truck_Cargo02,Truck_Cargo01 + }; + hiddenselections[] = {"camo1"}; hiddenselectionstextures[]= { "z\addons\dayz_epoch_v\vehicles\citybus\data\citybus_ext_co.paa" From 094daa4a4a9e64af185399429116440be5d270d1 Mon Sep 17 00:00:00 2001 From: AirwavesMan Date: Mon, 29 Mar 2021 17:27:03 +0200 Subject: [PATCH 5/5] Correct cargoActions --- SQF/dayz_code/Configs/CfgVehicles/Car/Jeep.hpp | 2 +- SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp | 2 +- SQF/dayz_code/Configs/CfgVehicles/Helicopter/MTVRBird.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Jeep.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Jeep.hpp index 910643d2c..63a26fa14 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Jeep.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Jeep.hpp @@ -14,7 +14,7 @@ class Jeep_base: epoch_car terraincoef = 2.0; weapons[] = {minicarhorn}; driveraction = "HMMWV_Driver"; - cargoaction[] = {"Skodovka_Cargo01","suv_cargo02_ep1","Skodovka_Cargo01","suv_cargo02_ep1","Skodovka_Cargo012"}; + cargoaction[] = {"Skodovka_Cargo01"}; //class HitPoints; hiddenselectionstextures[]= { diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp index db631d086..983e5d1cb 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp @@ -20,7 +20,7 @@ class Mini_Cooper_base: epoch_car maxspeed = 110; weapons[] = {"SportCarHorn"}; driverAction = "Golf_Driver"; - cargoaction[] = {"Hatchback_Cargo01","suv_cargo02_ep1","Hatchback_Cargo01","suv_cargo02_ep1","Hatchback_Cargo01"}; + cargoaction[] = {"Hatchback_Cargo01"}; typicalcargo[] = {}; class TransportMagazines {}; class TransportWeapons {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/MTVRBird.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/MTVRBird.hpp index 2b3ff0739..d6927ba0d 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/MTVRBird.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/MTVRBird.hpp @@ -19,7 +19,7 @@ class MTVR_Bird_base: Helicopter damageResistance = 0.01039; cost = 100000; transportSoldier = 1; - cargoAction[] = {"Truck_Cargo01"}; + cargoAction[] = {"UH1Y_Cargo01"}; transportAmmo = 0; supplyRadius = 2.5; driverAction = "AH6j_Pilot_EP1";