Merge branch 'develop'

Author: mtusnio

ManhuntFunctions.hpp

@@ -12,52 +12,58 @@ class CfgFunctions
         class Intel
         {
             file = "manhunt_fnc";
-            
+
             class getIntelCount { };
             class changeIntelCount { };
             class clearIntelCount { };
             class setIntelCount { };
             class giveIntelCount { };
             class getIntelCountInRadius { };
         };
-        
+
         class Actions
         {
             file = "manhunt_fnc";
             class markGrid { };
             class repair { };
             class repairPart { };
         };
-        
-        
+
+
         class Units
         {
             file = "manhunt_fnc";
             class getSideUnits {};
         };
-        
+
         class Map
         {
             file = "manhunt_fnc";
             class createMarker { };
         };
-        
+
         class Tasks
         {
             file = "manhunt_fnc";
             class removeAllTasks { };
         };
-        
+
         class Building
         {
             file = "manhunt_fnc";
             class findRandomBuildingPosition { };
         };
-        
+
         class UI
         {
             file = "manhunt_fnc";
             class updateUI { };
         };
+
+        class Debug
+        {
+            file = "manhunt_fnc";
+            class isDebug { };
+        };
 	};
 };

extraction.sqf

@@ -2,8 +2,8 @@
 #define EXTRACTION_RESPAWN 45
 
 if(isServer) then
-{ 
-    [[[East, "HQ"], "Copy that, extraction on the way"], "sideChat", east] call Bis_fnc_mp;
+{
+    [[[East, "HQ"], "Copy that, extraction on the way."], "sideChat", east] call Bis_fnc_mp;
     [[[West, "HQ"], "Enemy extraction started!"], "sideChat", west] call Bis_fnc_mp;
 
     sleep RESCUE_DELAY;

fatigueRelaxation.sqf

@@ -1,23 +1,22 @@
-private ["_lastFatigue"];
-_lastFatigue = 0;
+private _lastFatigue = 0;
 while{true} do
 {
-    private ["_multiplier"];
-    _multiplier = 0.35;
+
+    private _multiplier = 0.35;
     if(side player != west) then
     {
         _multiplier = 0.75;
     };
-    
-    private ["_diff", "_cur"];
-    _cur = getFatigue player;
-    _diff = _cur - _lastFatigue;
-    
+
+    private _cur = getFatigue player;
+    private _diff = _cur - _lastFatigue;
+    private _newFatigue = _lastFatigue + _diff * _multiplier;
+
     if(_diff > 0) then
     {
-        player setFatigue ( _lastFatigue + _diff * _multiplier );
+        player setFatigue _newFatigue;
     };
-    
-    _lastFatigue = _cur;
-    sleep 1;
+
+    _lastFatigue = _newFatigue;
+    sleep 0.5;
 };

init.sqf

@@ -2,26 +2,30 @@ call compile preProcessFileLineNumbers "initVariables.sqf";
 
 enableSaving [ false, false ];
 
+if(call Mh_fnc_isDebug) then {
+    systemChat "Debug mode is enabled";
+};
+
 if(isServer) then
 {
     // All assumptions here are that the game starting time is noon
     timeSkip = random 24;
-    
+
     // Eliminate dark night time (4-6 AM)
     if(timeSkip >= 16 && timeSkip <= 18) then
     {
         timeSkip = timeSkip + 2;
     };
-    
-    switch (startingTime) do 
+
+    switch (startingTime) do
     {
         // Skip to an hour between 7 AM and 6 PM
         case 1: { timeSkip = -5 + random 11; };
         // Skip to an hour between 8 PM and 6 AM
         case 2: { timeSkip = 8 + random 10; };
     };
     publicVariable "timeSkip";
-    
+
     setTimeMultiplier acceleratedTime;
 };
 

initBriefingChanges.sqf

@@ -7,7 +7,7 @@
 
 #define BLUFOR_DRONES "High altitude drone coverage will be made available shortly after the mission start. It will be able to provide roughly the location of any footsoldiers, and its accuracy will increase if they keep sticking around the same area. If OpFor uses vehicles the drones will not only more easily catch them, especially if they stick to roads, but it will have a chance of providing intel about any abandoned cars. There is no guarantee that every drone check will succeed in finding anything though, but it should provide enough clues to help you track down any hostiles."
 
-#define BLUFOR_BODIES "Once an OpFor is killed you can check their body for any information about the other operatives. Simply approach the body and use the ""Check body"" action, your map will be updated with the position of all other operatives in the moment of the killed one's death. Bodies might also be carrying intel that other operatives will want to collect, so it might be wise making sure you keep track of them."
+#define BLUFOR_BODIES "Once an OpFor is killed you can check their body for any information about the other operatives. Simply approach the body and use the ""Check body"" action, your map will be updated with the position of all other operatives' position at the time of their teammate's death. Bodies might also be carrying intel that other operatives will want to collect, so it might be wise making sure you keep track of them."
 
 #define BLUFOR_ACTIONS "Your action menu contains three additional options: ""Earplugs in/out"" which might be useful when flying a helicopter.<br/>""Mark grid"", use it whenever you are pointing your crosshair at a target you want to report. A report will be made in chat and appropriate grid will be marked on the map.<br/>""Repair"", only available when next to a damaged vehicle. This will allow you to spend some time repairing it to full health."
 
@@ -17,13 +17,13 @@
 
 #define OPFOR_INTEL "Intel is what you came here for, you need the specified amount of it to be carried by players in the extraction helicopter to win. It does not matter who lives, only how much intel is carried off the island. You can share it with another player, if you are close enough, and take it from friendly bodies. Make sure one player does not hoard all of it, and remember you can accomplish more objectives than the minimum if you want to. Finally, BluFor can not take intel from your dead friendlies, however they can search the body to recover information about your position at the time of the teammate's death!"
 
-#define OPFOR_DRONES "BluFor will eventually get high altitude drone coverage of the region. Periodically it will feed the enemy team info about your possible location. Your best chance of avoiding it is to limit the usage of vehicles and move quickly when on foot, do not stick around one area for too long. A single small UAV is also at NATO's disposal, however it does not have any thermal cameras on it."
+#define OPFOR_DRONES "BluFor will eventually get high altitude drone coverage of the region. Periodically it will feed the enemy team info about your approximate location. Your best chance of avoiding it is to limit the usage of vehicles and move quickly when on foot, do not stick around one area for too long or your location will get more and more accurate. If you do have to make use of a vehicle avoid staying close to roads, drones have harder time tracking you off road."
 
-#define OPFOR_AMMOCACHES "There are three ammo caches for you to find: one in <marker name=""girna_cache"">Girna</marker>, the other one is deployed <marker name=""random_cache"">somewhere up north</marker>, and finally there's one in <marker name=""forest_cache"">the forest</marker>. They will contain ammo, weapons and various utilities for you. Those locations are random and BluFor is not aware of the exact location of those caches, only their general wherabouts."
+#define OPFOR_AMMOCACHES "There are four ammo caches for you to find: one in <marker name=""girna_cache"">Girna</marker>, the other one is deployed in a building <marker name=""random_cache"">somewhere up north</marker>, one more has been placed in north eastern <marker name=""forest_cache"">forests</marker> and one was parachuted in <marker name=""forest_cache"">central Stratis</marker>. They will contain ammo, weapons and various utilities for you. Those locations are random and BluFor is not aware of the exact location of those caches, only their general wherabouts."
 
 #define OPFOR_EXTRACTION "Once enough intel to win is present in the wider circle of the <marker name=""extraction_zone"">this zone</marker>, and at least one person in the green zone, extraction will start. Hide until your rescue shows up, the Taru will bring armed friends. Board it as soon as possible - it doesn't matter who's in it at the end, as long as the sum of passengers' carried intel matches the mission requirement. The helicopter will not wait forever, however you are invulnerable while inside it and you can still provide covering fire!"
 
-#define OPFOR_ENEMYASSETS "BluFor will track you down using following assets:<br/>- Striders and Hunters with thermal cameras, Hunter turrets cannot fire<br/>- Hunters with no turrets<br/>- Maximum of one UAV without any thermal capabilities<br/>- Hummingbirds<br/>- A Hellcat, the camera only has night vision mode available<br/>- Mortar tubes, however with no artillery computer<br/>- Speedboats, only the minigun is capable of engaging<br/>All BluFor vehicles act as respawn points if any BluFor players are within 20 meters of them"
+#define OPFOR_ENEMYASSETS "BluFor will track you down using following assets:<br/>- Striders and Hunters equipped with thermal cameras, but no functioning weapons<br/>- Maximum of one UAV without any thermal capabilities<br/>- Hummingbirds<br/>- A Hellcat, the camera only has night vision mode available<br/>- Mortar tubes, however with no artillery computer<br/>- Speedboats, only the minigun is capable of engaging<br/>All BluFor vehicles act as respawn points if any BluFor players are within 20 meters of them"
 
 #define SETTINGS_STRING "Objectives needed for extraction: %1<br/>Amount of objectives available at start: %2<br/>Intel required to win: %3"
 
@@ -47,13 +47,13 @@ if(side group player == west) then
         };
         _x setMarkerColorLocal "ColorWEST";
     } forEach _bluMarkers;
-    
+
     {
         _x setMarkerColorLocal "ColorEAST";
     } forEach _opforMarkers;
-    
+
     private ["_removeBlufor"];
-    _removeBlufor = [ "random_cache", "forest_cache" ];
+    _removeBlufor = [ "random_cache", "forest_cache", "valley_cache" ];
     {
         deleteMarkerLocal _x;
     } forEach _removeBlufor;
@@ -63,7 +63,8 @@ else
     "girna_cache" setMarkerPosLocal (getPos (missionNamespace getVariable ["cache1", objNull]));
     "random_cache" setMarkerPosLocal (getPos (missionNamespace getVariable ["cache2", objNull]));
     "forest_cache" setMarkerPosLocal (getPos (missionNamespace getVariable ["cache3", objNull]));
-        
+    "valley_cache" setMarkerPosLocal (getPos (missionNamespace getVariable ["cache4", objNull]));
+
     private ["_removeOpfor"];
     _removeOpfor = [ "airbase_fuel", "airfield_boats", "airfield_fuel", "airbase_uav" ];
     {

initNeutralVehicle.sqf

@@ -0,0 +1,33 @@
+#define GRACE_PERIOD 30
+
+params ["_unit"];
+
+clearMagazineCargoGlobal _unit;
+clearWeaponCargoGlobal _unit;
+clearItemCargoGlobal _unit;
+
+if(time < GRACE_PERIOD) then {
+	private _handlerId = _unit addEventHandler ["HandleDamage", {
+		private _v = _this select 0;
+		if (!alive _v) then {
+			if(call Mh_fnc_isDebug) then {
+				private _markerId = floor random 10000000000;
+				private _markerName = format ["debug_vehicle_%1", _markerId];
+				private _marker = createMarker [_markerName, _v];
+				_marker setMarkerShape "ICON";
+				_marker setMarkerText format ["Destroyed %1", typeof _v];
+				_marker setMarkerType "mil_dot";
+				[format ["Destroyed vehicle %1 before grace period, marker with name %2 created", typeOf _v, _markerName], "systemChat", true] call Bis_fnc_mp;
+			};
+			deleteVehicle _v;
+			_v removeEventHandler ["HandleDamage", _thisEventHandler];
+		};
+	}];
+
+	[_handlerId, _unit] spawn {
+		waitUntil { time >= GRACE_PERIOD };
+		private _id = _this select 0;
+		private _v = _this select 1;
+		_v removeEventHandler ["HandleDamage", _id];
+	};
+};

initPlayerLocal.sqf

@@ -1,3 +1,6 @@
+
+#define PARACHUTE_ALTITUDE 80
+
 call compile preProcessFileLineNumbers "initVariables.sqf";
 call compile preprocessFileLineNumbers "initBriefingChanges.sqf";
 
@@ -33,20 +36,26 @@ if(side player == east) then
         if(side _x == east && _x != player) then
         {
             _x addAction [format["Give %1 an intel piece", name _x], {
-            
+
                     [[_this select 1, _this select 0, 1], "Mh_fnc_giveIntelCount", false] call Bis_fnc_mp;
                     [[_this select 0, format ["Received an intel piece from %1", name (_this select 1)]], "sideChat", east] call BIS_fnc_MP;
-                    
-                }, [], 1, false, true, "", "alive _target && _this distance _target <= 3 && ([_this] call Mh_fnc_getIntelCount > 0);"]; 
+
+                }, [], 1, false, true, "", "alive _target && _this distance _target <= 3 && ([_this] call Mh_fnc_getIntelCount > 0);"];
         };
     } forEach (if (isMultiplayer) then {playableUnits} else {switchableUnits});
+
+    [] spawn {
+        waitUntil { getPosATL player select 2 < PARACHUTE_ALTITUDE };
+        player action ["openParachute"];
+    };
+
 }
 else
 {
     setPlayerRespawnTime respawnTime;
 };
 
-if(debugMode == 1) then
+if(call Mh_fnc_isDebug) then
 {
     setPlayerRespawnTime 5;
     ["debugTeleport", "onMapSingleClick", {

initVariables.sqf

@@ -1,19 +1,38 @@
-gpsSetting = paramsArray select 0;
-startingTime = paramsArray select 1;
-detectionRadius =  paramsArray select 2;
-detectionRadiusVehicle =  paramsArray select 3;
-requiredObjectives = paramsArray select 4;
-availableObjectives = paramsArray select 5;
-objectiveRadius = paramsArray select 6;
-nameTags = paramsArray select 7;
-requiredIntel = paramsArray select 8;
-//startingWeather = paramsArray select 9;
-debugMode = paramsArray select 10;
-disallowTeamswitch = paramsArray select 11;
-acceleratedTime = paramsArray select 12;
-respawnTime = paramsArray select 13;
-initialDroneDelay = paramsArray select 14;
-dynamicObjectives = 0;
-maxUavs = 1;
 
-if(!isMultiplayer) then { debugMode = 1; };
+if(isMultiplayer) then {
+	gpsSetting = paramsArray select 0;
+	startingTime = paramsArray select 1;
+	detectionRadius =  paramsArray select 2;
+	detectionRadiusVehicle =  paramsArray select 3;
+	requiredObjectives = paramsArray select 4;
+	availableObjectives = paramsArray select 5;
+	objectiveRadius = paramsArray select 6;
+	nameTags = paramsArray select 7;
+	requiredIntel = paramsArray select 8;
+	//startingWeather = paramsArray select 9;
+
+	disallowTeamswitch = paramsArray select 11;
+	acceleratedTime = paramsArray select 12;
+	respawnTime = paramsArray select 13;
+	initialDroneDelay = paramsArray select 14;
+	dynamicObjectives = 0;
+	maxUavs = 1;
+} else {
+	gpsSetting = 3;
+	startingTime = 12;
+	detectionRadius =  350;
+	detectionRadiusVehicle = 110;
+	requiredObjectives = 3;
+	availableObjectives = 6;
+	objectiveRadius = 1250;
+	nameTags = 2;
+	requiredIntel = 3;
+	//startingWeather = paramsArray select 9;
+
+	disallowTeamswitch = 1;
+	acceleratedTime = 1;
+	respawnTime = 105;
+	initialDroneDelay = 240;
+	dynamicObjectives = 0;
+	maxUavs = 1;
+}

initWeaponsCache.sqf

@@ -24,22 +24,23 @@ if(isServer) then
         };
     };
 
-    clearMagazineCargoGlobal _cache; 
-    clearWeaponCargoGlobal _cache; 
-    clearItemCargoGlobal _cache; 
+    clearMagazineCargoGlobal _cache;
+    clearWeaponCargoGlobal _cache;
+    clearItemCargoGlobal _cache;
     clearBackpackCargoGlobal _cache;
 
     _cache addMagazineCargoGlobal ["RPG32_F", 1];
-    _cache addMagazineCargoGlobal ["150Rnd_762x54_Box", 1];
-    _cache addMagazineCargoGlobal ["30Rnd_65x39_caseless_green", 3];
-    _cache addMagazineCargoGlobal ["30Rnd_556x45_Stanag", 2];
-    _cache addMagazineCargoGlobal ["10Rnd_762x54_Mag", 3];
+    _cache addMagazineCargoGlobal ["150Rnd_762x54_Box", 2];
+    _cache addMagazineCargoGlobal ["30Rnd_65x39_caseless_green", 4];
+    _cache addMagazineCargoGlobal ["30Rnd_556x45_Stanag", 3];
+    _cache addMagazineCargoGlobal ["10Rnd_762x54_Mag", 4];
     _cache addMagazineCargoGlobal ["ATMine_Range_Mag", 1];
     _cache addMagazineCargoGlobal ["APERSMine_Range_Mag", 1];
     _cache addMagazineCargoGlobal ["SatchelCharge_Remote_Mag", 1];
-    _cache addItemCargoGlobal ["NVGoggles_OPFOR", 1];
+    _cache addItemCargoGlobal ["NVGoggles_OPFOR", 2];
     _cache addItemCargoGlobal ["HandGrenade", 2];
     _cache addItemCargoGlobal ["U_O_Wetsuit", 1];
+    _cache addItemCargoGlobal ["FirstAidKit", 2];
     _cache addBackpackCargoGlobal ["B_FieldPack_khk", 1];
 	_cache addWeaponCargoGlobal ["arifle_Katiba_F", 1]
 };

manhunt_fnc/fn_isDebug.sqf

@@ -0,0 +1,22 @@
+/*
+	Author: Michał Tuśnio
+
+	Description:
+	Returns true if debug mode is enabled, false otherwise. This function is useful since some initialization
+	scripts run before init.sqf, and will not read a variable describing debug mode properly. Similarly, we do
+	not read paramsArray in single player.
+
+	Parameter(s):
+	None
+
+	Returns:
+	Boolean
+*/
+
+if(!isMultiplayer) then {
+	true;
+} else {
+	(paramsArray select 10) == 1;
+}
+
+