W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 12:12:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12 from EpochModTeam/master

Browse Source 
update fork
This commit is contained in:
W0LF
2021-03-29 20:24:12 +03:00
committed by GitHub
parent 36336aed9a 094daa4a4a
commit 7334dd8622
9 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/Configs/CfgVehicles/Boat/Submarine.hpp
View File

@@ -52,7 +52,7 @@ class Submarine_DZE_base: Submarine
//crew //crew
getInAction = GetInLow; getInAction = GetInLow;
getOutAction = GetOutLow; getOutAction = GetOutLow;
transportSoldier = 3; transportSoldier = 2;
typicalCargo[] = {RU_Soldier,RU_Soldier_AR,RU_Soldier_AR}; typicalCargo[] = {RU_Soldier,RU_Soldier_AR,RU_Soldier_AR};
driverAction = PBX_Driver; driverAction = PBX_Driver;
cargoAction[] = {Truck_Cargo04,Truck_Cargo01,Truck_Cargo01}; cargoAction[] = {Truck_Cargo04,Truck_Cargo01,Truck_Cargo01};
@@ -132,7 +132,7 @@ class Submarine_DZE_base: Submarine
{ {
armor = 0.85; armor = 0.85;
material = -1; material = -1;
name = "telo"; name = "karoserie";
visual = "zbytek"; visual = "zbytek";
passThrough = 1; passThrough = 1;
}; };

7
SQF/dayz_code/Configs/CfgVehicles/Car/Ikarus.hpp
View File

@@ -256,6 +256,13 @@ class Ikarus_Armored_DZE: epoch_car
transportMaxMagazines = 120; transportMaxMagazines = 120;
transportmaxbackpacks = 10; transportmaxbackpacks = 10;
transportSoldier = 12; transportSoldier = 12;
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"}; hiddenselections[] = {"camo1"};
hiddenselectionstextures[]= hiddenselectionstextures[]=
{ {

4
SQF/dayz_code/Configs/CfgVehicles/Car/Jeep.hpp
View File

@@ -5,7 +5,7 @@ class Jeep_base: epoch_car
model = "\z\addons\dayz_epoch_v\vehicles\jeep\h4_jeep"; model = "\z\addons\dayz_epoch_v\vehicles\jeep\h4_jeep";
picture = "\dayz_epoch_c\icons\vehicles\jeep.paa"; picture = "\dayz_epoch_c\icons\vehicles\jeep.paa";
armor = 25; armor = 25;
transportsoldier = 2; transportsoldier = 1;
transportmaxweapons = 15; transportmaxweapons = 15;
transportmaxmagazines = 50; transportmaxmagazines = 50;
transportmaxbackpacks = 5; transportmaxbackpacks = 5;
@@ -14,7 +14,7 @@ class Jeep_base: epoch_car
terraincoef = 2.0; terraincoef = 2.0;
weapons[] = {minicarhorn}; weapons[] = {minicarhorn};
driveraction = "HMMWV_Driver"; driveraction = "HMMWV_Driver";
cargoaction[] = {"Skodovka_Cargo01","suv_cargo02_ep1","Skodovka_Cargo01","suv_cargo02_ep1","Skodovka_Cargo012"}; cargoaction[] = {"Skodovka_Cargo01"};
//class HitPoints; //class HitPoints;
hiddenselectionstextures[]= hiddenselectionstextures[]=
{ {

4
SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp
View File

@@ -4,7 +4,7 @@ class Mini_Cooper_base: epoch_car
displayname = "Mini Cooper"; displayname = "Mini Cooper";
model = "\z\addons\dayz_epoch_v\vehicles\mini\dze_cooper_s"; model = "\z\addons\dayz_epoch_v\vehicles\mini\dze_cooper_s";
picture = "\dayz_epoch_c\icons\vehicles\minicooper.paa"; picture = "\dayz_epoch_c\icons\vehicles\minicooper.paa";
transportsoldier = 2; transportsoldier = 1;
fuelCapacity = 100; fuelCapacity = 100;
class HitPoints; class HitPoints;
class HitLFWheel; class HitLFWheel;
@@ -20,7 +20,7 @@ class Mini_Cooper_base: epoch_car
maxspeed = 110; maxspeed = 110;
weapons[] = {"SportCarHorn"}; weapons[] = {"SportCarHorn"};
driverAction = "Golf_Driver"; driverAction = "Golf_Driver";
cargoaction[] = {"Hatchback_Cargo01","suv_cargo02_ep1","Hatchback_Cargo01","suv_cargo02_ep1","Hatchback_Cargo01"}; cargoaction[] = {"Hatchback_Cargo01"};
typicalcargo[] = {}; typicalcargo[] = {};
class TransportMagazines {}; class TransportMagazines {};
class TransportWeapons {}; class TransportWeapons {};

1
SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp
View File

@@ -347,6 +347,7 @@ class V3S_Camper_DZE : V3S_RA_TK_GUE_EP1_DZE {
displayname = "$STR_VEH_NAME_V3S_CAMPER"; displayname = "$STR_VEH_NAME_V3S_CAMPER";
armor = 40; armor = 40;
damageResistance = 0.00231; damageResistance = 0.00231;
transportsoldier = 1;
transportMaxWeapons = 10; transportMaxWeapons = 10;
transportMaxMagazines = 50; transportMaxMagazines = 50;

2
SQF/dayz_code/Configs/CfgVehicles/Helicopter/MTVRBird.hpp
View File

@@ -19,7 +19,7 @@ class MTVR_Bird_base: Helicopter
damageResistance = 0.01039; damageResistance = 0.01039;
cost = 100000; cost = 100000;
transportSoldier = 1; transportSoldier = 1;
cargoAction[] = {"Truck_Cargo01"}; cargoAction[] = {"UH1Y_Cargo01"};
transportAmmo = 0; transportAmmo = 0;
supplyRadius = 2.5; supplyRadius = 2.5;
driverAction = "AH6j_Pilot_EP1"; driverAction = "AH6j_Pilot_EP1";

3
SQF/dayz_code/actions/remove.sqf
View File

@@ -11,6 +11,9 @@ player removeAction s_player_deleteBuild;
s_player_deleteBuild = 1; s_player_deleteBuild = 1;
_obj = _this select 3; _obj = _this select 3;
if (isNull _obj) exitWith {dayz_actionInProgress = false; systemChat localize "str_cursorTargetNotFound";};
_objOwnerID = "0"; _objOwnerID = "0";
_isOwnerOfObj = false; _isOwnerOfObj = false;

2
SQF/dayz_code/actions/repair_vehicle.sqf
View File

@@ -2,11 +2,11 @@ private ["_part","_cancel","_color","_string","_handle","_damage","_cmpt","_vehi
_vehicle = _this select 3; _vehicle = _this select 3;
dayz_myCursorTarget = _vehicle; dayz_myCursorTarget = _vehicle;
{dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = [];
_hitpoints = _vehicle call vehicle_getHitpoints; _hitpoints = _vehicle call vehicle_getHitpoints;
if (count _hitpoints < 1) exitwith {}; if (count _hitpoints < 1) exitwith {};
{dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = [];
{ {
_hitpoint = _x; _hitpoint = _x;

4
SQF/dayz_code/actions/salvage_vehicle.sqf
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"]; "_6WheelTypeArray","_NoGlassArray","_RemovedPartsArray","_damage","_cmpt","_configVeh","_damagePercent","_string","_handle","_cancel","_type"];
_vehicle = _this select 3; _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; _PlayerNear = {isPlayer _x} count ((getPosATL _vehicle) nearEntities ["CAManBase", 12]) > 1;
if (_PlayerNear) exitWith {dayz_myCursorTarget = objNull; localize "str_pickup_limit_5" call dayz_rollingMessages;}; if (_PlayerNear) exitWith {dayz_myCursorTarget = objNull; localize "str_pickup_limit_5" call dayz_rollingMessages;};
dayz_myCursorTarget = _vehicle;
_hitpoints = _vehicle call vehicle_getHitpoints; _hitpoints = _vehicle call vehicle_getHitpoints;
if (count _hitpoints < 1) exitwith {}; if (count _hitpoints < 1) exitwith {};
{dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = [];
_type = typeOf _vehicle; _type = typeOf _vehicle;
_isMotorcycle = _vehicle isKindOf "Motorcycle"; _isMotorcycle = _vehicle isKindOf "Motorcycle";