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

Merge pull request #4 from EpochModTeam/master

Browse Source 
Update fork
This commit is contained in:
W0LF
2021-03-02 17:30:34 +03:00
committed by GitHub
parent 6a1ececcf4 af86a51e92
commit c8c96fda13
6 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/Configs/CfgVehicles/Buildables/Doors.hpp
View File

@@ -1120,7 +1120,7 @@ class CinderGarageOpenTopLocked_DZ: CinderWallDoorLocked_DZ_Base {
class CinderDoorHatch_DZ: CinderWallDoor_DZ_Base {
scope = 2;
model = "\z\addons\dayz_epoch_v\base_building\cinder\cinder_door_window\cinder_door_hatch.p3d";
model = "\z\addons\dayz_epoch_v\base_building\cinder\cinder_door_window\cinderdoor_hatch.p3d";
displayName = $STR_EPOCH_BLOCKDOOR_HATCH;
GhostPreview = "CinderDoorHatch_Preview_DZ";
upgradeBuilding[] = {"CinderDoorHatchLocked_DZ",{},{{"ItemComboLock",1}}};

2
SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp
View File

@@ -132,6 +132,8 @@ class Survivor2_DZ : Survivor_DZ {
scope = 2;
displayName = $STR_CHAR_1;
model = "\dayz\characters\man_survivor";
hiddenSelections[] = {"camo"};
hiddenSelectionsTextures[] = {"\z\addons\dayz_epoch_u\clothes\male\Data\frost_1_co.paa"};
};
class Rocket_DZ: SoldierLight_Base_DZ { //BAF_Soldier_Officer_W

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

@@ -1,11 +1,13 @@
private ["_part","_cancel","_color","_string","_handle","_damage","_cmpt","_vehicle","_hitpoints","_damagePercent","_configVeh","_hitpoint","_hits"];
_vehicle = _this select 3;
{dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = [];
dayz_myCursorTarget = _vehicle;
_hitpoints = _vehicle call vehicle_getHitpoints;
if (count _hitpoints < 1) exitwith {};
{dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = [];
{
_hitpoint = _x;
_hits = [_vehicle,_hitpoint] call object_getHit;
@@ -49,9 +51,7 @@ _hitpoints = _vehicle call vehicle_getHitpoints;
} count _hitpoints;
if (count _hitpoints > 0) then {
// Localized in A2OA\Expansion\dta\languagecore
_cancel = dayz_myCursorTarget addAction [localize "str_action_cancel_action", "\z\addons\dayz_code\actions\repair_cancel.sqf","repair", 0, true, false];
s_player_repairActions set [count s_player_repairActions,_cancel];
s_player_repair_crtl = 1;
};

6
SQF/dayz_code/actions/salvage_vehicle.sqf
View File

@@ -2,7 +2,6 @@ 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 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;};
@@ -10,6 +9,9 @@ if (_PlayerNear) exitWith {dayz_myCursorTarget = objNull; localize "str_pickup_l
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";
_is6WheelType = false;
@@ -25,7 +27,7 @@ _NoGlassArray = ["HitGlass1","HitGlass2","HitGlass3","HitGlass4","HitGlass5","Hi
_RemovedPartsArray = ["motor","HitLF2Wheel","HitRF2Wheel","HitBody","HitMissiles","HitHull","HitVRotor","HitFuel","HitEngine"];
if (!_is6WheelType) then {
if ((_vehicle isKindOf "ATV_Base_EP1") || {_isMotorcycle}) then {
if ((_vehicle isKindOf "ATV_Base_EP1") || _isMotorcycle) then {
_hitpoints = _hitpoints - _NoGlassArray;
if (_isMotorcycle) then {

12
SQF/dayz_code/compile/player_zombieAttack.sqf
View File

@@ -117,14 +117,10 @@ _zPos = getPosASL _unit;
// compute damage for vehicle and/or the player
if (_isVehicle) then {
if ((_unit distance player) < (3.3 * 2)) then {
_hpList = _vehicle call vehicle_getHitpoints;
_hp = _hpList call BIS_fnc_selectRandom;
_wound = getText(configFile >> "cfgVehicles" >> (typeOf _vehicle) >> "HitPoints" >> _hp >> "name");
_damage = random 0.08;
_chance = round(random 12);
if ((_chance % 4) == 0) then {
_openVehicles = ["ATV_Base_EP1", "Motorcycle", "Bicycle"];
_openVehicles = ["ATV_Base_EP1", "Motorcycle", "Bicycle", "CSJ_GyroP", "CSJ_GyroC"];
{
if (_vehicle isKindOf _x) exitWith {
player action ["eject", _vehicle];
@@ -132,6 +128,12 @@ if (_isVehicle) then {
} count _openVehicles;
};
_hpList = _vehicle call vehicle_getHitpoints;
if (count _hpList < 1) exitwith {};
_hp = _hpList call BIS_fnc_selectRandom;
_wound = getText(configFile >> "cfgVehicles" >> (typeOf _vehicle) >> "HitPoints" >> _hp >> "name");
_damage = random 0.08;
if (_wound in [ "glass1", "glass2", "glass3", "glass4", "glass5", "glass6" ]) then {
_dam = _vehicle getHit _wound;
_total = (_dam + _damage);

4
SQF/dayz_server/system/server_monitor.sqf
View File

@@ -287,7 +287,7 @@ if ((playersNumber west + playersNumber civilian) == 0) exitWith {
};
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object]; //Monitor the object
};
} count _myArray;
} foreach _myArray;
//spawn vehicles
{
@@ -379,7 +379,7 @@ if ((playersNumber west + playersNumber civilian) == 0) exitWith {
_object enableSimulation true;
_object setVelocity [0,0,1];
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object]; //Monitor the object
} count _VehicleQueue;
} foreach _VehicleQueue;
diag_log ("HIVE: Streamed " + str((count _myArray) -_vQty) + " Objects and " + str(_vQty) + " Vehicles.");