Merge branch 'develop'

Author: mtusnio

checkEndConditions.sqf

@@ -12,6 +12,12 @@ while { _run } do
     _aliveOpfor = { isPlayer _x && alive _x && side group _x == east } count allUnits;
     _playingBluFor = { isPlayer _x && side group _x == west } count (allUnits + allDead);
 
+    // Just in case someone joins blufor mid game
+    if(initialBluFor == 0 && _playingBluFor > 0) then
+    {
+        initialBluFor = _playingBluFor;
+    };
+
     if(initialOpfor > 0 && initialBlufor > 0) then
     {
         if(_aliveOpfor == 0) then

description.ext

@@ -38,8 +38,8 @@ class Params
     class DroneMarkerSizeInfantry
 	{
 		title = "Infantry drone marker size"; // Param name visible in the list
-		values[] = {75, 150, 225, 275, 325, 375, 425}; // Values; must be integers; has to have the same number of elements as 'texts'
-		default = 325; // Default value; must be listed in 'values' array, otherwise 0 is used
+		values[] = {100, 150, 200, 250, 300, 350, 400, 450}; // Values; must be integers; has to have the same number of elements as 'texts'
+		default = 350; // Default value; must be listed in 'values' array, otherwise 0 is used
 	};
 
     class DroneMarkerSizeVehicle

init.sqf

@@ -4,18 +4,21 @@ enableSaving [ false, false ];
 
 if(isServer) then
 {
+    // All assumptions here are that the game starting time is noon
     timeSkip = random 24;
 
-    // Eliminate dark night time
-    if(timeSkip > 12 && timeSkip < 17) then
+    // Eliminate dark night time (4-6 AM)
+    if(timeSkip >= 16 && timeSkip <= 18) then
     {
-        timeSkip = timeSkip + 5;
+        timeSkip = timeSkip + 2;
     };
 
     switch (startingTime) do 
     {
-        case 1: { timeSkip = -4 + random 10; };
-        case 2: { timeSkip = 12 + random 3; };
+        // 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";
 

initBriefingChanges.sqf

@@ -13,7 +13,7 @@
 
 #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."
 
-#define OPFOR_OVERVIEW "You start in a helicopter and can eject anywhere within the <marker name=""insertion_zone"">insertion zone</marker>, land quickly and make sure to find a hiding spot - the hunters will be on your tail. Make sure you do not hit the ground too hard, a rocky landing can hurt or kill you! As soon as possible start moving towards some good cover, once you have died the game is over for you. Your job is to secure %3 pieces of intel and <marker name=""extraction_zone"">extract</marker> with them. Extraction will be available as soon as you have completed %1 objectives out of %2 available to you. One piece of intel is given to you for every task you complete."
+#define OPFOR_OVERVIEW "You start in a helicopter and can eject anywhere within the <marker name=""insertion_zone"">insertion zone</marker>, land quickly and make sure to find a hiding spot - the hunters will be on your tail. Make sure you do not hit the ground too hard, a rocky landing can hurt or kill you! As soon as possible start moving towards some good cover, once you have died the game is over for you. Your job is to secure %3 pieces of intel and <marker name=""extraction_zone"">extract</marker> with them. Extraction will be available as soon as you have completed %1 objectives out of %2 available to you. One piece of intel is given to you for every task you complete. Keep in mind, while BluFor can respawn as many times as they want, you have one life only."
 
 #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!"
 
@@ -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 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"
+#define CHANGELOG_STRING "<font size=""16"">Version 5</font><br/><br/>- Changed mission headline info to include proper information<br/>- Added info about respawns for OpFor<br/>- Ghillie loadout now carries Mk20 instead of an SMG<br/>- Flashlights added to all loadouts wherever the attachment is available<br/>- Changed the mission date to allow for better night brightness<br/>- Possibly fixed one case of the mission never ending despite all OpFor being dead<br/>- Drone markers will not try to place their center over ground if possible (unless the target is at sea)<br/>- Rebalanced slightly the timing of the drones and marker size to buff OpFor<br/><br/><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

initWeaponsCache.sqf

@@ -32,6 +32,7 @@ if(isServer) then
     _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 ["ATMine_Range_Mag", 1];
     _cache addMagazineCargoGlobal ["APERSMine_Range_Mag", 1];

mission.sqm

@@ -1,23 +1,26 @@
 /* ******************** Defines ***************** */
 
-#define INFANTRY_MIN_TIME 160
-#define INFANTRY_VAR 20
+#define INFANTRY_MIN_TIME 175
+#define INFANTRY_VAR 10
 
 // Initial wait before drone tracking starts
 #define INITIAL_WAIT initialDroneDelay
 
-// Delay after drones are online and the first check is done
-#define MIN_FIRST_TRACKING_DELAY 10
-#define RAND_FIRST_TRACKING_DELAY 10
+// Delay after drones are turned online and the first check is done
+#define MIN_FIRST_TRACKING_DELAY 5
+#define RAND_FIRST_TRACKING_DELAY 8
 
 #define MAX_CHANCE 100
 
 #define INFANTRY_CHANCE 20
 
 
-#define VEHICLE_MIN_TIME 20
+// This is the time when any manned vehicles will be captured & tracked
+#define VEHICLE_MIN_TIME 35
 #define VEHICLE_VAR 10
-#define VEHICLE_SWEETSPOT 20
+// The time when only old vehicles are being checked, and no new vehicles are being added to the list
+#define VEHICLE_SWEETSPOT 10
+
 #define ROAD_DISTANCE 8
 
 #define VEHICLE_MIN_CHANCE 30
@@ -28,7 +31,7 @@
 
 #define SPOT_COUNT_VAR "mh_drone_spotcount"
 #define SPOT_POSITION_VAR "mh_drone_spotposition"
-#define SPOT_DISTANCE 130
+#define SPOT_DISTANCE 115
 
 /* ******************** End defines ***************** */
 
@@ -269,49 +272,4 @@ nextVehicleCheckUnits = [ ];
         };
     };
     // End while loop
-};
-
-/*private ["_droneCheck"];
-_droneCheck = {
-    private ["_detected"];
-    _detected = false;
-    
-    {
-        
-        if(side _x == east) then
-        {
-            private ["_rand", "_chance"];
-            _rand = floor random (MAX_CHANCE + 1);
-            _chance = INFANTRY_CHANCE;
-            
-            if(vehicle _x != _x) then
-            {
-                _chance = VEHICLE_CHANCE;
-            };
-            
-            diag_log format["Checking %1, chance is %2, random is %3", name _x, _chance, _rand];
-            
-            if(_rand <= _chance) then
-            {
-                diag_log format["Detected: %1", name _x];
-                _detected = true;
-                [[[_x, detectionRadius, detectionRadiusVehicle], "trackerMarker.sqf"], "BIS_fnc_execVM", West] call BIS_fnc_MP;
-                sleep 2;
-            };
-        };
-    } forEach (if (isMultiplayer) then {playableUnits} else {switchableUnits});
-    
-    if(!_detected) then
-    {
-        [[west, "Drone operators have nothing to report", "side"], "Mh_fnc_chatMessage", west] call BIS_fnc_MP;
-    };
-};
-
-while{true} do
-{
-    call _droneCheck;
-    _waitingTime = MIN_TRACKER_TIME + random TRACKER_TIME_VAR;
-    diag_log format ["Drones sleeping %1 seconds", _waitingTime];
-    
-    sleep _waitingTime;
-};*/
+};

tracker.sqf

@@ -1,15 +1,16 @@
 #define TIER2_SPREAD 10
 #define TIER3_SPREAD 20
 
-#define TIER2_MULTIPLIER 1.8
-#define TIER3_MULTIPLIER 2.3
+#define TIER2_MULTIPLIER 1.6
+#define TIER3_MULTIPLIER 2.5
 
 #define MARKER_STAYING_TIME 240
 
+#define WATER_RETRIES 20
+
 if(isNil "currentMarkers") then { currentMarkers = [ ]; };
 
-private["_calculateRadius"];
-_calculateRadius = {
+private _calculateRadius = {
     private["_rand"];
     _rand = _this select 0;
 
@@ -42,6 +43,24 @@ _calculateRadius = {
     _radius;
 };
 
+private _calculatePosition = {
+    params ["_target", "_radius"];
+    private _pos = position _target;
+    private _markerPos = [];
+    // Regardless if the player is in water or not we want to run some retries to make sure the marker ends up on the mainland
+    // This way, unless the target is out in the sea, the marker will always stay close to the coast giving less info regarding the position of the player
+    // Not an ideal solution, especially since it runs a retry per every fail, but it should be enough for now
+    for "_i" from 0 to WATER_RETRIES do
+    {
+        private _yDist = _radius - random ( _radius * 2);
+        private _maxX = sqrt ( _radius^2 - _yDist^2 );
+        private _xDist = _maxX - random (_maxX * 2);
+        
+        _markerPos =  [(_pos select 0) + _xDist,(_pos select 1) + _yDist, 0];
+        if(!surfaceIsWater _markerPos) exitWith { };
+    };
+    _markerPos;
+};
 
 private ["_target", "_radius", "_rand", "_chance"];
 _target = _this select 0;
@@ -54,22 +73,13 @@ _radius = [_rand, _chance, _radius] call _calculateRadius;
 
 if(_radius > 0) then
 {
-    private["_pos"];
-    _pos = position _target;
-
-    private ["_yDist", "_xDist", "_maxX"];
-    _yDist = _radius - random ( _radius * 2);
-    _maxX = sqrt ( _radius^2 - _yDist^2 );
-    _xDist = _maxX - random (_maxX * 2);
-
     private["_markerName", "_timerMarkerName"];
     _markerName = [droneTrackerMarkers] call BIS_fnc_arrayShift;
     droneTrackerMarkers pushBack _markerName;
 
     _timeMarkerName = _markerName + "_time";
 
-    private["_markerPos"];
-    _markerPos = [(_pos select 0) + _xDist,(_pos select 1) + _yDist, 0];
+    private _markerPos = [_target, _radius] call _calculatePosition;
 
     private ["_markerColor"];
     _markerColor = "ColorRed";