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

Fixed a few script Errors

Browse Source 
Build 176 - static mission monitors still throwing errors after groups despawn.
This commit is contained in:
Chris Cardozo 2019-05-29 20:02:41 -04:00
parent 66439f890b
commit 5f269e5cd8
12 changed files with 64 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
@GMS/addons/custom_server/Changelog 6.90.txt
View File

@ -19,4 +19,10 @@
3. Added a new setting that specifies whether logging of blacklisted items is done (handy for debugging)
blck_logBlacklistedItems = true; // set to false to disable logging
4. Hit and Killed event handlers extensively reworked. Methods for notification of nearby AI and Vehicles of the killers whereabouts were revised to be more inclusive of neighboring AI.
4. Hit and Killed event handlers extensively reworked. Methods for notification of nearby AI and Vehicles of the killers whereabouts were revised to be more inclusive of neighboring AI.
5. Issues with AIHit events fixed; AI now deploy smoke and heal.
6. Removed some unnecessary logging.
7. Other minor coding fixes and optimizations.

2
@GMS/addons/custom_server/Compiles/Functions/GMS_fnc_mainThread.sqf
View File

@ -53,7 +53,7 @@ while {true} do
_timer1min = diag_tickTime + 60;
[] call blck_fnc_spawnPendingMissions;
[] call blck_fnc_cleanEmptyGroups;
[] call bck_fnc_groupWaypointMonitor;
//[] call blck_fnc_groupWaypointMonitor;
if (blck_dynamicUMS_MissionsRuning < blck_numberUnderwaterDynamicMissions) then {[] spawn blck_fnc_addDyanamicUMS_Mission};
if (blck_useHC) then {[] call blck_fnc_HC_passToHCs};
if (blck_useTimeAcceleration) then {[] call blck_fnc_timeAcceleration};

2
@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_missionSpawner.sqf
View File

@ -15,7 +15,7 @@
private ["_abort","_crates","_aiGroup","_objects","_groupPatrolRadius","_missionLandscape","_mines","_blck_AllMissionAI","_blck_localMissionMarker","_assetKilledMsg","_enemyLeaderConfig",
"_AI_Vehicles","_timeOut","_aiDifficultyLevel","_missionPatrolVehicles","_missionGroups","_loadCratesTiming","_spawnCratesTiming","_assetSpawned","_hostageConfig",
"_chanceHeliPatrol","_noPara","_chanceLoot","_heliCrew","_loadCratesTiming","_useMines","_blck_AllMissionAI","_delayTime","_groupPatrolRadius",
"_wait","_missionStartTime","_playerInRange","_missionTimedOut","_temp","_patrolVehicles","_vehToSpawn","_noChoppers","_chancePara","_marker"];
"_wait","_missionStartTime","_playerInRange","_missionTimedOut","_temp","_patrolVehicles","_vehToSpawn","_noChoppers","_chancePara","_marker","_vehicleCrewCount"];
params["_coords","_markerClass","_aiDifficultyLevel"];

3
@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_signalEnd.sqf
View File

@ -14,7 +14,8 @@
#include "\q\addons\custom_server\Configs\blck_defines.hpp";
private ["_start","_maxHeight","_smokeShell","_light","_lightSource"];
params["_crate",["_time",60]];
params[["_crate",objNull],["_time",60]];
if (isNull _crate) exitWith {};
_start = diag_tickTime;
//diag_log format["signalEnd.sqf: _this = %1, _crate = %2",_this, _crate];
_smokeShell = selectRandom ["SmokeShellOrange","SmokeShellBlue","SmokeShellPurple","SmokeShellRed","SmokeShellGreen","SmokeShellYellow"];

16
@GMS/addons/custom_server/Compiles/Units/GMS_fnc_alertNearbyVehicles.sqf
View File

@ -12,16 +12,14 @@
#include "\q\addons\custom_server\Configs\blck_defines.hpp";
params[["_target",objNull]];
if (isnull _target) exitWith {objNull};
//diag_log format["_fnc_alertNearbyVehicles: _target = %1 | typeName _target = %2",_target,typeName _target];
if (isnull _target) exitWith {};
private _nearestVehicles = (nearestObjects [getPos _target,["Car","Truck","Tank","Ship"],300]);
if (_nearestVehicles isEqualTo []) exitWith
{
} else {
private _nearestVehicle = _nearestVehicles select 0;
diag_log format["_fnc_alertNearbyVehicles: _target = %1 | _nearestVehicle = %2",_target,_nearestVehicle];
[(crew _nearestVehicle) select 0,_target] call blck_fnc_alertGroupUnits;
};
if (_nearestVehicles isEqualTo []) exitWith {};
private _nearestVehicle = _nearestVehicles select 0;
//diag_log format["_fnc_alertNearbyVehicles: _target = %1 | _nearestVehicle = %2",_target,_nearestVehicle];
[(crew _nearestVehicle) select 0,_target] call blck_fnc_alertGroupUnits;

6
@GMS/addons/custom_server/Configs/blck_custom_config.sqf
View File

@ -148,9 +148,9 @@ if (blck_debugON || (blck_debugLevel > 0)) then // These variables are found in
blck_maxSpawnedMissions = 15;
blck_mainThreadUpdateInterval = 10;
blck_enableOrangeMissions = -1;
blck_enableGreenMissions = -1;
blck_enableRedMissions = -1;
blck_enableOrangeMissions = 1;
blck_enableGreenMissions = 1;
blck_enableRedMissions = 1;
blck_enableBlueMissions = 1;
blck_numberUnderwaterDynamicMissions = 1;
blck_enableHunterMissions = -1;

4
@GMS/addons/custom_server/Configs/blck_defines.hpp
View File

@ -21,8 +21,8 @@
///////////////////////////
//#define blck_debugMode
#define GRGserver
#define blck_addCarParts
//#define GRGserver
//#define blck_addCarParts
#define blck_triggerLoopCompleteTime 40*60
#define onFoot 1
#define inVehicle 2

2
@GMS/addons/custom_server/Missions/GMS_missionLists.sqf
View File

@ -14,7 +14,7 @@
#include "\q\addons\custom_server\Configs\blck_defines.hpp";
_pathBlue = "Blue";
//_missionListBlue = ["default"];
//_missionListBlue = ["hostage1"];
_missionListBlue = ["default","captive1","hostage1"/*,"default2"/*,"medicalCamp","redCamp","resupplyCamp"*/];
_pathRed = "Red";

22
@GMS/addons/custom_server/Missions/Static/Code/GMS_fnc_sm_monitorVehicles.sqf
View File

@ -12,14 +12,14 @@
#include "\q\addons\custom_server\Configs\blck_defines.hpp";
private["_mode","_sm_groups"];
_sm_groups = +blck_sm_Vehicles;
//diag_log format["_fnc_monitorVehicles: time %2 | blck_sm_Vehicles %1",blck_sm_Vehicles,diag_tickTime];
diag_log format["_fnc_monitorVehicles: time %2 | blck_sm_Vehicles %1",blck_sm_Vehicles,diag_tickTime];
{
_x params["_groupParameters","_group","_groupSpawned","_timesSpawned","_respawnAt","_maxRespawns"];
//diag_log format["_fnc_monitorVehicles: _x %1",_x];
//diag_log format["_fnc_monitorVehicles: _groupParameters = %1",_groupParameters];
//diag_log format["_fnc_monitorVehicles (9): _group %1 | _groupSpawned %2 | _timesSpawned %3 | _respawnAt %4",_group,_groupSpawned,_timesSpawned,_respawnAt];
diag_log format["_fnc_monitorVehicles: _x %1",_x];
diag_log format["_fnc_monitorVehicles: _groupParameters = %1",_groupParameters];
diag_log format["_fnc_monitorVehicles (9): _group %1 | _groupSpawned %2 | _timesSpawned %3 | _respawnAt %4",_group,_groupSpawned,_timesSpawned,_respawnAt];
_groupParameters params["_vehicleType","_pos","_difficulty","_patrolRadius","_respawnTime","_maxRespawns"];
//diag_log format["_fnc_monitorVehicles: _vehicleType | %1 | _pos = %2 | _difficulty = %3 | _patrolRadius = %4 | _respawnTime = %5",_vehicleType,_pos,_difficulty,_patrolRadius,_respawnTime];
diag_log format["_fnc_monitorVehicles: _vehicleType | %1 | _pos = %2 | _difficulty = %3 | _patrolRadius = %4 | _respawnTime = %5",_vehicleType,_pos,_difficulty,_patrolRadius,_respawnTime];
private _element = +_x;//
if (!(isNull _group) && {alive _x} count (units _group) == 0) then
@ -47,7 +47,7 @@ _sm_groups = +blck_sm_Vehicles;
{
// params["_coords","_noVehiclePatrols","_aiDifficultyLevel","_missionPatrolVehicles",["_useRelativePos",true],["_uniforms",[]], ["_headGear",[]],["_vests",[]],["_backpacks",[]],["_weaponList",[]],["_sideArms",[]], ["_isScubaGroup",false]];
_return = [_pos,1,_difficulty,[_groupParameters],false] call blck_fnc_spawnMissionVehiclePatrols;
//diag_log format["_fnc_monitorVehicles: _return = %1",_return];
diag_log format["_fnc_monitorVehicles: _return = %1",_return];
_group = group ((_return select 1) select 0);
_timesSpawned = _timesSpawned + 1;
_groupSpawned = 1;
@ -65,21 +65,21 @@ _sm_groups = +blck_sm_Vehicles;
_element set[respawnAt,_respawnAt];
_element set[groupSpawned,_groupSpawned];
blck_sm_Vehicles set[blck_sm_Vehicles find _x,_element];
//diag_log format["_fnc_monitorVehicles: update respawn time to %1",_respawnAt];
diag_log format["_fnc_monitorVehicles: update respawn time to %1",_respawnAt];
};
default {};
};
//diag_log format["_fnc_monitorVehicles(56) respawn conditions evaluated : _group = %1 | _groupSpawned = %2 | _timesSpawned = %3",_group,_groupSpawned,_timesSpawned];
diag_log format["_fnc_monitorVehicles(56) respawn conditions evaluated : _group = %1 | _groupSpawned = %2 | _timesSpawned = %3",_group,_groupSpawned,_timesSpawned];
} else {
//diag_log format["_fnc_monitorVehicles: diag_tickTime = %1 | playerNearAt = %2",diag_tickTime,_group getVariable["playerNearAt",-1]];
diag_log format["_fnc_monitorVehicles: diag_tickTime = %1 | playerNearAt = %2",diag_tickTime,_group getVariable["playerNearAt",-1]];
if ([_pos,staticPatrolTriggerRange] call blck_fnc_playerInRange) then
{
_group setVariable["playerNearAt",diag_tickTime];
//diag_log format["_fnc_monitorVehicles: playerNearAt updated to %1",_group getVariable["playerNearAt",-1]];
diag_log format["_fnc_monitorVehicles: playerNearAt updated to %1",_group getVariable["playerNearAt",-1]];
} else {
if (diag_tickTime > (_group getVariable["playerNearAt",diag_tickTime]) + blck_sm_groupDespawnTime) then
{
//diag_log format["_fnc_monitorVehicles: despanwing patrol for _element %1",_element];
diag_log format["_fnc_monitorVehicles: despanwing patrol for _element %1",_element];
_groupParameters set [2, {alive _x} count (units _group)];
private _veh = vehicle (leader _group);
[_veh] call blck_fnc_destroyVehicleAndCrew;

25
@GMS/addons/custom_server/Missions/Static/Code/blck_fnc_sm_missionPatrolMonitor.sqf Normal file
View File

@ -0,0 +1,25 @@
/*
by Ghostrider [GRG]
for ghostridergaming
12/5/17
--------------------------
License
--------------------------
All the code and information provided here is provided under an Attribution Non-Commercial ShareAlike 4.0 Commons License.
http://creativecommons.org/licenses/by-nc-sa/4.0/
*/
#include "\q\addons\custom_server\Configs\blck_defines.hpp";
[] call blck_fnc_sm_monitorInfantry;
[] call blck_fnc_sm_monitorVehicles;
[] call blck_fnc_sm_monitorAircraft;
[] call blck_fnc_sm_monitorEmplaced;
[] call blck_fnc_sm_monitorScuba;
[] call blck_fnc_sm_monitorShips;
[] call blck_fnc_sm_monitorSubs;
[] call blck_fnc_sm_monitorGarrisonsASL;
[] call blck_fnc_sm_monitorGarrisons_relPos;

4
@GMS/addons/custom_server/Missions/Static/GMS_StaticMissions_Lists.sqf
View File

@ -16,10 +16,10 @@ private ["_staticMissions"];
_staticMissions = [
// [mod (Epoch, Exile), map (Altis, Tanoa etc), mission center, eg [10445,2014,0], filename.sqf (name of static mission template for that mission)];
//["Epoch","Altis","template.sqf"],
//["Epoch","Altis","staticMissionExample2_Epoch.sqf"],
["Epoch","Altis","staticMissionExample2_Epoch.sqf"],
//["Epoch","Altis","destroyer.sqf"],
//["Exile","Altis","template.sqf"],
//["Exile","Altis","staticMissionExample2_Exile.sqf"]
["Exile","Altis","staticMissionExample2_Exile.sqf"]
];
diag_log "[blckeagls] GMS_StaticMissions_Lists.sqf <Loaded>";

4
@GMS/addons/custom_server/init/build.sqf
View File

@ -1,4 +1,4 @@
#define blck_buildNumber 175
#define blck_buildNumber 176
#define blck_versionNumber 6.90
#define blck_buildDate "5-23-19"
#define blck_buildDate "5-29-19"