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

Merge pull request #7 from EpochModTeam/master

Browse Source 
update fork
This commit is contained in:
W0LF
2021-01-23 15:50:32 +03:00
committed by GitHub
parent 02eb90bb08 1f80806b54
commit ab4bd3773d
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp
View File

@@ -5,4 +5,15 @@ class AT5LauncherSingle: AT5Launcher
{ {
magazines[] = {"8Rnd_AT5_BMP2","5Rnd_AT5_BRDM2"}; magazines[] = {"8Rnd_AT5_BMP2","5Rnd_AT5_BRDM2"};
reloadTime = 30; reloadTime = 30;
};
class M240_veh;
class pook_M60_side: M240_veh
{
magazines[] = {"pook_250Rnd_762x51","100Rnd_762x51_M240","200Rnd_762x51_M240","460Rnd_762x51_M240_ACR"};
};
class pook_M60_dual: pook_M60_side
{
magazines[] = {"pook_1300Rnd_762x51_M60"};
}; };

4
SQF/dayz_code/actions/siphonFuel.sqf
View File

@@ -9,10 +9,10 @@ _vehicle = _this select 3;
player removeAction s_player_siphonfuel; player removeAction s_player_siphonfuel;
_hasHose = "equip_hose" in magazines player; _hasHose = "equip_hose" in magazines player;
if (!_hasHose) exitWith {localize "str_siphon_hose" call dayz_rollingMessages; }; if (!_hasHose) exitWith {dayz_actionInProgress = false; localize "str_siphon_hose" call dayz_rollingMessages; };
_PlayerNear = {isPlayer _x} count ((getPosATL _vehicle) nearEntities ["CAManBase", 12]) > 1; _PlayerNear = {isPlayer _x} count ((getPosATL _vehicle) nearEntities ["CAManBase", 12]) > 1;
if (_PlayerNear) exitWith {localize "str_pickup_limit_5" call dayz_rollingMessages;}; if (_PlayerNear) exitWith {dayz_actionInProgress = false; localize "str_pickup_limit_5" call dayz_rollingMessages;};
_abort = false; _abort = false;
_configVeh = configFile >> "cfgVehicles" >> typeOf _vehicle; _configVeh = configFile >> "cfgVehicles" >> typeOf _vehicle;

1
SQF/dayz_code/init/variables.sqf
View File

@@ -31,6 +31,7 @@ call {
if (toLower worldName in ["chernarus","chernarus_winter"]) exitWith {dayz_minpos = -20000; dayz_maxpos = 20000;}; if (toLower worldName in ["chernarus","chernarus_winter"]) exitWith {dayz_minpos = -20000; dayz_maxpos = 20000;};
if (toLower worldName in ["napf","ruegen","sauerland"]) exitWith {dayz_minpos = -1000; dayz_maxpos = 26000;}; if (toLower worldName in ["napf","ruegen","sauerland"]) exitWith {dayz_minpos = -1000; dayz_maxpos = 26000;};
if (toLower worldName in ["tavi","taviana"]) exitWith {dayz_minpos = -26000; dayz_maxpos = 26000;}; if (toLower worldName in ["tavi","taviana"]) exitWith {dayz_minpos = -26000; dayz_maxpos = 26000;};
if (toLower worldName in ["fdf_isle1_a"]) exitWith {dayz_minpos = 0;dayz_maxpos = 20000;};
dayz_minpos = -20000; dayz_maxpos = 20000; // Default dayz_minpos = -20000; dayz_maxpos = 20000; // Default
}; };

4
Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/mission.sqm
View File

@@ -188,10 +188,10 @@ class Mission
items=17; items=17;
class Item0 class Item0
{ {
position[]={10788,0,8680}; position[]={11100,0,9300};
name="center"; name="center";
type="Empty"; type="Empty";
a=3500;b=3500; a=4000;b=4000;
}; };
class Item1 class Item1
{ {