From 7109cd74fbd1c3c138d57c43965aa680faba1562 Mon Sep 17 00:00:00 2001 From: "Ghostrider [GRG]" Date: Sat, 4 Nov 2023 00:46:53 -0400 Subject: [PATCH] Fixed a tiny bug and cleaned up code --- @GMS/addons/GMS/Compiles/Missions/fn_initializeMission.sqf | 4 ++-- .../GMS/Compiles/Missions/fn_monitorSpawnedMissions.sqf | 7 +++++-- .../addons/GMS/Compiles/Missions/fn_spawnMissionAssets.sqf | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/@GMS/addons/GMS/Compiles/Missions/fn_initializeMission.sqf b/@GMS/addons/GMS/Compiles/Missions/fn_initializeMission.sqf index 266e627..192787d 100644 --- a/@GMS/addons/GMS/Compiles/Missions/fn_initializeMission.sqf +++ b/@GMS/addons/GMS/Compiles/Missions/fn_initializeMission.sqf @@ -232,8 +232,8 @@ try { _markers // index 9 ]; - #define spawnPara -1 - GMS_initializedMissionsList pushBack [_key, missionTimeoutAt, triggered, _missionData, _missionConfigs, spawnPara,_isStatic]; + #define spawnPara true + GMS_initializedMissionsList pushBack [_key, missionTimeoutAt, triggered, _missionData, _missionConfigs, spawnPara,_isStatic,_missionFile]; // Repair any damage done by prior activities. {_x setDamage 0} forEach ( nearestObjects [_coords, ["Building"], 500]); diff --git a/@GMS/addons/GMS/Compiles/Missions/fn_monitorSpawnedMissions.sqf b/@GMS/addons/GMS/Compiles/Missions/fn_monitorSpawnedMissions.sqf index a37d827..5df3785 100644 --- a/@GMS/addons/GMS/Compiles/Missions/fn_monitorSpawnedMissions.sqf +++ b/@GMS/addons/GMS/Compiles/Missions/fn_monitorSpawnedMissions.sqf @@ -114,12 +114,15 @@ for "_i" from 1 to (count _missionsList) do if (_endIfPlayerNear && {_playerIsNear}) then {throw 1}; // mission complete if (_endIfAIKilled && {_aiKilled}) then {throw 1}; - if (_spawnPara isEqualType 0) then + if (_spawnPara) then { #define chancePara 0; private _chancePara = _paraConfigs select chancePara; _spawnPara = if (random(1) < _chancePara ) then {true} else {false}; - _el set[spawnPara, _spawnPara]; + + if !(_spawnPara) then { + _el set[spawnPara, _spawnPara]; + }; }; if (_spawnPara) then { diff --git a/@GMS/addons/GMS/Compiles/Missions/fn_spawnMissionAssets.sqf b/@GMS/addons/GMS/Compiles/Missions/fn_spawnMissionAssets.sqf index 3a8a6bf..9482bae 100644 --- a/@GMS/addons/GMS/Compiles/Missions/fn_spawnMissionAssets.sqf +++ b/@GMS/addons/GMS/Compiles/Missions/fn_spawnMissionAssets.sqf @@ -237,7 +237,7 @@ if (GMS_useStatic && !(_missionEmplacedWeapons isEqualTo [])) then uisleep delayTime; }; }; -diag_log format["_spawnMissionAssets(241): _missionLootVehicles = %1",_missionLootVehicles]; +//diag_log format["_spawnMissionAssets(241): _missionLootVehicles = %1",_missionLootVehicles]; if !(_missionLootVehicles isEqualTo []) then { _lootVehicles = [_coords,_missionLootVehicles,_spawnCratesTiming,_missionFile] call GMS_fnc_spawnMissionLootVehicles; @@ -260,7 +260,7 @@ if !(_missionLootVehicles isEqualTo []) then ["_crewCount",4] ]; */ -diag_log format["_spawnMissionAssets (264): __missionPatrolVehicles = %1",_missionPatrolVehicles]; +//diag_log format["_spawnMissionAssets (264): __missionPatrolVehicles = %1",_missionPatrolVehicles]; if (GMS_useVehiclePatrols && {!(_missionPatrolVehicles isEqualTo [])}) then { _temp = [_coords,_difficulty,_missionPatrolVehicles,_uniforms,_headGear,_vests,_backpacks,_weaponList,_sideArms,false,_vehicleCrewCount] call GMS_fnc_spawnMissionVehiclePatrols;