Merge pull request #12 from EpochModTeam/master

update fork
This commit is contained in:
W0LF
2021-03-29 20:24:12 +03:00
committed by GitHub
9 changed files with 22 additions and 11 deletions

View File

@@ -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;
};

View File

@@ -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"

View File

@@ -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;
@@ -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[]=
{

View File

@@ -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;
@@ -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 {};

View File

@@ -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;

View File

@@ -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";

View File

@@ -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;

View File

@@ -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;

View File

@@ -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";