Added WIP Limited fuel in Refuel points.

Vanilla development commits:

707a591765

c453cdedd2

Set to double vanilla default value since Epoch has a lot more large
vehicles with 1000+ fuel capacity.

CHANGE LOG 1.0.6.txt

@@ -40,6 +40,9 @@
 [NEW] Weather effects are now configurable with DZE_WeatherVariables See DynamicWeatherEffects.sqf for info on these values @icomrade
 [NEW] Full height cinderblock wall kits are now in game, classname "full_cinder_wall_kit" #1172 @icomrade
 [NEW] You can exclude built items from the god mode base function using DZE_GodModeBaseExclude = []; which is an array of item classnames
+[NEW] Fuel stations now have limited amount of fuel each restart. Configurable with dayz_randomMaxFuelAmount in init.sqf
+[NEW] More possible causes of death added to study body: fell, ran over, shot, melee hit, zombie hit @ebaydayz
+[NEW] Player-list no longer shows who's in lobby or ingame.
 
 [CHANGED] Combattimeout now uses diag_tickTime instead of time.
 [CHANGED] AmmoBoxSmall_556/762 is replaced with DZ_AmmoBoxUS/RU/EU/CZ and MedBox0 is replaced with DZ_MedBox (new model)
@@ -98,6 +101,7 @@
 [NOTE]	Servers that use trader safezones must configure the variable DZE_SafeZonePosArray with their safezone posisitons and radii, otherwise passangers of vehicles in safezones will be killed upon destruction of their vehicle
 [FIXED] Players are no longer able to brute force doors or safes by the method described in #1187 @icomrade
 [FIXED] Fix some items not displaying removal option #1135 @icomrade
+[FIXED] Study body message saying his/he on female players. @ebaydayz
 
 [UPDATED] .hpp files updated in dayz_code\Configs\CfgLoot\CfgBuildingPos. @Uro1
 [UPDATED] .bat files updated in Config-Examples @Raziel23x

SQF/dayz_code/actions/jerry_fill.sqf

@@ -1,20 +1,34 @@
 if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_34" call dayz_rollingMessages;};
 DZE_ActionInProgress = true;
-private ["_qty","_dis","_sfx","_started","_finished","_animState","_isRefuel","_fuelcans","_qty20","_qty5","_qty40"];
+private ["_qty","_dis","_sfx","_started","_finished","_animState","_isRefuel","_fuelcans","_qty20","_qty5","_qty40","_magazines","_cursorTarget","_fuelAmount"];
 
 player removeAction s_player_fillfuel;
 //s_player_fillfuel = -1;
+_cursorTarget = _this select 3;
+_magazines = magazines player;
+
+//Limit Fuel in tankers
+_fuelAmount = _cursorTarget getVariable "FuelAmount";
+
+if (isNil "_fuelAmount") then {
+	_fuelAmount = floor(Random dayz_randomMaxFuelAmount);
+    _cursorTarget setVariable ["FuelAmount",_fuelAmount,true];
+};
+
+if (_fuelAmount < 5) exitWith { format[localize "str_fill_notenough",typeOf _cursorTarget,_fuelAmount] call dayz_rollingMessages; };
+
+diag_log format["Fill Jerry, %1 - %2",_cursorTarget,_fuelAmount];
 
 _fuelcans = ["ItemFuelcanEmpty","ItemJerrycanEmpty","ItemFuelBarrelEmpty"];
 
 _qty = 0;
-_qty = {_x in _fuelcans} count magazines player;
+_qty = {_x in _fuelcans} count _magazines;
 
-_qty20 = {_x == "ItemJerrycanEmpty"} count magazines player;
-_qty5 = {_x == "ItemFuelcanEmpty"} count magazines player;
-_qty40 = {_x == "ItemFuelBarrelEmpty"} count magazines player;
+_qty20 = {_x == "ItemJerrycanEmpty"} count _magazines;
+_qty5 = {_x == "ItemFuelcanEmpty"} count _magazines;
+_qty40 = {_x == "ItemFuelBarrelEmpty"} count _magazines;
 
-if (("ItemJerrycanEmpty" in magazines player) or ("ItemFuelcanEmpty" in magazines player) or ("ItemFuelBarrelEmpty" in magazines player)) then {
+if (("ItemJerrycanEmpty" in _magazines) or ("ItemFuelcanEmpty" in _magazines) or ("ItemFuelBarrelEmpty" in _magazines)) then {
 	player playActionNow "Medic";
 
 	_dis=5;
@@ -45,20 +59,46 @@ if (("ItemJerrycanEmpty" in magazines player) or ("ItemFuelcanEmpty" in magazine
 
 	if (_finished) then {
 		for "_x" from 1 to _qty20 do {
-			player removeMagazine "ItemJerrycanEmpty";
-			player addMagazine "ItemJerrycan";
+			_fuelAmount = _cursorTarget getVariable "FuelAmount";
+			
+			if (_fuelAmount >= 20) then {
+				_fuelAmount = _fuelAmount - 20;
+				_cursorTarget setVariable ["FuelAmount",_fuelAmount,true];
+				player removeMagazine "ItemJerrycanEmpty";
+				player addMagazine "ItemJerrycan";
+			} else {
+				_qty = _qty - 1;
+			};
 		};
 		for "_x" from 1 to _qty5 do {
-			player removeMagazine "ItemFuelcanEmpty";
-			player addMagazine "ItemFuelcan";
+			_fuelAmount = _cursorTarget getVariable "FuelAmount";
+			
+			if (_fuelAmount >= 5) then {
+				_fuelAmount = _fuelAmount - 5;
+				_cursorTarget setVariable ["FuelAmount",_fuelAmount,true];
+				player removeMagazine "ItemFuelcanEmpty";
+				player addMagazine "ItemFuelcan";
+			} else {
+				_qty = _qty - 1;
+			};
 		};
 		for "_x" from 1 to _qty40 do {
-			player removeMagazine "ItemFuelBarrelEmpty";
-			player addMagazine "ItemFuelBarrel";
+			_fuelAmount = _cursorTarget getVariable "FuelAmount";
+			
+			if (_fuelAmount >= 40) then {
+				_fuelAmount = _fuelAmount - 40;
+				_cursorTarget setVariable ["FuelAmount",_fuelAmount,true];
+				player removeMagazine "ItemFuelBarrelEmpty";
+				player addMagazine "ItemFuelBarrel";
+			} else {
+				_qty = _qty - 1;
+			};
 		};
 	};
 
-	format[localize "str_player_09",_qty] call dayz_rollingMessages;
+	//format[localize "str_player_09",_qty] call dayz_rollingMessages;
+	format[localize "str_fill_success",_qty,typeOf _cursorTarget,_fuelAmount] call dayz_rollingMessages;
+	//diag_log format[localize "str_fill_success",_qty,typeOf _cursorTarget,_fuelAmount];
 } else {
 	localize "str_player_10" call dayz_rollingMessages;
 };

SQF/dayz_code/compile/fn_selfActions.sqf

@@ -292,7 +292,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
 	//Allow player to fill Fuel can
 	if (_hasEmptyFuelCan && {_isFuel} && {!a_player_jerryfilling}) then {
 		if (s_player_fillfuel < 0) then {
-			s_player_fillfuel = player addAction [localize "str_actions_self_10", "\z\addons\dayz_code\actions\jerry_fill.sqf",[], 1, false, true];
+			s_player_fillfuel = player addAction [localize "str_actions_self_10", "\z\addons\dayz_code\actions\jerry_fill.sqf",_cursorTarget, 1, false, true];
 		};
 	} else {
 		player removeAction s_player_fillfuel;

SQF/dayz_code/init/variables.sqf

@@ -418,6 +418,9 @@ if(isNil "dayz_POIs") then {
 if(isNil "dayz_ForcefullmoonNights") then {
 	dayz_ForcefullmoonNights = false; // Forces night time to be full moon.
 };
+if(isNil "dayz_randomMaxFuelAmount") then {
+	dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
+};
 
 //Replace server individual settings with ranked settings
 if(isNil "dayz_presets") then { dayz_presets = "Vanilla"; };

SQF/dayz_code/stringtable.xml

@@ -1302,6 +1302,12 @@
 			<German>Es ist nicht mehr genügend Treibstoff im %1, um etwas abzuzapfen.</German>
 			<Dutch>Deze %1 heeft niet voldoende brandstof.</Dutch>
 		</Key>
+		<Key ID="str_fill_notenough">
+			<English>%1 does not have enough fuel to fill jerry can(s). (Estimated %2 Liters left)</English>
+		</Key>
+		<Key ID="str_fill_success">
+			<English>You have filled %1 jerry can(s) with fuel. %2 has an estimated %3 Liters of fuel left.</English>
+		</Key>
 		<Key ID="str_siphon_canceled">
 			<English>Canceled siphon</English>
 			<Russian>Слив отменен.</Russian>

Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"

Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf

@@ -16,6 +16,7 @@ dayz_quickSwitch = false; //Turns on forced animation for weapon switch. (hotkey
 dayz_POIs = true;
 dayz_infectiousWaterholes = true;
 dayz_ForcefullmoonNights = true; // Forces night time to be full moon.
+dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 
 //DayZMod presets
 dayz_presets = "Custom"; //"Custom","Classic","Vanilla","Elite"