diff --git a/SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp index 38bf15926..15c4c38f9 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp @@ -5,4 +5,15 @@ class AT5LauncherSingle: AT5Launcher { magazines[] = {"8Rnd_AT5_BMP2","5Rnd_AT5_BRDM2"}; 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"}; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/siphonFuel.sqf b/SQF/dayz_code/actions/siphonFuel.sqf index e5a740245..9830f4a2b 100644 --- a/SQF/dayz_code/actions/siphonFuel.sqf +++ b/SQF/dayz_code/actions/siphonFuel.sqf @@ -9,10 +9,10 @@ _vehicle = _this select 3; player removeAction s_player_siphonfuel; _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; -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; _configVeh = configFile >> "cfgVehicles" >> typeOf _vehicle; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index e295ad9f6..1de21cd1b 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -31,6 +31,7 @@ call { 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 ["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 }; diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/mission.sqm index 01057ae95..68b5571a1 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/mission.sqm @@ -188,10 +188,10 @@ class Mission items=17; class Item0 { - position[]={10788,0,8680}; + position[]={11100,0,9300}; name="center"; type="Empty"; - a=3500;b=3500; + a=4000;b=4000; }; class Item1 {