Merge branch 'develop'

Author: mtusnio

description.ext

@@ -119,12 +119,17 @@ class Params
 
     class RespawnTime
     {
-        title = "BluFor respawn time";
+        title = "BluFor respawn time (in seconds)";
         values[] = { 30, 45, 60, 75, 90, 105, 120, 135, 150, 165, 180 };
         default = 105;
     };
-
 
+    class InitialDroneDelay
+    {
+        title = "Initial delay before drone system comes online (in seconds)";
+        values[] = { 60, 120, 180, 240, 300, 360, 420, 480, 540, 600 };
+        default = 240;
+    };
 };
 
 class CfgRespawnTemplates

initBluVehicle.sqf

@@ -23,14 +23,15 @@ if(_unit isKindOf "Ship") then
 {
     _unit removeWeaponTurret ["GMG_40mm", [0]]; 
     _unit removeMagazinesTurret ["200Rnd_40mm_G_belt", [0]];
+    _unit disableTIEquipment true;
 };
 
 if(_unit isKindOf "Helicopter") then
 {
 	_unit disableTIEquipment true;
 };
 
-_unit addAction [ "Repair", Mh_fnc_repair, [], 1.5, true, true, "", "vehicle player == player && side player == west && (_target distance player) <= 5" ];
+
 
 if(isServer) then
 {
@@ -43,4 +44,18 @@ if(isServer) then
     {
         [_unit, west] call compile preprocessFileLineNumbers "initSpawnVehicle.sqf";
     };
+};
+
+if(hasInterface) then
+{
+    _unit addAction [ "Repair", Mh_fnc_repair, [], 1.5, true, true, "", 
+    "if(side group player != west || vehicle player != player) exitWith { false; };
+        private _result = false;
+        {
+            if(_x > 0.15) exitWith { _result = true; };
+
+        } forEach ((getAllHitPointsDamage _target) select 2);
+        _result;
+    ",
+    5];
 };

initBriefingChanges.sqf

@@ -9,7 +9,7 @@
 
 #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_ACTIONS "Your action menu contains two additional options: One are earplugs which might be useful when flying a helicopter. The other option is called ""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."
+#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."
 
 #define BLUFOR_FASTROPING "All helicopters allow for fast roping - simply have the pilot slow the chopper down to a hover, throw the ropes and then fast rope. The rope should be safe to use up to 45 meters above ground level, just make sure the helicopter maintains a steady hover during the whole process."
 
@@ -29,7 +29,7 @@
 
 #define CREDITS_STRING "<font size=""16"">Made by</font><br/><br/>Michał ""Mavrick"" Tuśnio, Revendel on BIStudio forums.<br/><br/><font size=""16"">Special thanks to</font><br/><br/>DMK Gman for OpFor loadouts, gameplay videos.<br/>ATi for gameplay videos<br/>ATi, DMK Gman, GuðniM, Ingi, Snake, Wezzlok for testing and suggestions.<br/><br/><font size=""16"">Scripts</font><br/><br/>Nametags by JTS <br/>Fast roping script by Zealot<br/>Random weather script by Meatball"
 
-#define CHANGELOG_STRING "<font size=""16"">Version 3</font><br/><br/>- Increased extraction time from 4 minutes to 5 minutes<br/>- Changed the warning time before the chopper leaves from 30 seconds before extraction to 60 seconds<br/>- BlueFor units in the selection menu have been reordered to Pilots->Air Station Mike->Airfield paratroopers<br/>- Restructured the in-game guide for BluFor and OpFor<br/><br/><font size=""16"">Version 2</font><br/><br/>- Removed a custom spectator mode in favour of BI's<br/>- Blufor respawn time now 105s, can be changed in parameters<br/>- Updated briefing to reflect some recent changes <br/>- Fix wrongly displayed minimum player count<br/><br/><font size=""16"">Version 1</font><br/><br/>Initial release"
+#define CHANGELOG_STRING "<font size=""16"">Version 4</font><br/><br/>- Initial drone delay is now a parameter, decreased from 5 minutes to 4 minutes<br/>- Readjusted speedboats position  to avoid collisions<br/>- Removed speedboats thermal vision<br/>- Added information about repair action<br/>- Repair is now only available when something's actually damaged<br/><br/><font size=""16"">Version 3</font><br/><br/>- Increased extraction time from 4 minutes to 5 minutes<br/>- Changed the warning time before the chopper leaves from 30 seconds before extraction to 60 seconds<br/>- BlueFor units in the selection menu have been reordered to Pilots->Air Station Mike->Airfield paratroopers<br/>- Restructured the in-game guide for BluFor and OpFor<br/><br/><font size=""16"">Version 2</font><br/><br/>- Removed a custom spectator mode in favour of BI's<br/>- Blufor respawn time now 105s, can be changed in parameters<br/>- Updated briefing to reflect some recent changes <br/>- Fix wrongly displayed minimum player count<br/><br/><font size=""16"">Version 1</font><br/><br/>Initial release"
 
 // Handle markers
 if(side group player == west) then

initVariables.sqf

@@ -12,6 +12,7 @@ debugMode = paramsArray select 10;
 disallowTeamswitch = paramsArray select 11;
 acceleratedTime = paramsArray select 12;
 respawnTime = paramsArray select 13;
+initialDroneDelay = paramsArray select 14;
 dynamicObjectives = 0;
 maxUavs = 1;
 

mission.sqm

@@ -4,7 +4,7 @@
 #define INFANTRY_VAR 20
 
 // Initial wait before drone tracking starts
-#define INITIAL_WAIT 300
+#define INITIAL_WAIT initialDroneDelay
 
 // Delay after drones are online and the first check is done
 #define MIN_FIRST_TRACKING_DELAY 10