Arma3_Epoch/blckeagles-revisited-RC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for missing mission markers when multiple missions of a type are desired.

Browse Source
This commit is contained in:
Chris Cardozo 2020-09-29 23:29:35 -04:00
parent 70e0a34d28
commit fef589f94c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_initializeMission.sqf
View File

@ -7,7 +7,7 @@
#include "\q\addons\custom_server\Configs\blck_defines.hpp"; #include "\q\addons\custom_server\Configs\blck_defines.hpp";
private ["_coords","_coordArray","_return"]; private ["_coords","_coordArray","_return"];
params["_missionCategoryDescriptors","_missionParameters"]; params["_missionCategoryDescriptors","_missionParameters","_missionCount"];
_missionCategoryDescriptors params [ _missionCategoryDescriptors params [
"_difficulty", "_difficulty",
"_noMissions", // Max no missions of this category "_noMissions", // Max no missions of this category
@ -107,6 +107,7 @@ if !(_defaultMissionLocations isEqualTo []) then
if (_coords isEqualTo []) exitWith if (_coords isEqualTo []) exitWith
{ {
[format["No Safe Mission Spawn Position Found to spawn Mission %1",_markerMissionName],'warning'] call blck_fnc_log;
false; false;
}; };
@ -161,7 +162,7 @@ if !(isClass(configFile >> "CfgMarkerColors" >> _markerColor)) then
_missionParameters set [1,_markerMissionName]; _missionParameters set [1,_markerMissionName];
}; };
private _markers = [_markerName,_markerPos,_markerMissionName,_markerColor,_markerType,_markerSize,_markerBrush] call blck_fnc_createMissionMarkers; private _markers = [format["%1:%2",_markerName,_missionCount],_markerPos,_markerMissionName,_markerColor,_markerType,_markerSize,_markerBrush] call blck_fnc_createMissionMarkers;
/* /*
Send a message to players. Send a message to players.

4
@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnPendingMissions.sqf
View File

@ -17,10 +17,10 @@ if (blck_missionsRunning >= blck_maxSpawnedMissions) exitWith {};
if (_noActiveMissions < _maxNoMissions && diag_tickTime > _waitTime && blck_missionsRunning < blck_maxSpawnedMissions) then if (_noActiveMissions < _maxNoMissions && diag_tickTime > _waitTime && blck_missionsRunning < blck_maxSpawnedMissions) then
{ {
blck_dynamicMissionsSpawned = blck_dynamicMissionsSpawned + 1;
// time to reset timers and spawn something. // time to reset timers and spawn something.
private _wt = diag_tickTime + _tmin + (random(_tMax - _tMin)); private _wt = diag_tickTime + _tmin + (random(_tMax - _tMin));
private _missionInitialized = [_x,selectRandom _missionsData] call blck_fnc_initializeMission; private _missionInitialized = [_x,selectRandom _missionsData,blck_dynamicMissionsSpawned] call blck_fnc_initializeMission;
if (blck_debugLevel >= 3) then if (blck_debugLevel >= 3) then
{ {
if !(_missionInitialized) then if !(_missionInitialized) then

2
@GMS/addons/custom_server/Compiles/blck_variables.sqf
View File

@ -46,7 +46,7 @@ blck_temporaryMarkers = [];
blck_illuminatedCrates = []; // [crate,duration,freq of replacement] blck_illuminatedCrates = []; // [crate,duration,freq of replacement]
blck_mainThreadUpdateInterval = 60; blck_mainThreadUpdateInterval = 60;
blck_revealMode = "detailed"; //""basic" /*group or vehicle level reveals*/,detailed /*unit by unit reveals*/"; blck_revealMode = "detailed"; //""basic" /*group or vehicle level reveals*/,detailed /*unit by unit reveals*/";
blck_dynamicMissionsSpawned = 0;
blck_spawnerMode = 1; blck_spawnerMode = 1;
blck_missionData = []; blck_missionData = [];
blck_activeMissionsList = []; blck_activeMissionsList = [];