diff --git a/@GMS/addons/GMS/Compiles/Functions/fn_missionCompleteMarker.sqf b/@GMS/addons/GMS/Compiles/Functions/fn_missionCompleteMarker.sqf index 1abc41e..ffcb747 100644 --- a/@GMS/addons/GMS/Compiles/Functions/fn_missionCompleteMarker.sqf +++ b/@GMS/addons/GMS/Compiles/Functions/fn_missionCompleteMarker.sqf @@ -10,13 +10,6 @@ http://creativecommons.org/licenses/by-nc-sa/4.0/ */ #include "\GMS\Compiles\Init\GMS_defines.hpp" -private _fn_cleanup = { - private _m = _this; - uiSleep 350; - //[format["_fn_cleanup: deleting marker %1",_m]] call GMS_fnc_log; - deleteMarker _m; -}; - //diag_log format["GMS_fnc_missionCompleteMarker:: _this = %1",_this]; private _location = _this select 0; @@ -26,6 +19,5 @@ _m setMarkerColor "ColorBlack"; _m setMarkerType "n_hq"; _m setMarkerText "Mission Cleared"; -[_m, diag_tickTime + 30] call GMSCore_fnc_addToDeletionCue; -_m spawn _fn_cleanup; -//diag_log format["missionCompleteMarker complete script for _this = %1",_this]; +[_m, diag_tickTime + 360] call GMSCore_fnc_addToDeletionCue; + diff --git a/@GMS/addons/GMS/Compiles/Missions/GMS_fnc_missionSpawner.sqf b/@GMS/addons/GMS/Compiles/Missions/GMS_fnc_missionSpawner.sqf index 23d9a53..af2346f 100644 --- a/@GMS/addons/GMS/Compiles/Missions/GMS_fnc_missionSpawner.sqf +++ b/@GMS/addons/GMS/Compiles/Missions/GMS_fnc_missionSpawner.sqf @@ -24,7 +24,10 @@ private ["_abort","_crates","_aiGroup","_objects","_groupPatrolRadius","_mission "_missionUAVs", "_missionGarrisonedGroups", "_chanceMissionSpawned", - "_rewardVehicles "]; + "_rewardVehicles", + // New private Variables from 10-15-23 + "_timeoutMsg" + ]; params["_markerName",["_aiDifficultyLevel","Red"]]; if (isNil "_markerLabel") then {_markerLabel = _markerMissionName}; @@ -88,6 +91,7 @@ if (isNil "_simpleObjects") then {_simpleObjects = []}; if (isNil "_missionemplacedweapons") then {_missionemplacedweapons = []}; // Allow for and capture any custom difficult setting in the mission if !(isNil "_difficulty") then {_aiDifficultyLevel = _difficulty}; +if (isNil "_timeoutMsg") then {_timeoutMsg = ""}; _markerType params["_markerType",["_markersize",[250,250]],["_markerBrush","GRID"]]; private _paraSkill = _aiDifficultyLevel; @@ -175,7 +179,8 @@ private _aiConfigs = [ private _missionMessages = [ _assetKilledMsg, _endMsg, - _startMsg + _timeoutMsg, + _startMsg ]; private _timesSpawned = 0; diff --git a/@GMS/addons/GMS/Compiles/Missions/fn_addMIssionToQue.sqf b/@GMS/addons/GMS/Compiles/Missions/fn_addMIssionToQue.sqf index ff19a04..b562ab3 100644 --- a/@GMS/addons/GMS/Compiles/Missions/fn_addMIssionToQue.sqf +++ b/@GMS/addons/GMS/Compiles/Missions/fn_addMIssionToQue.sqf @@ -11,9 +11,9 @@ params[["_missionList",[]],["_path",""],["_marker",""],["_difficulty","Red"],["_tMin",60],["_tMax",120],["_noMissions",1],["_isStatic",false]]; //diag_log format["_addMissionToQue: _this = %1",_this]; -{ - diag_log format["_addMissionToQue: _this %1 = %2",_forEachIndex, _this select _forEachIndex]; -} forEach _this; +//{ + //diag_log format["_addMissionToQue: _this %1 = %2",_forEachIndex, _this select _forEachIndex]; +//} forEach _this; private "_waitTime"; if (_isStatic) then { diff --git a/@GMS/addons/GMS/Compiles/Missions/fn_endMission.sqf b/@GMS/addons/GMS/Compiles/Missions/fn_endMission.sqf index eed3f82..ecdcb00 100644 --- a/@GMS/addons/GMS/Compiles/Missions/fn_endMission.sqf +++ b/@GMS/addons/GMS/Compiles/Missions/fn_endMission.sqf @@ -56,6 +56,7 @@ _missionLootConfigs params [ // Ignore the remaining entries in the configuration ]; */ + {[_x] call GMS_fnc_deleteMarker} forEach (_markers); { @@ -72,6 +73,9 @@ switch (_endCode) do { case -1: { //[format["_endMission (93): _exception -1 | _mines %1 | _crates %2 | count _objects %3 | count _missionAI %4 ",_mines,_crates,count _objects, count _missionAI]] call GMS_fnc_log; + if !(_endMsg isEqualTo "") then { + [["end",_endMsg,"News Update"]] call GMS_fnc_messageplayers; + }; GMS_hiddenTerrainObjects pushBack[_hiddenObjects,(diag_tickTime)]; [_mines, 0] call GMSCore_fnc_deleteObjectsMethod; [_crates, 0] call GMSCore_fnc_deleteObjectsMethod; @@ -81,7 +85,7 @@ switch (_endCode) do [_lootVehicles, 0] call GMSCore_fnc_deleteObjectsMethod; }; case 1: { // Normal End - //[format["_endMission (102): _exception 1 (normal ending) | _mines %1 | _crates %2 | count _objects %3 | count _missionAI %4 ",_mines,_crates,count _objects, count _missionAI]] call GMS_fnc_log; + [format["_endMission (102): _exception 1 (normal ending) | _mines %1 | _crates %2 | count _objects %3 | count _missionAI %4 ",_mines,_crates,count _objects, count _missionAI]] call GMS_fnc_log; if (GMS_useSignalEnd) then { //[_crates select 0,150, GMS_smokeShellAtCrates] call GMSCore_fnc_visibleMarker; @@ -93,7 +97,7 @@ switch (_endCode) do [["end",_endMsg,_markerMissionName]] call GMS_fnc_messageplayers; - [_coords, _markerName] spawn GMS_fnc_missionCompleteMarker; + [_coords, _markerName] call GMS_fnc_missionCompleteMarker; { //private ["_v","_posnVeh"]; @@ -110,7 +114,9 @@ switch (_endCode) do [_objects, (diag_tickTime + GMS_cleanupCompositionTimer)] call GMSCore_fnc_addToDeletionCue; GMS_hiddenTerrainObjects pushBack[_hiddenObjects,(diag_tickTime + GMS_cleanupCompositionTimer)]; [_missionAI, (diag_tickTime + GMS_AliveAICleanUpTimer)] call GMSCore_fnc_addToDeletionCue; - if (_isStatic) then {[_crates, diag_tickTime + GMS_cleanupCompositionTimer] call GMSCore_fnc_addToDeletionCue}; + if (_isStatic) then { + [_crates, diag_tickTime + GMS_cleanupCompositionTimer] call GMSCore_fnc_addToDeletionCue; + }; [format["Mission Completed | _coords %1 : _markerClass %2 : _markerMissionName %3",_coords,_markerName,_markerName]] call GMS_fnc_log; }; case 2: { // Aborted for moving a crate diff --git a/@GMS/addons/GMS/Compiles/Missions/fn_initializeMission.sqf b/@GMS/addons/GMS/Compiles/Missions/fn_initializeMission.sqf index 76591c7..6fe78c6 100644 --- a/@GMS/addons/GMS/Compiles/Missions/fn_initializeMission.sqf +++ b/@GMS/addons/GMS/Compiles/Missions/fn_initializeMission.sqf @@ -168,12 +168,18 @@ private _markers = [ _markerSize, _markerBrush] call GMS_fnc_createMissionMarkers; -if (GMS_debugLevel >= 2) then {[format["_initializeMission (130): _marker = %1 | _markerMissionName = %2 | _difficulty = %3",_markers,_markerMissionName,_difficulty]] call GMS_fnc_log}; +if (GMS_debugLevel >= 0) then {[format["_initializeMission (130): _marker = %1 | _markerMissionName = %2 | _difficulty = %3",_markers,_markerMissionName,_difficulty]] call GMS_fnc_log}; /* Send a message to players. */ - private _startMsg = _missionMessages select 2; +_missionMessages params [ + "_assetKilledMsg", + "_endMsg", + "_timeoutMsg", + "_startMsg" +]; + [["start",_startMsg,_markerMissionName]] call GMS_fnc_messageplayers; #define missionTimeoutAt (diag_tickTime + GMS_MissionTimeout) @@ -201,6 +207,6 @@ private _missionData = [ ]; #define spawnPara -1 GMS_initializedMissionsList pushBack [_key, missionTimeoutAt, triggered, _missionData, _missionConfigs, spawnPara,_isStatic]; -[format["_initializeMission (163): count GMS_initializedMissionsList = %1",count GMS_initializedMissionsList]] call GMS_fnc_log; +//[format["_initializeMission (163): count GMS_initializedMissionsList = %1",count GMS_initializedMissionsList]] call GMS_fnc_log; _initialized = 1; _initialized \ No newline at end of file diff --git a/@GMS/addons/GMS/Compiles/Missions/fn_monitorInitializedMissions.sqf b/@GMS/addons/GMS/Compiles/Missions/fn_monitorInitializedMissions.sqf index b71c4da..ce7efb9 100644 --- a/@GMS/addons/GMS/Compiles/Missions/fn_monitorInitializedMissions.sqf +++ b/@GMS/addons/GMS/Compiles/Missions/fn_monitorInitializedMissions.sqf @@ -41,128 +41,146 @@ for "_i" from 1 to (count _missionsList) do #define triggered 2 #define missionCoords (_missionData select 0) #define delayTime 1 - - private _monitorAction = -2; - - if (_triggered == 0) then - { - if ((_missionTimeoutAt > 0) && {diag_tickTime > _missionTimeoutAt}) then - { - _monitorAction = -1; - diag_log format["_monitorInitializedMissions (37) Mission Timeout Criteria Met at %1",diag_tickTime]; - } else { - _playerInRange = if ({(_x distance2d missionCoords) < GMS_TriggerDistance /*&& ((vehicle _x == _x) || (getPosATL _x) select 2 < 5)*/} count allPlayers > 0) then {true} else {false}; - //diag_log format["_monitorInitializedMissions(56): _playerInRange = %1",_playerInRange]; - if (_playerInRange) then { - //diag_log format["_monitorInitializedMissions (52) Player in range criteria met at %1 for _key %2",diag_tickTime,_key]; - _monitorAction = 0; - } else { - if (GMS_debugLevel >= 3) then - { - _monitorAction = 0; - //[format["_monitorInitializedMissions (54): mission triggered for GMS_debugLevel = %1",GMS_debugLevel]] call GMS_fnc_log; + if !(_triggered == 0) then { + _missionsList pushBack _el; + } else { + private _playerInRange = if ({(_x distance2d missionCoords) < GMS_TriggerDistance /*&& ((vehicle _x == _x) || (getPosATL _x) select 2 < 5)*/} count allPlayers > 0) then {true} else {false}; + try { + switch (true) do + { + case ((_missionTimeoutAt > 0) && {diag_tickTime > _missionTimeoutAt && !(_isStatic)}): { + diag_log format["_monitorInitializedMissions (37) Mission Timeout Criteria Met at %1",diag_tickTime]; + throw -1; + }; + case (_playerInRange): { + diag_log format["_monitorInitializedMissions (52) Player in range criteria met at %1 for _key %2",diag_tickTime,_key]; + throw 0; + }; + case (GMS_debugLevel >= 3): { + [format["_monitorInitializedMissions (54): mission triggered for GMS_debugLevel = %1",GMS_debugLevel]] call GMS_fnc_log; + throw 0; }; // simulate the mission being tripped by a player + default { + //[format["_monitorInitializedMissions (77): throw -2 | mission not triggered or timed out at %1",diag_tickTime]] call GMS_fnc_log; + throw -2; + }; }; - }; - }; - - //if (GMS_debugLevel > 0) then {[format["_monitorInitializedMissions (68): time %1 | _monitorAction %2 | _missionConfigs %3",diag_tickTime,_monitorAction,_missionConfigs]] call GMS_fnc_log}; - - switch (_monitorAction) do - { - // Nothing needs to be done - case -2 : { - _missionsList pushBack _el; - }; - - // Handle Timeout - case -1: - { - // _missionConfigs is configured as: - /* - private _table = [ - _aiDifficultyLevel, // index 0 - _markerConfigs, // index 1 - _endCondition, // index 2 - _isscubamission, // index 3 - _missionLootConfigs, // index 4 - _aiConfigs, // index 5 - _missionMessages, // index 6 - _paraConfigs, // index 7 - _defaultMissionLocations, - _maxMissionRespawns, // index 9 - _timesSpawned, // index 10 - _chanceMissionSpawned, // index 11 - _isSpawned, // index 12 - _spawnedAt // index 13 - ]; - */ - - _missionMessages params [ - "_assetKilledMsg", - "_endMsg" - ]; - - //[format["_fnc_monitorInitializedMissions (71): mission timed out: _endMsg %1 | el %2",_endMsg,_el]] call GMS_fnc_log; - - /* - ["_key",-1], - ["_missionData",[]], - ["_endMsg",,""], - ["_markerData",[]], - ["_missionLootConfigs",[]], - ["_isScuba",false], - ["_endCode",-1] - */ - _missionConfigs set[isSpawned,false]; - [_key, _missionData, "", _missionData,_missionLootConfigs,_isscubamission,-1] call GMS_fnc_endMission; - _missionsList pushBack _el; - }; + } - // Handle mission waiting to be triggerd and player is within the range to trigger - case 0: - { - [_missionData,_missionConfigs,_spawnPara] call GMS_fnc_spawnMissionAssets; + catch { + //[format["_monitorInitializeMissions (69): diag_tickTime %1 | _missionTimeoutAt %2 | _exception %3",diag_tickTime,_missionTimeoutAt,_exception]] call GMS_fnc_log; - // _el is structured as: - /* - _el params [ - "_key", - "_missionTimeoutAt", // 1 // server time at which the mission times out. - "_triggered", // 2 // integer - specifies if mission was triggered by a player or scripting such as debug setting - "_missionData", // 4 // variable containing information specific to this instance of the mission such as location and objects - "_missionConfigs", // 5 // Variables regarding the configuration of the dynamic mission - "_spawnPara", // - "_isStatic" // 7 // A flag as to whether the mission is a static or dynamically spawned mission. - ]; - */ - _el set[triggered,1]; + switch (_exception) do { + // Nothing needs to be done + case -2 : { + _missionsList pushBack _el; + }; - // _missionConfigs is configured as: - /* - private _table = [ - _aiDifficultyLevel, // index 0 - _markerConfigs, // index 1 - _endCondition, // index 2 - _isscubamission, // index 3 - _missionLootConfigs, // index 4 - _aiConfigs, // index 5 - _missionMessages, // index 6 - _paraConfigs, // index 7 - _defaultMissionLocations, - _maxMissionRespawns, // index 9 - _timesSpawned, // index 10 - _chanceMissionSpawned, // index 11 - _isSpawned, // index 12 - _spawnedAt // index 13 + // Handle Timeout + case -1: + { + // _missionConfigs is configured as: + /* + private _table = [ + _aiDifficultyLevel, // index 0 + _markerConfigs, // index 1 + _endCondition, // index 2 + _isscubamission, // index 3 + _missionLootConfigs, // index 4 + _aiConfigs, // index 5 + _missionMessages, // index 6 + _paraConfigs, // index 7 + _defaultMissionLocations, + _maxMissionRespawns, // index 9 + _timesSpawned, // index 10 + _chanceMissionSpawned, // index 11 + _isSpawned, // index 12 + _spawnedAt // index 13 + ]; + */ + _missionConfigs params[ + "_difficulty", + "_markerConfigs", + "_endCondition", + "_isscubamission", + "_missionLootConfigs", + "_aiConfigs", + "_missionMessages", + "_paraConfigs", + "_defaultMissionLocations", + "_maxMissionRespawns", + "_timesSpawned", + "_chanceMissionSpawned", + "_isSpawned", + "_spawnedAt" + ]; + + _missionMessages params [ + "_assetKilledMsg", + "_endMsg", + "_timeoutMsg" ]; - */ + + //[format["_fnc_monitorInitializedMissions (71): mission timed out: _endMsg %1 | el %2",_endMsg,_el]] call GMS_fnc_log; + + /* + ["_key",-1], + ["_missionData",[]], + ["_endMsg",,""], + ["_markerData",[]], + ["_missionLootConfigs",[]], + ["_isScuba",false], + ["_endCode",-1] + */ + _missionConfigs set[isSpawned,false]; + [_key, _missionData, _timeoutMsg, _missionData,_missionLootConfigs,_isscubamission,-1] call GMS_fnc_endMission; + }; + + // Handle mission waiting to be triggerd and player is within the range to trigger + case 0: + { + [_missionData,_missionConfigs,_spawnPara] call GMS_fnc_spawnMissionAssets; - //_missionConfigs set[isSpawned, true]; - _missionConfigs set[spawnedAt, diag_tickTime]; + // _el is structured as: + /* + _el params [ + "_key", + "_missionTimeoutAt", // 1 // server time at which the mission times out. + "_triggered", // 2 // integer - specifies if mission was triggered by a player or scripting such as debug setting + "_missionData", // 4 // variable containing information specific to this instance of the mission such as location and objects + "_missionConfigs", // 5 // Variables regarding the configuration of the dynamic mission + "_spawnPara", // + "_isStatic" // 7 // A flag as to whether the mission is a static or dynamically spawned mission. + ]; + */ + _el set[triggered,1]; - _missionsList pushBack _el; + // _missionConfigs is configured as: + /* + private _table = [ + _aiDifficultyLevel, // index 0 + _markerConfigs, // index 1 + _endCondition, // index 2 + _isscubamission, // index 3 + _missionLootConfigs, // index 4 + _aiConfigs, // index 5 + _missionMessages, // index 6 + _paraConfigs, // index 7 + _defaultMissionLocations, + _maxMissionRespawns, // index 9 + _timesSpawned, // index 10 + _chanceMissionSpawned, // index 11 + _isSpawned, // index 12 + _spawnedAt // index 13 + ]; + */ + + //_missionConfigs set[isSpawned, true]; + _missionConfigs set[spawnedAt, diag_tickTime]; + _missionsList pushBack _el; + }; + }; }; }; }; diff --git a/@GMS/addons/GMS/Compiles/Missions/fn_monitorSpawnedMissions.sqf b/@GMS/addons/GMS/Compiles/Missions/fn_monitorSpawnedMissions.sqf index ba7e3bf..1d300b7 100644 --- a/@GMS/addons/GMS/Compiles/Missions/fn_monitorSpawnedMissions.sqf +++ b/@GMS/addons/GMS/Compiles/Missions/fn_monitorSpawnedMissions.sqf @@ -229,10 +229,6 @@ for "_i" from 1 to (count _missionsList) do "_missionLootVehicles" ]; - _missionMessages params [ - "_assetKilledMsg", - "_endMsg" - ]; if (GMS_debugLevel > 0) then {[format["_monitorSpawnedMissions(234): _exception = %1 | _spawnedAt = %2",_exception,_spawnedAt]] call GMS_fnc_log}; switch (_exception) do { @@ -299,6 +295,10 @@ for "_i" from 1 to (count _missionsList) do ["_endCode",-1] */ //[format["_monitorSpawnedMissions: Catch case 1 - normal mission waypointCompletionRadius - at %1",diag_tickTime]] call GMS_fnc_log; + _missionMessages params [ + "_assetKilledMsg", + "_endMsg" + ]; [_key, _missionData, _endMsg, _markerConfigs, _missionLootConfigs,_isscubamission, 1, _isStatic] call GMS_fnc_endMission; // _missionConfigs is configured as: @@ -450,12 +450,12 @@ for "_i" from 1 to (count _missionsList) do }; case 6: { // Mission not fully spawned yet for some reason. This should never happen but this case is included for completeness. - [format["_monitorSpawnedMissions: Catch case 6 - mission not fully spawned - at %1",diag_tickTime]] call GMS_fnc_log; + //[format["_monitorSpawnedMissions: Catch case 6 - mission not fully spawned - at %1",diag_tickTime]] call GMS_fnc_log; _missionsList pushBack _el; }; case 7: { // The mission only just spawned - lets give it 60 sec to settle. - [format["_monitorSpawnedMissions: Catch case 7 - wating for mission to settle - at %1",diag_tickTime]] call GMS_fnc_log; + //[format["_monitorSpawnedMissions: Catch case 7 - wating for mission to settle - at %1",diag_tickTime]] call GMS_fnc_log; _missionsList pushBack _el; }; }; diff --git a/@GMS/addons/GMS/Compiles/Missions/fn_spawnNewMissions.sqf b/@GMS/addons/GMS/Compiles/Missions/fn_spawnNewMissions.sqf index 2c42017..79701ec 100644 --- a/@GMS/addons/GMS/Compiles/Missions/fn_spawnNewMissions.sqf +++ b/@GMS/addons/GMS/Compiles/Missions/fn_spawnNewMissions.sqf @@ -38,11 +38,13 @@ if (GMS_missionsRunning >= GMS_maxSpawnedMissions) exitWith */ _missionDescriptors params["_key","_difficulty","_maxMissions","_activeMissions","_tMin","_tMax","_waitTime","_missionsData","_isStatic"]; + /* { diag_log format["_spawnNewMission: _this %1 = %2",_forEachIndex, _x]; } forEach _missionDescriptors; + */ - diag_log format["_spawnNewMission: _missionsData = %1",_missionsData]; + //diag_log format["_spawnNewMission: _missionsData = %1",_missionsData]; if (_missionsData isEqualTo []) exitWith {-1}; if (_activeMissions < _maxMissions && {diag_tickTime > _waitTime && {GMS_missionsRunning < GMS_maxSpawnedMissions}}) then @@ -68,10 +70,10 @@ if (GMS_missionsRunning >= GMS_maxSpawnedMissions) exitWith _spawnedAt // index 14 ]; */ - { + /*{ diag_log format["_spawnNewMission:_missionSelected: _this %1 = %2",_forEachIndex,_x]; } forEach _missionSelected; - + */ /* params[ // for GMS_fnc_initialiZeMission are "_key", // This key can be used to seach the list of available mission types to update that list when a mission is completed or times out @@ -80,7 +82,7 @@ if (GMS_missionsRunning >= GMS_maxSpawnedMissions) exitWith "_isStatic" ]; */ - diag_log format["_spawnNewMissions: _missionSelected = %1",_missionSelected]; + //diag_log format["_spawnNewMissions: _missionSelected = %1",_missionSelected]; private _missionInitialized = [_key,_missionSelected,GMS_dynamicMissionsSpawned,_isStatic] call GMS_fnc_initializeMission; if (_missionInitialized == 1) then { // This is a dynamic mission s see if we can spawn another instance of this categore (blue, red, green, orange) diff --git a/@GMS/addons/GMS/Configs/GMS_configs.sqf b/@GMS/addons/GMS/Configs/GMS_configs.sqf index b0edffb..63284c1 100644 --- a/@GMS/addons/GMS/Configs/GMS_configs.sqf +++ b/@GMS/addons/GMS/Configs/GMS_configs.sqf @@ -100,20 +100,31 @@ switch (GMSCore_modType) do GMS_rewardsRed = [[8,14],12,15]; GMS_rewardsGreen = [[10,18],[15,20]]; GMS_rewardsOrange = [[12,20],20,25]; - GMS_rewards = [GMS_rewardsBlue,GMS_rewardsRed,GMS_rewardsGreen,GMS_rewardsOrange]; + + // Amount of tabs added to each mission crate + GMS_crateMoneyBlue = [100,250]; + GMS_crateMoneyRed = [175, 300]; + GMS_crateMoneyGreen = [300, 500]; + GMS_crateMoneyOrange = [500, 750]; GMS_distanceBonus = 3; // per 100 M, max = 5 * this value; GMS_killsBonus = 3; // from 2X up, max 6* this value - GMS_killstreakTimeout = 300; // 5 min + GMS_killstreakTimeout = 60; // 300; // 5 min GMS_distantIncrementForCalculatingBonus = 100; }; case "Exile": { // expressed as [][tabs min, tabs max],[respect min,respect max]] + // Tabs will be added to bodies of killed AI. Respect will be awarded to players for each kill. GMS_rewardsBlue = [[5,10],[8,12]]; GMS_rewardsRed = [[8,14],[12,15]]; GMS_rewardsGreen = [[10,18],[15,20]]; GMS_rewardsOrange = [[12,20],[20,25]]; - GMS_rewards = [GMS_rewardsBlue,GMS_rewardsRed,GMS_rewardsGreen,GMS_rewardsOrange]; + + // Amount of tabs added to each mission crate + GMS_crateMoneyBlue = [1400,2150]; + GMS_crateMoneyRed = [3175, 5300]; + GMS_crateMoneyGreen = [16300, 21500]; + GMS_crateMoneyOrange = [23500, 24750]; GMS_rewardsNotifications = ["dynamicText"]; diff --git a/@GMS/addons/GMS/Configs/GMS_configs_epoch.sqf b/@GMS/addons/GMS/Configs/GMS_configs_epoch.sqf index 7d98212..6c49121 100644 --- a/@GMS/addons/GMS/Configs/GMS_configs_epoch.sqf +++ b/@GMS/addons/GMS/Configs/GMS_configs_epoch.sqf @@ -39,11 +39,6 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR **********************************************************************************/ - GMS_crateMoneyBlue = [100,250]; - GMS_crateMoneyRed = [175, 300]; - GMS_crateMoneyGreen = [300, 500]; - GMS_crateMoneyOrange = [500, 750]; - GMS_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"]; // Default crate type. GMS_allowSalesAtBlackMktTraders = true; // Allow vehicles to be sold at Halvjes black market traders. diff --git a/@GMS/addons/GMS/Configs/GMS_configs_exile.sqf b/@GMS/addons/GMS/Configs/GMS_configs_exile.sqf index 349cc1f..59542a4 100644 --- a/@GMS/addons/GMS/Configs/GMS_configs_exile.sqf +++ b/@GMS/addons/GMS/Configs/GMS_configs_exile.sqf @@ -50,11 +50,6 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR GMS_blacklistSpawns = true; GMS_listConcreteMixerZones = true; - GMS_crateMoneyBlue = [1400,2150]; - GMS_crateMoneyRed = [3175, 5300]; - GMS_crateMoneyGreen = [16300, 21500]; - GMS_crateMoneyOrange = [23500, 24750]; - GMS_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"]; // Default crate type. GMS_maximumItemPriceInAI_Loadouts = 1000; diff --git a/@GMS/addons/GMS/Configs/GMS_custom_config.sqf b/@GMS/addons/GMS/Configs/GMS_custom_config.sqf index 25d9716..119d57f 100644 --- a/@GMS/addons/GMS/Configs/GMS_custom_config.sqf +++ b/@GMS/addons/GMS/Configs/GMS_custom_config.sqf @@ -138,7 +138,7 @@ if (GMS_debugLevel > 0) then { //GMS_minDistanceToPlayer = 1000; //GMS_minDistanceFromTowns = 100; //GMS_preciseMapMarkers = true; - //GMS_MissionTimeout = 60; + //GMS_MissionTimeout = 120; GMS_cleanupCompositionTimer = 30; GMS_AliveAICleanUpTimer = 30; GMS_bodyCleanUpTimer = 30; @@ -155,7 +155,7 @@ if (GMS_debugLevel > 0) then { GMS_enableHunterMissions = 0; GMS_enableScoutsMissions = 1; GMS_enableStaticMissions = 1; - GMS_maxCrashSites = 1; + GMS_maxCrashSites = 0; GMS_noPatrolHelisBlue = 0; GMS_noPatrolHelisRed = 1; @@ -199,7 +199,7 @@ if (GMS_debugLevel > 0) then { GMS_TMin_Scouts = 45; GMS_TMin_Crashes = 5; GMS_TMin_UMS = 20; - GMS_TMin_Statics = 120; // minimum time for RESPAWN of static missions + GMS_TMin_Statics = 400; // minimum time for RESPAWN of static missions //Maximum Spawn time between missions in seconds GMS_TMax_Blue = 12; GMS_TMax_Red = 15; diff --git a/@GMS/addons/GMS/Missions/Blue/Service_point.sqf b/@GMS/addons/GMS/Missions/Blue/Service_point.sqf index 4c62262..e7753c1 100644 --- a/@GMS/addons/GMS/Missions/Blue/Service_point.sqf +++ b/@GMS/addons/GMS/Missions/Blue/Service_point.sqf @@ -20,7 +20,7 @@ _lootCounts = GMS_lootCountsBlue; _startMsg = "A Service Point was sighted in a nearby sector! Check the Blue marker on your map for the location!"; _endMsg = "The Service Point at the Blue Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ELLIPSE",[200,200],"GRID"]; +_markerType = ["ELLIPSE",[200,200],"SOLID"]; _markerColor = "ColorBlue"; _markerMissionName = "Service Point"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Blue/captive1.sqf b/@GMS/addons/GMS/Missions/Blue/captive1.sqf index 86f5fb9..ceac28f 100644 --- a/@GMS/addons/GMS/Missions/Blue/captive1.sqf +++ b/@GMS/addons/GMS/Missions/Blue/captive1.sqf @@ -19,7 +19,7 @@ _startMsg = "A local Mafia Don has been spotted! Capture him and earn a reward!" _endMsg = "The Maria Don was captured and the area is under survivor control!"; _assetKilledMsg = "Enemy Leader Killed and Bandits Fled with All Loot: Mission Aborted"; _markerLabel = ""; -_markerType = ["ELLIPSE",[175,175],"GRID"]; +_markerType = ["ELLIPSE",[200,200],"SOLID"]; _markerColor = "ColorBlue"; _markerMissionName = "Capture Don"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Blue/default.sqf b/@GMS/addons/GMS/Missions/Blue/default.sqf index 18172ab..dd32dcd 100644 --- a/@GMS/addons/GMS/Missions/Blue/default.sqf +++ b/@GMS/addons/GMS/Missions/Blue/default.sqf @@ -60,7 +60,7 @@ _lootCounts = GMS_lootCountsBlue; _startMsg = "A group of Bandits was sighted in a nearby sector! Check the Blue marker on your map for the location!"; _endMsg = "The Sector at the Blue Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ELLIPSE",[175,175],"GRID"]; +_markerType = ["ELLIPSE",[200,200],"SOLID"]; //_markerType = ["RECTANGLE", [350,350],"GRID"Full"]; // The mission system supports circular or square mission markers as well as typical Arma icon-style (triangle, dot, flag etc) markers. // to have an icon define the map marker as follows: diff --git a/@GMS/addons/GMS/Missions/Blue/sniperBase.sqf b/@GMS/addons/GMS/Missions/Blue/sniperBase.sqf index 32a0709..67ead49 100644 --- a/@GMS/addons/GMS/Missions/Blue/sniperBase.sqf +++ b/@GMS/addons/GMS/Missions/Blue/sniperBase.sqf @@ -25,7 +25,7 @@ _missionLandscapeMode = "precise"; // acceptable values are "none","random","pre ////////// // Past the output of the script here -_markerType = ["ELLIPSE",[150,150],"GRID"]; +_markerType = ["ELLIPSE",[200,200],"SOLID"]; _markerColor = "ColorBlue"; _markerLabel = ""; @@ -80,11 +80,10 @@ _submarinePatrolParameters = [ ]; _airPatrols = [ - ["somecrazyname",[40,-40,1],0] ]; _missionEmplacedWeapons = [ - ["somcrazyname",[20,-15,1],0] + ]; _missionGroups = [ diff --git a/@GMS/addons/GMS/Missions/Blue/survivalSupplies.sqf b/@GMS/addons/GMS/Missions/Blue/survivalSupplies.sqf index a22fcfd..c14c6ca 100644 --- a/@GMS/addons/GMS/Missions/Blue/survivalSupplies.sqf +++ b/@GMS/addons/GMS/Missions/Blue/survivalSupplies.sqf @@ -25,7 +25,7 @@ _missionLandscapeMode = "precise"; // acceptable values are "none","random","pre ////////// // Past the output of the script here -_markerType = ["ELLIPSE",[300,300],"GRID"]; +_markerType = ["ELLIPSE",[200,200],"SOLID"]; _markerColor = "ColorBlue"; _markerLabel = ""; diff --git a/@GMS/addons/GMS/Missions/GMS_missionLists.sqf b/@GMS/addons/GMS/Missions/GMS_missionLists.sqf index 7c56a98..5eb412d 100644 --- a/@GMS/addons/GMS/Missions/GMS_missionLists.sqf +++ b/@GMS/addons/GMS/Missions/GMS_missionLists.sqf @@ -22,14 +22,15 @@ private _pathBlue = "Blue"; private _missionListBlue = [ //"hostage1", // OK //"captive1", // OK - "sniperBase", // Spawns OK does not clear 249 + "sniperBase", // Spawns OK - clears when all AI Dead but not when player is at mission crate. "survivalSupplies", // Spawns OK Debug = 4 Build 246 //"derbunker", // OK, an interesting mission, better as a red / green though //"forgotten_HQ", // ok BUT TOO TOUGH FOR BLUE OR RED - ////"garrison" // OK but do not use. + //"garrison", // OK but do not use. //"IDAP", // OK but too difficult for a blue mission - "Service_point", // OK build 224 + "Service_point", // OK build 224 // clears when all AI Dead but not when player at mission crate //"Toxin", // OK but too difficult for a blue mission + // "penis", "default" // Spawns OK Debug = 4 Build 246 //"ForgottenHQ" ]; @@ -55,7 +56,7 @@ private _missionListRed = [ "IDAP", // Spawns OK But not sure where the crate spawns. //"lager", //"Operations_Command", - "Outpost", // Spawns OK Debug = 4 Build 246 + //"Outpost", // Spawns OK Debug = 4 Build 246 "Service_Point" //Spawns OK Debug = 4 Build 246 //"tko_camp", //"Toxin" // Spawns OK Debug = 4 Build 246 @@ -64,38 +65,42 @@ private _missionListRed = [ private _pathGreen = "Green"; private _missionListGreen = [/*"default","default2",/*"medicalCamp","redCamp","resupplyCamp","banditVillage",*/ "FieldCamp", // Spawns OK Build 246 Debug == 4 - "FieldHQ", // Spawns OK Build 246 Debug == 4 + //"FieldHQ", // Spawns OK Build 246 Debug == 4 //"weaponsResearch", // OK build 224 - //"munitionsResearch" // Spawns OK Build 246 Debug == 4 + "munitionsResearch", // Spawns OK Build 246 Debug == 4 //"colonelsBase", // OK Build 224 - "factory", // Spawns with some walls above ground level for unclear reasons. + //"factory", // Spawns with some walls above ground level for unclear reasons. "fortification", // Spawns OK Debug = 4 Build 246 //"banditVillage", // OK but do not use. - "Camp_Moreell", // Spawns OK Build 246 Debug == 4 + //"Camp_Moreell", // Spawns OK Build 246 Debug == 4 //"charlston", // Spawns OK but crate glitched under a building //"derbunker", // OK //"forgotten_HQ", // OK, but can't complete - "lager" // Spawns OK but crate glitched under a building + //"lager" // Spawns OK but crate glitched under a building //"Operations_Command", // OK bEST SUITED FOR GREEN/ORANGE // Nees R3F or crate spawned by parachute at mission start - //"Outpost", // OK + "Outpost" // OK //"tko_camp" // OK //"factory" ]; private _pathOrange = "Orange"; private _missionListOrange = [/*"default","default2","medicalCamp","redCamp","resupplyCamp","officeComplex",*/ - "CommandersComplex", // Spawns OK Debug = 4 Build 246 - "generalsCamp", // Spawns OK Debug = 4 Build 246 - //"colonel2", // Spawns OK Debug = 4 Build 246 + //"clit", + //"kore", + "CommandersComplex", // Spawns OK Debug = 4 Build 246 *** + "generalsCamp", // Spawns OK Debug = 4 Build 246*** + //"airfield1" //MILITARY AIRFIELD v1 + "colonel2", // Spawns OK Debug = 4 Build 246 //"stronghold", // Spawns OK Debug = 4 Build 246 but too big for the Exile.Altis server as of Build 253 - "operationShutdown", // Spawns OK Debug = 4 Build 246 - "operationTakeover", // Spawns OK Debug = 4 Build 246 - "dashq", // OK Build 252 - "derbunker", // Spawns OK Build 252 + "operationShutdown", // Spawns OK Debug = 4 Build 246*** + "operationTakeover", // Spawns OK Debug = 4 Build 246*** + "dashq", // OK Build 252*** + "derbunker", // Spawns OK Build 252*** //"Ammunition_depot" // OK Build 252; need to update vics, only 12 AI for some reason //"Camp_Moreell" // OK Build 252 with crate drop from 50 meters - //"Operations_Command" // OK Build 252 - "tko_camp" // // OK Build 252 + //"Operations_Command", // OK Build 252 + //"clit", + "tko_camp" // // OK Build 252*** ///// UNUSED FOR ONE REASON OR ANOTHER //"Outpost" // dOES NOT COMPLETE, ODD LOOT CHEST PLACEMENT /*,"temple"*/ @@ -106,6 +111,7 @@ private _missionListStatics = [ /// The format for these is filename /// Do NOT include the extension here. /// You will need to add the mission files to the statics folder. + //"spatzle", "saltflatsone" ]; diff --git a/@GMS/addons/GMS/Missions/Green/FieldCamp.sqf b/@GMS/addons/GMS/Missions/Green/FieldCamp.sqf index bf132ed..d661b57 100644 --- a/@GMS/addons/GMS/Missions/Green/FieldCamp.sqf +++ b/@GMS/addons/GMS/Missions/Green/FieldCamp.sqf @@ -21,7 +21,7 @@ _lootCounts = GMS_lootCountsGreen; _startMsg = "A Bandit Forward Command Post has been spotted. Check the Green marker on your map for its location"; _endMsg = "The Bandit Command Post camp at the Green Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ellipse",[225,225],"GRID"]; +_markerType = ["ellipse",[350,350],"SOLID"]; _markerColor = "ColorGreen"; _markerMissionName = "Command Post"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Green/Outpost.sqf b/@GMS/addons/GMS/Missions/Green/Outpost.sqf index ff46467..c3f1f33 100644 --- a/@GMS/addons/GMS/Missions/Green/Outpost.sqf +++ b/@GMS/addons/GMS/Missions/Green/Outpost.sqf @@ -20,7 +20,7 @@ _lootCounts = GMS_lootCountsGreen; _startMsg = "An Anemy Outpost was sighted in a nearby sector! Check the Green marker on your map for the location!"; _endMsg = "The Outpost at the Green Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ELLIPSE",[275,275],"Grid"]; +_markerType = ["ELLIPSE",[350,350],"SOLID"]; _markerColor = "ColorGreen"; _markerMissionName = "Outpost"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Green/fortification.sqf b/@GMS/addons/GMS/Missions/Green/fortification.sqf index e844ca8..20ede50 100644 --- a/@GMS/addons/GMS/Missions/Green/fortification.sqf +++ b/@GMS/addons/GMS/Missions/Green/fortification.sqf @@ -20,7 +20,7 @@ _lootCounts = GMS_lootCountsGreen; _startMsg = "An enemy fortification was sighted in a nearby sector! Check the Green marker on your map for the location!"; _endMsg = "The Sector at the Green Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ELLIPSE",[300,300],"GRID"]; +_markerType = ["ELLIPSE",[350,350],"SOLID"]; _markerColor = "ColorGreen"; _markerMissionName = "Fortification"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Green/munitionsResearch.sqf b/@GMS/addons/GMS/Missions/Green/munitionsResearch.sqf index 29547f2..bb5ba1a 100644 --- a/@GMS/addons/GMS/Missions/Green/munitionsResearch.sqf +++ b/@GMS/addons/GMS/Missions/Green/munitionsResearch.sqf @@ -20,7 +20,7 @@ _lootCounts = GMS_lootCountsOrange; _startMsg = "An munitions research center was sighted in a nearby sector! Check the Green marker on your map for the location!"; _endMsg = "The Sector at the Green Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ellipse",[225,225],"GRID"]; +_markerType = ["ellipse",[350,350],"SOLID"]; _markerColor = "ColorGreen"; _markerMissionName = "Munitions"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Green/weaponsResearch.sqf b/@GMS/addons/GMS/Missions/Green/weaponsResearch.sqf index a701c8b..1c712b4 100644 --- a/@GMS/addons/GMS/Missions/Green/weaponsResearch.sqf +++ b/@GMS/addons/GMS/Missions/Green/weaponsResearch.sqf @@ -21,7 +21,7 @@ _lootCounts = GMS_lootCountsOrange; _startMsg = "A weapons research facility has been located. Strike authorized!!"; _endMsg = "The weapons research facility has been neutralized."; _markerLabel = ""; -_markerType = ["ellipse",[225,225],"GRID"]; +_markerType = ["ellipse",[350,350],"SOLID"]; _markerColor = "ColorWhite"; _markerMissionName = "Research Center"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Hunters/Hunters.sqf b/@GMS/addons/GMS/Missions/Hunters/Hunters.sqf index 8969da6..e885620 100644 --- a/@GMS/addons/GMS/Missions/Hunters/Hunters.sqf +++ b/@GMS/addons/GMS/Missions/Hunters/Hunters.sqf @@ -7,9 +7,10 @@ //diag_log "[GMS] Spawning Hunters Mission"; _crateLoot = GMS_BoxLoot_Green; -_lootCounts = [3,6,3,4,10,1]; +_lootCounts = [4,6,4,4,10,2]; _startMsg = "A group of Bandit Hunters was sighted in a nearby sector! Check the Red Triangular marker on your map for the location!"; _endMsg = "The Hunter Camp is under Survivor Control!"; +_timeoutMsg = "The Hunters Have Moved from Their Camp"; _markerLabel = "Hunters"; _markerType = ["mil_triangle",[0,0]]; _markerColor = "ColorRed"; diff --git a/@GMS/addons/GMS/Missions/Orange/CommandersComplex.sqf b/@GMS/addons/GMS/Missions/Orange/CommandersComplex.sqf index 41b21d6..ee2d095 100644 --- a/@GMS/addons/GMS/Missions/Orange/CommandersComplex.sqf +++ b/@GMS/addons/GMS/Missions/Orange/CommandersComplex.sqf @@ -9,7 +9,7 @@ _lootCounts = [15,50,20,60,44,5]; // GMS_lootCountsOrange = [8,32,8,30,16,1]; _startMsg = "An enemy Commander was sighted in a nearby sector! Check the Orange marker on your map for the location!"; _endMsg = "The Sector at the Orange Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ellipse",[250,250],"GRID"]; +_markerType = ["ellipse",[350,350],"SOLID"]; _markerColor = "ColorOrange"; _markerMissionName = "Commander"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Orange/New Text Document.txt b/@GMS/addons/GMS/Missions/Orange/New Text Document.txt new file mode 100644 index 0000000..e69de29 diff --git a/@GMS/addons/GMS/Missions/Orange/Operations_Command.sqf b/@GMS/addons/GMS/Missions/Orange/Operations_Command.sqf index c61260c..7bf6e95 100644 --- a/@GMS/addons/GMS/Missions/Orange/Operations_Command.sqf +++ b/@GMS/addons/GMS/Missions/Orange/Operations_Command.sqf @@ -20,7 +20,7 @@ _lootCounts = GMS_lootCountsOrange; _startMsg = "An Operations Command was sighted in a nearby sector! Check the Orange marker on your map for the location!"; _endMsg = "The Operations Command at the Orange Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ELLIPSE",[300,300],"GRID"]; +_markerType = ["ELLIPSE",[350,350],"SOLID"]; _markerColor = "ColorOrange"; _markerMissionName = "Operations Command"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Orange/airfield1.sqf b/@GMS/addons/GMS/Missions/Orange/airfield1.sqf new file mode 100644 index 0000000..d7de370 --- /dev/null +++ b/@GMS/addons/GMS/Missions/Orange/airfield1.sqf @@ -0,0 +1,262 @@ +/* + Dynamic Mission Generated + Using 3DEN Plugin for GMS by Ghostrider + GMS 3DEN Plugin Version 1.02 : Build 15 : Build Date 09/22/23 + By Ghostrider-GRG- +*/ + +#include "\GMS\Compiles\Init\GMS_defines.hpp" +#include "\GMS\Missions\GMS_privateVars.sqf" + +_defaultMissionLocations = [[9217.65,21604.4,15.9466]]; +_maxMissionRespawns = -1; // Chage this to either zero for no respawns or a positive number if you want to limit the number of times a mission spawns at the same location +_markerType = ["mil_warning",[1,1],"Solid"]; +_markerColor = "Default"; +_startMsg = "AIRFIELD TEST MISSION, PLEASE AVOID"; +_endMsg = "HOLY SHIT, DID THIS MISSION ACTUALLY CLEAR?"; +_markerMissionName = "AIRFIELD (BETA)"; +_crateLoot = GMS_BoxLoot_Orange; +_lootCounts = GMS_lootCountsOrange; + +_garrisonedBuilding_ATLsystem = [ +["Land_MilOffices_V1_F",[9195.41,21626,9.53674e-007],146.426,true,true,[["B_HMG_01_high_F",[-14.3076,-6.03516,-0.477989],0],["B_HMG_01_high_F",[10.6221,9.39844,-0.398628],0]],[]], +["Land_Cargo_Tower_V1_No1_F",[9257.06,21603.1,0],55.7402,true,true,[],[[[1.9707,4.1543,18.0282],0.361212]]], +["Land_Hangar_F",[9121.28,21553.4,0],53.6746,true,true,[["B_HMG_01_high_F",[-8.20508,-19.2891,-0.24754],0]],[]], +["Land_ControlTower_01_F",[9031.44,21431,0],91.4892,true,true,[["B_HMG_01_high_F",[2.10938,-0.507813,-6.22271],0]],[]], +["Land_Cargo_Patrol_V1_F",[9176.65,21543.5,0],0,true,true,[["B_HMG_01_high_F",[-0.417969,0.617188,-4.33346],0]],[]], +["Land_Cargo_Patrol_V1_F",[9118.59,21602,-9.53674e-007],57.1431,true,true,[["B_HMG_01_high_F",[1.08008,0.486328,-4.35415],0]],[]], +["Land_Cargo_Patrol_V1_F",[9118.32,21420.6,0],321.011,true,true,[["B_HMG_01_high_F",[-1.03516,0.75,-4.29249],0]],[]], +["Land_Cargo_Patrol_V1_F",[9022.51,21345.1,0],321.011,true,true,[["B_HMG_01_high_F",[-0.81543,0.513672,-4.32106],0]],[]] +]; + +_missionLandscape = [ + ["Land_HelipadCivil_F",[-35.4277,45.3242,-15.9466],0], + ["Land_Cargo_Tower_V1_No2_F",[-78.9141,32.9395,-15.9466],234.329], + ["Land_Cargo_Tower_V1_No3_F",[-242.806,-168.309,-15.9466],183.72], + ["Land_BarGate_F",[-3.44922,76.0781,-15.9466],56.2432], + ["Land_BarGate_F",[-9.46191,85.3574,-15.9466],237.836], + ["Land_Radar_F",[-50.6992,97.9297,-15.9466],304.919], + ["Land_HBarrierWall6_F",[67.543,-49.709,-15.971],142.078], + ["Land_HBarrierWall6_F",[74.375,-44.5352,-15.9522],142.083], + ["Land_HBarrierWall6_F",[53.9424,-60.2656,-15.9759],142.073], + ["Land_HBarrierWall6_F",[60.7754,-55.0938,-15.9698],142.083], + ["Land_HBarrierWall6_F",[67.3809,-141.922,-15.8495],142.444], + ["Land_HBarrierWall6_F",[74.252,-136.801,-15.8143],142.446], + ["Land_HBarrierWall6_F",[53.7031,-152.377,-15.8076],142.402], + ["Land_HBarrierWall6_F",[60.5742,-147.256,-15.83],142.43], + ["Land_HBarrierWall6_F",[40.3008,-70.7168,-15.9632],142.079], + ["Land_HBarrierWall6_F",[47.1338,-65.5449,-15.9586],142.084], + ["Land_HBarrierWall6_F",[26.7021,-81.2734,-15.9499],142.084], + ["Land_HBarrierWall6_F",[33.5352,-76.1016,-15.953],142.083], + ["Land_BarGate_F",[18.9326,-88.416,-15.9466],143.336], + ["Land_HBarrierWall6_F",[2.43262,-98.3633,-15.9466],142.084], + ["Land_HBarrierWall6_F",[9.26465,-93.1895,-15.946],142.086], + ["Land_HBarrierWall6_F",[-11.168,-108.92,-15.9449],142.085], + ["Land_HBarrierWall6_F",[-4.33496,-103.748,-15.9458],142.084], + ["Land_HBarrierWall6_F",[-24.8096,-119.371,-15.8988],142.084], + ["Land_HBarrierWall6_F",[-17.9766,-114.199,-15.9603],142.108], + ["Land_HBarrierWall6_F",[-38.4082,-129.928,-15.9258],142.072], + ["Land_HBarrierWall6_F",[-31.5752,-124.756,-15.9206],142.069], + ["Land_BarGate_F",[-46.3564,-137.58,-15.9466],330.089], + ["Land_HBarrierWall6_F",[-63.416,-147.289,-15.9555],142.09], + ["Land_HBarrierWall6_F",[-56.584,-142.115,-15.9339],142.08], + ["Land_HBarrierWall6_F",[-77.0166,-157.846,-15.8824],142.095], + ["Land_HBarrierWall6_F",[-70.1836,-152.674,-15.9299],142.067], + ["Land_HBarrierWall6_F",[-90.6582,-168.297,-15.9316],142.076], + ["Land_HBarrierWall6_F",[-83.8252,-163.125,-15.9278],142.084], + ["Land_HBarrierWall6_F",[-104.257,-178.854,-15.8952],142.087], + ["Land_HBarrierWall6_F",[-97.4238,-173.682,-15.8977],142.078], + ["Land_BarGate_F",[-111.57,-187.59,-15.9466],147.346], + ["Land_HBarrierWall6_F",[-130.445,-196.588,-15.9307],142.083], + ["Land_HBarrierWall6_F",[-123.613,-191.414,-15.9292],142.085], + ["Land_HBarrierWall6_F",[-144.046,-207.145,-15.9383],142.081], + ["Land_HBarrierWall6_F",[-137.213,-201.973,-15.9344],142.08], + ["Land_HBarrierWall6_F",[-157.688,-217.596,-15.9342],142.078], + ["Land_HBarrierWall6_F",[-150.854,-212.424,-15.9396],142.082], + ["Land_HBarrierWall6_F",[-171.286,-228.152,-15.9354],142.077], + ["Land_HBarrierWall6_F",[-164.453,-222.98,-15.8755],142.077], + ["Land_TentHangar_V1_F",[-214.581,-268.938,-15.9466],168.066], + ["Land_i_Barracks_V1_F",[-38.7393,-35.5625,-15.9466],145.047], + ["Land_LampAirport_F",[-171.29,-165.273,-15.9366],0], + ["Land_LampAirport_F",[-119.504,-125.146,-15.9366],0], + ["Land_LampAirport_F",[-68.2031,-86.6934,-15.9466],0], + ["Land_LampAirport_F",[-11.9023,-45.9238,-15.9466],0], + ["Land_ReservoirTank_Airport_F",[56.6035,98.8535,-15.9466],109.472], + ["Land_LightHouse_F",[391.881,1502.16,-17.3482],0], + ["Land_CncBarrier_F",[54.0166,-7.92383,-15.9462],145.272], + ["Land_CncBarrier_F",[51.585,-8.46094,-15.9462],189.278], + ["Land_CncBarrier_F",[49.541,-7.12305,-15.9461],237.292], + ["Land_CncBarrier_F",[67.4307,1.12305,-15.9462],145.118], + ["Land_CncBarrier_F",[68.7695,3.16406,-15.9461],102.779], + ["Land_CncBarrier_F",[68.2549,5.5918,-15.9459],54.7703], + ["RoadBarrier_F",[68.0361,-1.53906,-15.9464],148.436], + ["RoadBarrier_F",[56.8809,-9.01563,-15.9465],141.247], + ["Land_CncBarrier_F",[44.5996,-9.04883,-15.9466],140.643], + ["Land_CncBarrier_F",[15.7754,-32.2188,-15.9467],140.645], + ["Land_CncBarrier_F",[8.21289,-38.1367,-15.9466],140.648], + ["Land_CncBarrier_F",[-88.5771,-20.8711,-15.9466],58.007], + ["Land_CncBarrier_F",[-18.165,123.66,-15.9467],326.021], + ["Land_CncBarrier_F",[-15.7295,124.164,-15.9466],10.0225], + ["Land_CncBarrier_F",[-13.7031,122.799,-15.9465],58.0339], + ["Land_CncBarrier_F",[-31.7021,114.793,-15.9466],325.881], + ["Land_CncBarrier_F",[-33.0684,112.771,-15.9467],283.544], + ["Land_CncBarrier_F",[-32.5859,110.336,-15.9465],235.526], + ["RoadBarrier_F",[-30.7734,117.662,-15.9465],329.2], + ["RoadBarrier_F",[-21.2881,123.998,-15.9465],322.012], + ["Land_NetFence_03_m_9m_F",[10.3115,-32.1133,-15.9466],144.022], + ["Land_NetFence_03_m_9m_F",[17.6992,-26.709,-15.9466],144.022], + ["Land_NetFence_03_m_9m_F",[-4.51172,-42.918,-15.9466],144.022], + ["Land_NetFence_03_m_9m_F",[2.87598,-37.5137,-15.9466],144.022], + ["Land_NetFence_03_m_9m_F",[53.0117,17.168,-15.9466],236.995], + ["Land_NetFence_03_m_9m_F",[58.0254,9.50977,-15.9466],236.995], + ["Land_NetFence_03_m_9m_F",[42.9902,32.5313,-15.9466],236.995], + ["Land_NetFence_03_m_9m_F",[48.0039,24.873,-15.9466],236.995], + ["Land_NetFence_03_m_9m_F",[-38.0811,-67.4707,-15.9466],145.026], + ["Land_NetFence_03_m_9m_F",[-30.5996,-62.1973,-15.9466],145.026], + ["Land_NetFence_03_m_9m_F",[-53.0918,-78.0137,-15.9466],145.026], + ["Land_NetFence_03_m_9m_F",[-45.6104,-72.7402,-15.9466],145.026], + ["Land_NetFence_03_m_9m_F",[-86.2881,-102.797,-15.9466],145.026], + ["Land_NetFence_03_m_9m_F",[-78.8066,-97.5234,-15.9466],145.026], + ["Land_NetFence_03_m_9m_F",[-101.299,-113.34,-15.9466],145.026], + ["Land_NetFence_03_m_9m_F",[-93.8174,-108.066,-15.9466],145.026], + ["Land_BagBunker_Small_F",[15.7109,-20.8203,-15.9431],276.614], + ["Land_BagBunker_Small_F",[-28.3018,111.766,-15.9385],144.989], + ["Land_BagBunker_Small_F",[63.999,4.12305,-15.9254],325.782], + ["Land_HelipadSquare_F",[-56.3691,-10.6875,-15.9466],0], + ["Land_Cargo_Patrol_V1_F",[31.7275,-87.457,-15.9466],321.011], + ["Land_LampStreet_02_triple_F",[-36.1943,71.7148,-15.9466],0], + ["Land_LampStreet_02_triple_F",[-61.4805,-42.9961,-15.9389],0], + ["Land_LampStreet_02_triple_F",[-113.948,-82.7559,-15.9466],0], + ["Land_LampStreet_02_triple_F",[-182.649,-161.93,-15.9466],0], + ["Land_LampStreet_02_triple_F",[-247.627,-188.701,-15.9389],0], + ["Land_LampStreet_02_triple_F",[-48.5938,-158.41,-15.9466],0], + ["Land_LampStreet_02_triple_F",[65.4502,8.92969,-15.9466],0], + ["Land_LampStreet_02_triple_F",[42.5186,104.504,-15.9466],0], + ["Land_LampStreet_02_triple_F",[-28.2256,101.377,-15.9466],0], + ["Land_LampStreet_02_triple_F",[-102.318,20.6973,-15.9466],0], + ["Land_ConnectorTent_01_CSAT_greenhex_cross_F",[-22.041,-19.7246,-15.9462],0], + ["Land_PowerGenerator_F",[-20.168,-30.0977,-15.9466],0], + ["StorageBladder_01_fuel_forest_F",[-3.08887,-30.1914,-15.9466],0], + ["Land_Cargo40_red_F",[29.4561,86.627,-15.9464],0], + ["Land_Cargo40_red_F",[35.2715,79.2773,-15.9523],0], + ["Land_Cargo20_light_green_F",[-24.6709,-47.2246,-15.8013],108.162], + ["Land_ConnectorTent_01_NATO_cross_F",[7.37109,17.7012,-15.9447],0], + ["Land_Medevac_HQ_V1_F",[1.38086,-16.6777,-15.9466],0], + ["Land_BarGate_F",[28.2178,-21.8438,-15.9466],143.336], + ["Land_BarGate_F",[36.9307,-15.2461,-15.9466],323.05], + ["Land_BarGate_F",[-93.7383,-13.5098,-15.9466],56.2432], + ["Land_LampStreet_02_triple_F",[-198.423,-87.8945,-15.9389],0], + ["Land_Radar_01_kitchen_F",[54.458,42.8008,-15.9466],325.773], + ["Land_TTowerBig_2_F",[-76.4287,85.6797,-15.9466],0], + ["Land_HighVoltageTower_large_F",[-142.697,-0.542969,-15.9466],299.52], + ["Land_MedicalTent_01_white_generic_open_F",[73.9189,56.4648,-15.9464],0], + ["Land_MedicalTent_01_white_generic_open_F",[64.9502,74.7988,-15.9461],0], + ["Land_LampStreet_02_triple_F",[-233.382,-270.305,-15.9466],0], + ["Land_LampStreet_02_triple_F",[-128.998,-208.654,-15.9466],0], + ["Land_LampStreet_02_triple_F",[4.05469,25.5781,-15.9466],0], + ["Land_MedicalTent_01_white_generic_open_F",[19.6807,9.19336,-15.9454],0] +]; + +_simpleObjects = [ + +]; + +_missionLootVehicles = [ + +]; + +_missionPatrolVehicles = [ + +]; + +_submarinePatrolParameters = [ + +]; + +_airPatrols = [ + +]; + +_missionEmplacedWeapons = [ + ["B_HMG_01_high_F",[41.6621,-3.98828,1.87899],0], + ["B_HMG_01_high_F",[34.5332,-0.964844,1.94235],0], + ["B_HMG_01_high_F",[51.8623,-6.62695,-15.9464],0], + ["B_HMG_01_high_F",[-0.0888672,-15.5977,-12.7783],0], + ["B_HMG_01_high_F",[-239.226,-165.797,1.82505],0], + ["B_HMG_01_high_F",[-246.742,-170.133,2.01812],0], + ["B_HMG_01_high_F",[-74.6289,31.8516,1.91046],0], + ["B_HMG_01_high_F",[-81.7568,35.7188,2.01215],0], + ["B_HMG_01_high_F",[-15.9463,122.668,-15.9463],0], + ["B_HMG_01_high_F",[-52.332,64.6484,-15.9466],0], + ["B_HMG_01_high_F",[-85.0215,13.1699,-15.944],0], + ["B_HMG_01_high_F",[-46.6201,-31.8047,-15.936],0], + ["B_HMG_01_high_F",[-127.544,-119.559,-15.9448],0], + ["B_HMG_01_high_F",[-182.793,-168.289,-15.9454],0], + ["B_HMG_01_high_F",[85.2148,-44.4063,-15.9464],0], + ["B_HMG_01_high_F",[-3.4834,62.8535,-15.9457],0], + ["B_HMG_01_high_F",[32.1162,83.0059,-15.9456],0], + ["B_GMG_01_high_F",[74.3135,-41.4199,-15.9463],0], + ["B_GMG_01_high_F",[-103.939,-90.2402,-15.9449],0], + ["B_GMG_01_high_F",[-169.229,-232.922,-15.9424],0], + ["B_GMG_01_high_F",[-69.1426,-56.4395,-15.9374],0], + ["B_GMG_01_high_F",[-8.97754,53.5059,-15.9465],0], + ["B_GMG_01_high_F",[-85.0967,42.8828,-15.9466],0], + ["B_GMG_01_high_F",[-67.873,-166.027,-15.9458],0], + ["B_GMG_01_high_F",[-98.0527,8.63672,-15.9442],0], + ["B_GMG_01_high_F",[5.6875,-15.502,-12.8099],0], + ["B_GMG_01_high_F",[19.2002,19.9141,-15.9427],0], + ["B_GMG_01_high_F",[13.5283,-98.6074,-15.9421],0], + ["B_G_Mortar_01_F",[41.626,3.90039,2.15599],0], + ["B_G_Mortar_01_F",[-239.661,-173.162,1.76869],0], + ["B_G_Mortar_01_F",[52.5947,45.7852,-12.0937],0], + ["B_G_Mortar_01_F",[-81.1621,28.666,1.88787],0], + ["B_G_Mortar_01_F",[52.9961,86.4648,-15.9462],0], + ["B_static_AA_F",[-63.709,56.3359,-11.3802],0], + ["B_static_AA_F",[64.5615,62.1504,-15.9465],0], + ["B_T_Static_AA_F",[-31.9541,-56.2324,-15.9465],0], + ["B_T_Static_AA_F",[-129.015,-7.91016,-15.9322],0] +]; + +_missionGroups = [ + +]; + +_scubaGroupParameters = [ + +]; + +_missionLootBoxes = [ + ["I_CargoNet_01_ammo_F",[-67.7549,47.2188,-15.688],_crateLoot,_lootCounts,0], + ["I_CargoNet_01_ammo_F",[-64.6338,42.7539,-15.671],_crateLoot,_lootCounts,0] +]; + +/* + Use the parameters below to customize your mission - see the template or blck_configs.sqf for details about each them +*/ +_chanceHeliPatrol = GMS_chanceHeliPatrolOrange; +_noChoppers = GMS_noPatrolHelisOrange; +_missionHelis = GMS_patrolHelisOrange; +_chancePara = GMS_chanceParaOrange; +_noPara = GMS_noParaOrange; +_paraTriggerDistance = 400; +_chanceLoot = 0.0; +_paraLoot = GMS_BoxLoot_Orange; +_paraLootCounts = GMS_lootCountsOrange; +_missionLandscapeMode = "precise"; +_uniforms = GMS_SkinList; +_headgear = GMS_headgear; +_vests = GMS_vests; +_backpacks = GMS_backpacks; +_sideArms = GMS_Pistols; +_spawnCratesTiming = "atMissionSpawnGround"; +_loadCratesTiming = "atMissionCompletion"; +_endCondition = allUnitsKilled; +_minNoAI = GMS_MinAI_Orange; +_maxNoAI = GMS_MaxAI_Orange; +_noAIGroups = GMS_AIGrps_Orange; +_noVehiclePatrols = GMS_SpawnVeh_Orange; +_noEmplacedWeapons = GMS_SpawnEmplaced_Orange; +_submarinePatrols = 0; // Default number of submarine patrols at pirate missions +_scubaPatrols = 0; // Default number of scuba diver patrols at pirate missions + +#include "\GMS\Compiles\Missions\GMS_fnc_missionSpawner.sqf"; \ No newline at end of file diff --git a/@GMS/addons/GMS/Missions/Orange/colonel2.sqf b/@GMS/addons/GMS/Missions/Orange/colonel2.sqf index 06fe7a6..8da1bc8 100644 --- a/@GMS/addons/GMS/Missions/Orange/colonel2.sqf +++ b/@GMS/addons/GMS/Missions/Orange/colonel2.sqf @@ -20,7 +20,7 @@ _lootCounts = [15,50,20,60,44,5]; // GMS_lootCountsOrange = [8,32,8,30,16,1]; _startMsg = "A rogue Colonel is staging for an attack. Players must stop him. !"; _endMsg = "The rogue Colonel has been defeated!"; _markerLabel = ""; -_markerType = ["ellipse",[225,225],"GRID"]; +_markerType = ["ellipse",[350,350],"SOLID"]; _markerColor = "ColorBlack"; _markerMissionName = " Colonel"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Orange/dashq.sqf b/@GMS/addons/GMS/Missions/Orange/dashq.sqf index 4d9de86..f5b7b07 100644 --- a/@GMS/addons/GMS/Missions/Orange/dashq.sqf +++ b/@GMS/addons/GMS/Missions/Orange/dashq.sqf @@ -20,7 +20,7 @@ _lootCounts = GMS_lootCountsOrange; _startMsg = "An enemy Operations Base was sighted in a nearby sector! Check the Orange marker on your map for the location!"; _endMsg = "The Operations Base at the Orange Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ELLIPSE",[300,300],"GRID"]; +_markerType = ["ELLIPSE",[350,350],"SOLID"]; _markerColor = "ColorOrange"; _markerMissionName = "Operations Base"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Orange/derbunker.sqf b/@GMS/addons/GMS/Missions/Orange/derbunker.sqf index 62ba9d2..45d6dae 100644 --- a/@GMS/addons/GMS/Missions/Orange/derbunker.sqf +++ b/@GMS/addons/GMS/Missions/Orange/derbunker.sqf @@ -20,7 +20,7 @@ _lootCounts = GMS_lootCountsOrange; _startMsg = "An enemy Bunker was sighted in a nearby sector! Check the Orange marker on your map for the location!"; _endMsg = "The Bunker at the Orange Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ELLIPSE",[300,300],"GRID"]; +_markerType = ["ELLIPSE",[350,350],"SOLID"]; _markerColor = "ColorOrange"; _markerMissionName = "DerBunker"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Orange/generalsCamp.sqf b/@GMS/addons/GMS/Missions/Orange/generalsCamp.sqf index 1c6b09a..75fbc68 100644 --- a/@GMS/addons/GMS/Missions/Orange/generalsCamp.sqf +++ b/@GMS/addons/GMS/Missions/Orange/generalsCamp.sqf @@ -19,7 +19,7 @@ _lootCounts = [15,50,20,60,44,5]; ; _startMsg = "An enemy General was sighted in a nearby sector! Check the Orange marker on your map for the location!"; _endMsg = "The Sector at the Orange Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ellipse",[250,250],"GRID"]; +_markerType = ["ellipse",[350,350],"SOLID"]; _markerColor = "ColorOrange"; _markerMissionName = "General"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Orange/kore.sqf b/@GMS/addons/GMS/Missions/Orange/kore.sqf new file mode 100644 index 0000000..de80117 --- /dev/null +++ b/@GMS/addons/GMS/Missions/Orange/kore.sqf @@ -0,0 +1,112 @@ +/* + Dynamic Mission Generated + Using 3DEN Plugin for GMS by Ghostrider + GMS 3DEN Plugin Version 1.02 : Build 15 : Build Date 09/22/23 + By Ghostrider-GRG- +*/ + +#include "\GMS\Compiles\Init\GMS_defines.hpp" +#include "\GMS\Missions\GMS_privateVars.sqf" + +_defaultMissionLocations = [[6209.47,16240.4,43]]; +_maxMissionRespawns = -1; // Chage this to either zero for no respawns or a positive number if you want to limit the number of times a mission spawns at the same location +_markerType = ["ELLIPSE",[500,500],"GRID"]; +_markerColor = "ColorOrange"; +_startMsg = "The factory at KORE has been taken over by vegan extremists!"; +_endMsg = "KORE has been purged of the vegans. Meat is murder, and murder tastes good! "; +_markerMissionName = "HardKORE"; +_crateLoot = GMS_BoxLoot_Orange; +_lootCounts = GMS_lootCountsOrange; + +_garrisonedBuilding_ATLsystem = [ + +]; + +_missionLandscape = [ + ["CUP_Mine",[-29.585,-47.8447,-43],180], + ["CUP_Mine",[98.6934,-44.418,-43],180], + ["CUP_Mine",[-23.2051,-33.4355,-43],180], + ["CUP_Mine",[-38.8677,67.835,-43],180], + ["CUP_Mine",[-161.637,-34.4082,-43],180], + ["CUP_Mine",[126.093,-14.7598,-43],180] +]; + +_simpleObjects = [ + +]; + +_missionLootVehicles = [ + +]; + +_missionPatrolVehicles = [ + ["B_APC_Wheeled_01_cannon_F",[34.3306,31.8359,-43],0], + ["I_MRAP_03_gmg_F",[-188.152,-43.3232,-42.9996],0] +]; + +_submarinePatrolParameters = [ + +]; + +_airPatrols = [ + +]; + +_missionEmplacedWeapons = [ + ["B_HMG_01_high_F",[178.972,-22.6367,-36.3701],0], + ["B_HMG_01_high_F",[154.664,-23.791,-36.2045],0], + ["B_HMG_01_high_F",[79.4756,-42.7334,-43],0], + ["B_HMG_01_high_F",[-117.813,-41.0293,-36.2259],0], + ["B_HMG_01_high_F",[-94.3589,-39.8701,-36.1218],0], + ["B_HMG_01_high_F",[-16.1646,-13.6289,-43],0], + ["B_HMG_01_high_F",[-88.7983,-10.3594,-43],0], + ["B_GMG_01_high_F",[78.6528,36.1807,-33.9581],0], + ["B_GMG_01_high_F",[63.771,-15.667,-43],0], + ["B_GMG_01_high_F",[-80.2832,44.7324,-24.4945],0], + ["B_GMG_01_high_F",[0.78418,47.7158,-33.9483],0], + ["B_GMG_01_high_F",[87.375,-22.0439,-43],0] +]; + +_missionGroups = [ + +]; + +_scubaGroupParameters = [ + +]; + +_missionLootBoxes = [ + ["I_CargoNet_01_ammo_F",[-49.105,-34.1846,-42.746],_crateLoot,_lootCounts,0], + ["I_CargoNet_01_ammo_F",[-64.1182,61.8008,-42.9995],_crateLoot,_lootCounts,0] +]; + +/* + Use the parameters below to customize your mission - see the template or blck_configs.sqf for details about each them +*/ +_chanceHeliPatrol = GMS_chanceHeliPatrolOrange; +_noChoppers = GMS_noPatrolHelisOrange; +_missionHelis = GMS_patrolHelisOrange; +_chancePara = GMS_chanceParaOrange; +_noPara = GMS_noParaOrange; +_paraTriggerDistance = 400; +_chanceLoot = 0.0; +_paraLoot = GMS_BoxLoot_Orange; +_paraLootCounts = GMS_lootCountsOrange; +_missionLandscapeMode = "precise"; +_uniforms = GMS_SkinList; +_headgear = GMS_headgear; +_vests = GMS_vests; +_backpacks = GMS_backpacks; +_sideArms = GMS_Pistols; +_spawnCratesTiming = "atMissionSpawnGround"; +_loadCratesTiming = "atMissionCompletion"; +_endCondition = allUnitsKilled; +_minNoAI = GMS_MinAI_Orange; +_maxNoAI = GMS_MaxAI_Orange; +_noAIGroups = GMS_AIGrps_Orange; +_noVehiclePatrols = GMS_SpawnVeh_Orange; +_noEmplacedWeapons = GMS_SpawnEmplaced_Orange; +_submarinePatrols = 0; // Default number of submarine patrols at pirate missions +_scubaPatrols = 0; // Default number of scuba diver patrols at pirate missions + +#include "\GMS\Compiles\Missions\GMS_fnc_missionSpawner.sqf"; \ No newline at end of file diff --git a/@GMS/addons/GMS/Missions/Orange/operationShutdown.sqf b/@GMS/addons/GMS/Missions/Orange/operationShutdown.sqf index 1c92a1c..ef28103 100644 --- a/@GMS/addons/GMS/Missions/Orange/operationShutdown.sqf +++ b/@GMS/addons/GMS/Missions/Orange/operationShutdown.sqf @@ -27,7 +27,7 @@ _missionLandscapeMode = "precise"; // acceptable values are "none","random","pre // Past the output of the script here -_markerType =["ellipse",[250,250],"GRID"]; +_markerType =["ellipse",[350,350],"SOLID"]; _markerColor = "ColorOrange"; _markerLabel = ""; diff --git a/@GMS/addons/GMS/Missions/Orange/operationTakeover.sqf b/@GMS/addons/GMS/Missions/Orange/operationTakeover.sqf index 4c17177..f58fdcd 100644 --- a/@GMS/addons/GMS/Missions/Orange/operationTakeover.sqf +++ b/@GMS/addons/GMS/Missions/Orange/operationTakeover.sqf @@ -26,7 +26,7 @@ _missionLandscapeMode = "precise"; // acceptable values are "none","random","pre ////////// // Past the output of the script here -_markerType =["ellipse",[250,250],"GRID"]; +_markerType =["ellipse",[350,350],"SOLID"]; _markerColor = "ColorOrange"; _markerLabel = ""; diff --git a/@GMS/addons/GMS/Missions/Orange/tko_camp.sqf b/@GMS/addons/GMS/Missions/Orange/tko_camp.sqf index 396ac12..172c9a8 100644 --- a/@GMS/addons/GMS/Missions/Orange/tko_camp.sqf +++ b/@GMS/addons/GMS/Missions/Orange/tko_camp.sqf @@ -20,7 +20,7 @@ _lootCounts = GMS_lootCountsOrange; _startMsg = "An enemy Military Camp was sighted in a nearby sector! Check the Orange marker on your map for the location!"; _endMsg = "The Military Camp at the Orange Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ELLIPSE",[300,300],"GRID"]; +_markerType = ["ELLIPSE",[350,350],"SOLID"]; _markerColor = "ColorOrange"; _markerMissionName = "Military Camp"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Red/Ammunition_depot.sqf b/@GMS/addons/GMS/Missions/Red/Ammunition_depot.sqf index 3c5a882..9e9dfcc 100644 --- a/@GMS/addons/GMS/Missions/Red/Ammunition_depot.sqf +++ b/@GMS/addons/GMS/Missions/Red/Ammunition_depot.sqf @@ -20,7 +20,7 @@ _lootCounts = GMS_lootCountsRed; _startMsg = "An Anemy Ammunition Depot was sighted in a nearby sector! Check the Red marker on your map for the location!"; _endMsg = "The Ammunition depot at the Red Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ELLIPSE",[200,200],"GRID"]; +_markerType = ["ellipse",[250,250],"SOLID"]; _markerColor = "ColorRed"; _markerMissionName = "Ammunition Depot"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Red/IDAP.sqf b/@GMS/addons/GMS/Missions/Red/IDAP.sqf index b0ae39b..bcc93cd 100644 --- a/@GMS/addons/GMS/Missions/Red/IDAP.sqf +++ b/@GMS/addons/GMS/Missions/Red/IDAP.sqf @@ -20,7 +20,7 @@ _lootCounts = GMS_lootCountsRed; _startMsg = "A IDAP HQ was sighted in a nearby sector! Check the Red marker on your map for the location!"; _endMsg = "The IDAP HQ at the Red Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ELLIPSE",[200,200],"GRID"]; +_markerType = ["ellipse",[250,250],"SOLID"]; _markerColor = "ColorRed"; _markerMissionName = "IDAP"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Red/Service_point.sqf b/@GMS/addons/GMS/Missions/Red/Service_point.sqf index 99067e7..82e2236 100644 --- a/@GMS/addons/GMS/Missions/Red/Service_point.sqf +++ b/@GMS/addons/GMS/Missions/Red/Service_point.sqf @@ -20,7 +20,7 @@ _lootCounts = GMS_lootCountsRed; _startMsg = "A Service Point was sighted in a nearby sector! Check the Red marker on your map for the location!"; _endMsg = "The Service Point at the Red Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ELLIPSE",[200,200],"GRID"]; +_markerType = ["ellipse",[250,250],"SOLID"]; _markerColor = "ColorRed"; _markerMissionName = "Service Point"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Red/TraderBoss.sqf b/@GMS/addons/GMS/Missions/Red/TraderBoss.sqf index b94792a..eca0656 100644 --- a/@GMS/addons/GMS/Missions/Red/TraderBoss.sqf +++ b/@GMS/addons/GMS/Missions/Red/TraderBoss.sqf @@ -10,7 +10,7 @@ _lootCounts = GMS_lootCountsRed; _startMsg = "A Hostile Merchant was sighted in a nearby sector! Check the Red marker on your map for the location!"; _endMsg = "The Sector at the Red Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ellipse",[200,200],"GRID"]; +_markerType = ["ellipse",[250,250],"SOLID"]; _markerColor = "ColorRed"; _markerMissionName = "Merchant"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Red/carThieves.sqf b/@GMS/addons/GMS/Missions/Red/carThieves.sqf index 9f9d0af..35e8cf5 100644 --- a/@GMS/addons/GMS/Missions/Red/carThieves.sqf +++ b/@GMS/addons/GMS/Missions/Red/carThieves.sqf @@ -10,7 +10,7 @@ _lootCounts = GMS_lootCountsRed; _startMsg = "Car thieves were sighted in a nearby sector! Check the Red marker on your map for the location!"; _endMsg = "The Sector at the Red Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ellipse",[200,200],"GRID"]; +_markerType = ["ellipse",[250,250],"SOLID"]; _markerColor = "ColorRed"; _markerMissionName = "Thieves"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Red/fuelDepot.sqf b/@GMS/addons/GMS/Missions/Red/fuelDepot.sqf index 0ca4fb5..b7660e1 100644 --- a/@GMS/addons/GMS/Missions/Red/fuelDepot.sqf +++ b/@GMS/addons/GMS/Missions/Red/fuelDepot.sqf @@ -10,7 +10,7 @@ _lootCounts = GMS_lootCountsRed; _startMsg = "An enemy fuel depot was sighted in a nearby sector! Check the Red marker on your map for the location!"; _endMsg = "The Sector at the Red Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ellipse",[200,200],"GRID"]; +_markerType = ["ellipse",[250,250],"SOLID"]; _markerColor = "ColorRed"; _markerMissionName = "Depot"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Red/hostage1.sqf b/@GMS/addons/GMS/Missions/Red/hostage1.sqf index bc78ca5..085511d 100644 --- a/@GMS/addons/GMS/Missions/Red/hostage1.sqf +++ b/@GMS/addons/GMS/Missions/Red/hostage1.sqf @@ -20,7 +20,7 @@ _startMsg = "A local town official is being held hostage! Free him and earn a re _endMsg = "The official was freed! A reward has been sent by the local townsfolk"; _assetKilledMsg = "The Hostage Was Killed and Bandits Fled with All Loot: Mission Aborted"; _markerLabel = ""; -_markerType = ["ellipse",[175,175],"GRID"]; +_markerType = ["ellipse",[250,250],"SOLID"]; _markerColor = "ColorRed"; _markerMissionName = "Rescue Hostage"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Red/junkyardWilly.sqf b/@GMS/addons/GMS/Missions/Red/junkyardWilly.sqf index 2e11ecc..9bbc18a 100644 --- a/@GMS/addons/GMS/Missions/Red/junkyardWilly.sqf +++ b/@GMS/addons/GMS/Missions/Red/junkyardWilly.sqf @@ -10,7 +10,7 @@ _lootCounts = GMS_lootCountsRed; _startMsg = "An enemy junkyard was sighted in a nearby sector! Check the Red marker on your map for the location!"; _endMsg = "The Sector at the Red Marker is under survivor control!"; _markerLabel = ""; -_markerType = ["ellipse",[200,200],"GRID"]; +_markerType = ["ellipse",[250,250],"SOLID"]; _markerColor = "ColorRed"; _markerMissionName = "Junkyard"; _missionLandscapeMode = "precise"; // acceptable values are "none","random","precise" diff --git a/@GMS/addons/GMS/Missions/Scouts/Scouts.sqf b/@GMS/addons/GMS/Missions/Scouts/Scouts.sqf index 1543d51..e0132c9 100644 --- a/@GMS/addons/GMS/Missions/Scouts/Scouts.sqf +++ b/@GMS/addons/GMS/Missions/Scouts/Scouts.sqf @@ -7,9 +7,10 @@ //diag_log "[GMS] Spawning Scout Mission"; _crateLoot = GMS_BoxLoot_Red; -_lootCounts = [3,5,2,3,6,1]; +_lootCounts = [4,5,3,3,6,2]; _startMsg = "A group of Bandit Scouts was sighted in a nearby sector! Check the Red triangular marker on your map for the location!"; _endMsg = "The Scout Camp is under Survivor Control!"; +_timeoutMsg = "The Scouts Have Moved Out of Their Camp"; _markerLabel = "Scouts"; //_markerType = ["mil_triangle",[0,0]]; _markerType = ["mil_triangle",[0,0]]; diff --git a/@GMS/addons/GMS/Missions/Statics/saltflatsone.sqf b/@GMS/addons/GMS/Missions/Statics/saltflatsone.sqf index af8b5ff..1b7d900 100644 --- a/@GMS/addons/GMS/Missions/Statics/saltflatsone.sqf +++ b/@GMS/addons/GMS/Missions/Statics/saltflatsone.sqf @@ -1,31 +1,5 @@ -/* - Dynamic Mission Generated - Using 3DEN Plugin for GMS by Ghostrider - GMS 3DEN Plugin Version 1.1 : Build 16 : Build Date 09/23/23 - By Ghostrider-GRG- -*/ - -#include "\GMS\Compiles\Init\GMS_defines.hpp" -#include "\GMS\Missions\GMS_privateVars.sqf" - -_defaultMissionLocations = [[22815.9,17109.1,-2.7895e-005]]; -_maxMissionRespawns = -1; // Chage this to either zero for no respawns or a positive number if you want to limit the number of times a mission spawns at the same location -_markerLabel = ""; -_markerType = ["ELLIPSE",[150,150],"GRID"]; -_markerColor = ""; -_markerMissionName = "TODO: Set this to an appropriate name"; -_startMsg = "TODO: Change approiately"; -_endMsg = "TODO: Change Appropriately"; -_markerMissionName = ""; -_crateLoot = GMS_BoxLoot_Blue; -_lootCounts = GMS_lootCountsBlue; - -_garrisonedBuilding_ATLsystem = [ - -]; - /* Dynamic Mission Generated Using 3DEN Plugin for GMS by Ghostrider @@ -39,37 +13,16 @@ _garrisonedBuilding_ATLsystem = [ _difficulty = "Blue"; _chanceMissionSpawned = 1; _defaultMissionLocations = [[22815.9,17109.1,-2.7895e-005]]; -_maxMissionRespawns = -1; // Chage this to either zero for no respawns or a positive number if you want to limit the number of times a mission spawns at the same location -_markerLabel = ""; -_markerType = ["ELLIPSE",[50,50],"FDiagonal"]; +_maxMissionRespawns = 0; // Chage this to either zero for no respawns or a positive number if you want to limit the number of times a mission spawns at the same location + +_markerType = ["ELLIPSE",[150,150],"FDiagonal"]; _markerColor = "ColorWEST"; -_markerMissionName = "TODO: Set this to an appropriate name"; -_startMsg = "TODO: Change approiately"; -_endMsg = "TODO: Change Appropriately"; -_markerMissionName = ""; -_crateLoot = GMS_BoxLoot_Blue; -_lootCounts = GMS_lootCountsBlue; -/* - Dynamic Mission Generated - Using 3DEN Plugin for GMS by Ghostrider - GMS 3DEN Plugin Version 1.1 : Build 16 : Build Date 09/23/23 - By Ghostrider-GRG- -*/ +_markerLabel = "CaptainRoberts"; +_markerMissionName = "CaptainRoberts"; +_startMsg = "Captain Roberts Spotted near the salt flats"; +_endMsg = "Captain Roberts was sent to Neptun's Locker"; -#include "\GMS\Compiles\Init\GMS_defines.hpp" -#include "\GMS\Missions\GMS_privateVars.sqf" - -_difficulty = "Blue"; -_chanceMissionSpawned = 1; -_defaultMissionLocations = [[22815.9,17109.1,-2.7895e-005]]; -_maxMissionRespawns = -1; // Chage this to either zero for no respawns or a positive number if you want to limit the number of times a mission spawns at the same location -_markerLabel = "any"; -_markerType = ["ELLIPSE",[50,50],"FDiagonal"]; -_markerColor = "ColorWEST"; -_markerMissionName = "TODO: Set this to an appropriate name"; -_startMsg = "TODO: Change approiately"; -_endMsg = "TODO: Change Appropriately"; _crateLoot = GMS_BoxLoot_Blue; _lootCounts = GMS_lootCountsBlue; @@ -114,8 +67,8 @@ _missionGroups = [ ]; _missionGarrisonedGroups = [ - [[-26.6816,45.0723,1.06332],0,"Blue",""], - [[21.418,-13.9297,1.14033],266.755,"Blue",""] + // [[-26.6816,45.0723,1.06332],0,"Blue",""], + //[[21.418,-13.9297,1.14033],266.755,"Blue",""] ]; _scubaGroupParameters = [ diff --git a/@GMS/addons/GMS/Missions/Statics/spatzle.sqf b/@GMS/addons/GMS/Missions/Statics/spatzle.sqf new file mode 100644 index 0000000..04c4ff5 --- /dev/null +++ b/@GMS/addons/GMS/Missions/Statics/spatzle.sqf @@ -0,0 +1,124 @@ +/* + Dynamic Mission Generated + Using 3DEN Plugin for GMS by Ghostrider + GMS 3DEN Plugin Version 1.23 : Build 20 : Build Date 10/10/23 + By Ghostrider-GRG- +*/ + +#include "\GMS\Compiles\Init\GMS_defines.hpp" +#include "\GMS\Missions\GMS_privateVars.sqf" + +_markerType = ["ELLIPSE",[150,150],"FDiagonal"]; +_markerColor = "ColorWEST"; +_difficulty = "Red"; +_chanceMissionSpawned = 1; +_defaultMissionLocations = [[22585.9,18524.3,4.286]]; +_maxMissionRespawns = 0; +_startMsg = "A Mafia Crew is having a cookout"; +_endMsg = "Patriots have captured loot at the cookout"; +_markerLabel = "Cookout"; +_markerText = "Cookout"; +_markerMissionName = "Cookout"; +_crateLoot = GMS_BoxLoot_Red; +_lootCounts = GMS_lootCountsRed; + +/* + Depricated Variable Included for Backwards Compatibility with Existing Missions +*/ +_garrisonedBuilding_ATLsystem = [ + +]; +/* + Depricated Variable Included for Backwards Compatibility with Existing Missions +*/ +_garrisonedBuildings_BuildingPosnSystem = [ + +]; +_missionLandscape = [ + ["Box_FIA_Ammo_F",[-36.9746,37.0586,-3.08965],0,[true,true]], + ["Land_BagBunker_Small_F",[-49.2559,4.30664,-4.2723],0,[true,true]], + ["Land_FirewoodPile_01_F",[-43.0508,-22.2949,-4.29626],0,[true,true]], + ["FirePlace_burning_F",[-66.8066,6.61523,-4.28595],0,[true,true]], + ["Campfire_burning_F",[-56.1074,21.0078,-4.2859],0,[true,true]] +]; + +_simpleObjects = [ + +]; + +_missionLootVehicles = [ + +]; + +_missionPatrolVehicles = [ + ["B_MRAP_01_hmg_F",[-21.0039,0.46875,-4.27978],0] +]; + +_missionUGVs = [ + +]; +_submarinePatrolParameters = [ + +]; + +_airPatrols = [ + +]; + +_missionUAVs = [ + +]; +_missionEmplacedWeapons = [ + ["B_HMG_01_high_F", [-70.2969,-12.3281,-4.27773], 0, "Red"], + ["B_HMG_01_high_F", [-82.4277,75.2559,-4.28369], 135.823, "Red"], + ["B_HMG_01_high_F", [-48.9922,4.32813,-4.27425], 0, "Red"] +]; + +_missionGroups = [ + +]; + +_missionGarrisonedGroups = [ + +]; + +_scubaGroupParameters = [ + +]; + +_missionLootBoxes = [ + +]; + +/* + Use the parameters below to customize your mission - see the template or GMS_configs.sqf for details about each them +*/ +_chanceHeliPatrol = 0; +_noChoppers = 0; +_missionHelis = GMS_patrolHelisRed; +_chancePara = 0; +_noPara = 0; +_paraTriggerDistance = 400; +_paraSkill = 0.7; +_chanceLoot = 0.0; +_paraLoot = GMS_BoxLoot_Red; +_paraLootCounts = GMS_lootCountsRed; +_missionLandscapeMode = "precise"; +_useMines = GMS_useMines; +_uniforms = GMS_SkinList; +_headgear = GMS_headgear; +_vests = GMS_vests; +_backpacks = GMS_backpacks; +_sideArms = GMS_Pistols; +_spawnCratesTiming = "atMissionSpawnGround"; +_loadCratesTiming = "atMissionSpawn"; +_endCondition = allKilledOrPlayerNear; +_minNoAI = GMS_MinAI_Red; +_maxNoAI = GMS_MaxAI_Red; +_noAIGroups = 0; +_noVehiclePatrols = GMS_SpawnVeh_Red; +_noEmplacedWeapons = GMS_SpawnEmplaced_Red; +_submarinePatrols = 0; +_scubaPatrols = 0; + +#include "\GMS\Compiles\Missions\GMS_fnc_missionSpawner.sqf"; \ No newline at end of file diff --git a/@GMS/addons/GMS/changeLog.txt b/@GMS/addons/GMS/changeLog.txt index dd2d790..1176c99 100644 --- a/@GMS/addons/GMS/changeLog.txt +++ b/@GMS/addons/GMS/changeLog.txt @@ -33,6 +33,20 @@ The static loot system and dynamic loot system are gone. THese outlived thier us I have kept the change log as a bit of history for those interested in development of this mission system. Significant Changes: +Version 7.166 Build 271 +ADDED An optional timeout message (See \Missions\Scouts\scouts.sqf for an example) +CHANGED how deletion of mission completion markers by moving schedule deletion of these markers to GMSCore + - Each mission completion marker is scheduled for deletion 6 min after mission completion. + - The timing of deletion is approximate as the script handling cleanup only runs every 60 seconds or so. +FIXED Some issues with mission timeout logic and code and rewrote code that handles initialized missions using a try/catch structure. +MOVED settings for amounts of money added to mission crates to GMS_config.sqf + +Version 7.165 Build 270 +ADDED Back mission config variables for static mission spawns to GMS_configs.sqf +ADDED Deletion of Mission Crates at statics. This may be controversial. +FIXED A bookkeeping issues wherein units that man static weapons were not counted properly in the ALIVE AI display on map markers +FIXED An issue that reduced movement of AI Vehicles until a player is spotted. The vehicle will still move to the player and stop once identified as an enemy. + Build 268 Version 7.164 Fixed issues with adding tabs or crypto to objects including AI. REQUIRES GMSCore diff --git a/@GMS/addons/GMS/config.cpp b/@GMS/addons/GMS/config.cpp index 8615d28..01ca2f6 100644 --- a/@GMS/addons/GMS/config.cpp +++ b/@GMS/addons/GMS/config.cpp @@ -12,9 +12,9 @@ */ class GMSBuild { - Version = "7.165"; - Build = "270"; - Date = "10-14-2023"; + Version = "7.166"; + Build = "271"; + Date = "10-15-2023"; }; class CfgPatches { @@ -57,8 +57,7 @@ class CfgFunctions { class missionCompleteMarker {}; class msgIED {}; class nearestPlayers {}; - //class playerInRange {}; - //class playerInRangeArray {}; + class restoreHiddenObjects {}; class setDirUp {}; class spawnMarker {};