From 5b0b8c35dd74eb2e0eb53c30dd883e99c6de11ed Mon Sep 17 00:00:00 2001 From: eraser1 Date: Thu, 24 Dec 2015 16:14:18 -0600 Subject: [PATCH] Mini-update --- @ExileServer/addons/a3_dms/config.sqf | 5 +++-- @ExileServer/addons/a3_dms/fn_DMS_preInit.sqf | 2 +- .../a3_dms/scripts/fn_AddMissionToMonitor.sqf | 20 +++---------------- .../scripts/fn_AddMissionToMonitor_Static.sqf | 20 +++---------------- .../addons/a3_dms/scripts/fn_CreateMarker.sqf | 14 ++++++++----- .../scripts/fn_MissionsMonitor_Dynamic.sqf | 2 +- .../scripts/fn_MissionsMonitor_Static.sqf | 4 ++-- .../a3_dms/scripts/fn_SetAILocality.sqf | 4 ++-- 8 files changed, 24 insertions(+), 47 deletions(-) diff --git a/@ExileServer/addons/a3_dms/config.sqf b/@ExileServer/addons/a3_dms/config.sqf index e7b7c0b..fcb2065 100644 --- a/@ExileServer/addons/a3_dms/config.sqf +++ b/@ExileServer/addons/a3_dms/config.sqf @@ -49,6 +49,7 @@ DMS_Use_Map_Config = true; // Whether or not to use config overwrites specific t DMS_AI_KillPercent = 100; // The percent amount of AI that need to be killed for "killPercent" mission requirement (NOT IMPLEMENTED) /*Mission Marker settings*/ + DMS_MissionMarkerCount = 2; // If you modify your CreateMarker and have multiple markers, you probably want to change this. *cough*Vish*cough* DMS_ShowDifficultyColorLegend = true; // Whether or not to show a "color legend" at the bottom left of the map that shows which color corresponds to which difficulty. I know it's not very pretty, meh. DMS_MarkerText_ShowMissionPrefix = true; // Whether or not to place a prefix before the mission marker text. Enable this if your players get confused by the marker names :P DMS_MarkerText_MissionPrefix = "Mission:"; // The text displayed before the mission name in the mission marker. @@ -141,9 +142,9 @@ DMS_Use_Map_Config = true; // Whether or not to use config overwrites specific t /*Mission notification settings*/ DMS_PlayerNotificationTypes = [ // Notification types. Supported values are: ["dynamicTextRequest", "standardHintRequest", "systemChatRequest", "textTilesRequest"] - //"dynamicTextRequest", // You should use either "dynamicTextRequest" or "textTilesRequest", and I think "textTilesRequest" looks better. + "dynamicTextRequest", // You should use either "dynamicTextRequest" or "textTilesRequest", and I think "textTilesRequest" looks better. //"standardHintRequest", // Hints are a bit wonky... - "textTilesRequest", // Keep in mind you can only have 1 "text tile" message up at a time, so the message will disappear if the player gets a kill or something while the message is shown. + //"textTilesRequest", // Keep in mind you can only have 1 "text tile" message up at a time, so the message will disappear if the player gets a kill or something while the message is shown. "systemChatRequest" // Always nice to show in chat so that players can scroll up to read the info if they need to. ]; diff --git a/@ExileServer/addons/a3_dms/fn_DMS_preInit.sqf b/@ExileServer/addons/a3_dms/fn_DMS_preInit.sqf index 8a8006c..aa68edd 100644 --- a/@ExileServer/addons/a3_dms/fn_DMS_preInit.sqf +++ b/@ExileServer/addons/a3_dms/fn_DMS_preInit.sqf @@ -7,7 +7,7 @@ DMS_HC_Object = objNull; DMS_CleanUpList = []; -DMS_Version = "December 24 2015"; +DMS_Version = "December 24 2015 (Vish Version)"; //Load main config diff --git a/@ExileServer/addons/a3_dms/scripts/fn_AddMissionToMonitor.sqf b/@ExileServer/addons/a3_dms/scripts/fn_AddMissionToMonitor.sqf index 3405bf4..43af49b 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_AddMissionToMonitor.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_AddMissionToMonitor.sqf @@ -41,7 +41,7 @@ ] ], [_missionName,_msgWIN,_msgLose], - [_markerDot,_markerCircle], + _markers, _side, _difficulty, _missionEvents, @@ -71,7 +71,7 @@ if !(params ["_inputUnits","",[[]]], ["_missionObjs","",[[]],[3,4]], ["_messages","",[[]],[3]], - ["_markers","",[[]],[2]], + ["_markers","",[[]],[DMS_MissionMarkerCount]], ["_side","bandit",[""]], ["_difficulty","moderate",[""]], ["_missionEvents",[],[[]]] @@ -144,17 +144,6 @@ try }; - if !(_markers params - [ - ["_markerDot","",[""]], - ["_markerCircle","",[""]] - ]) - then - { - throw format["_markers |%1|",_markers]; - }; - - if !(_onEndingScripts params [ ["_onSuccessScripts", [], [[]]], @@ -187,10 +176,7 @@ try _msgWIN, _msgLose ], - [ - _markerDot, - _markerCircle - ], + _markers, _side, _difficulty, _missionEvents, diff --git a/@ExileServer/addons/a3_dms/scripts/fn_AddMissionToMonitor_Static.sqf b/@ExileServer/addons/a3_dms/scripts/fn_AddMissionToMonitor_Static.sqf index be0aa31..f459ad9 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_AddMissionToMonitor_Static.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_AddMissionToMonitor_Static.sqf @@ -51,7 +51,7 @@ _msgWIN, _msgLose ], - [_markerDot,_markerCircle], + _markers, _side, _difficulty, _missionEvents, @@ -81,7 +81,7 @@ if !(params ["_inputUnits","",[[]]], ["_missionObjs","",[[]],[3,4]], ["_messages","",[[]],[3]], - ["_markers","",[[]],[2]], + ["_markers","",[[]],[DMS_MissionMarkerCount]], ["_side","bandit",[""]], ["_difficulty","moderate",[""]], ["_missionEvents",[],[[]]] @@ -145,17 +145,6 @@ try }; - if !(_markers params - [ - ["_markerDot","",[""]], - ["_markerCircle","",[""]] - ]) - then - { - throw format["_markers |%1|",_markers]; - }; - - if !(_onEndingScripts params [ ["_onSuccessScripts", [], [[]]], @@ -189,10 +178,7 @@ try _msgWIN, _msgLose ], - [ - _markerDot, - _markerCircle - ], + _markers, _side, _difficulty, _missionEvents, diff --git a/@ExileServer/addons/a3_dms/scripts/fn_CreateMarker.sqf b/@ExileServer/addons/a3_dms/scripts/fn_CreateMarker.sqf index 7dea25f..0cafb0d 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_CreateMarker.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_CreateMarker.sqf @@ -37,11 +37,15 @@ if ((_pos isEqualTo "ERROR") || ("_text" isEqualTo "ERROR")) exitWith }; -_randomMarker = DMS_MarkerPosRandomization; -if ((count _this)>3) then -{ - _randomMarker = param [3,DMS_MarkerPosRandomization,[false]]; -}; +_randomMarker = + if ((count _this)>3) then + { + _this select 3; + } + else + { + DMS_MarkerPosRandomization; + }; _num = DMS_MissionCount; diff --git a/@ExileServer/addons/a3_dms/scripts/fn_MissionsMonitor_Dynamic.sqf b/@ExileServer/addons/a3_dms/scripts/fn_MissionsMonitor_Dynamic.sqf index 30401dc..a0a6de1 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_MissionsMonitor_Dynamic.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_MissionsMonitor_Dynamic.sqf @@ -19,7 +19,7 @@ ] ], [_missionName,_msgWIN,_msgLose], - [_markerDot,_markerCircle], + _markers, _missionSide, _missionDifficulty, _missionEvents, diff --git a/@ExileServer/addons/a3_dms/scripts/fn_MissionsMonitor_Static.sqf b/@ExileServer/addons/a3_dms/scripts/fn_MissionsMonitor_Static.sqf index 781c463..0a13723 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_MissionsMonitor_Static.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_MissionsMonitor_Static.sqf @@ -25,7 +25,7 @@ [_mine1,_mine2,...,_mineX] ], [_missionName,_msgWIN,_msgLose], - [_markerDot,_markerCircle], + _markers, _missionSide, _missionDifficulty, _missionEvents, @@ -54,7 +54,7 @@ if (DMS_StaticMission_Arr isEqualTo []) exitWith {}; // Empty array, no stati ["_inputAIUnits", [], [[]] ], ["_missionObjs", [], [[]], [4] ], ["_msgInfo", [], [[]], [3] ], - ["_markers", [], [[]], [2] ], + ["_markers", [], [[]], [DMS_MissionMarkerCount] ], ["_missionSide", "", [""] ], ["_missionDifficulty", "", [""] ], ["_missionEvents", [], [[]] ], diff --git a/@ExileServer/addons/a3_dms/scripts/fn_SetAILocality.sqf b/@ExileServer/addons/a3_dms/scripts/fn_SetAILocality.sqf index de0432e..c1564f0 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_SetAILocality.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_SetAILocality.sqf @@ -29,7 +29,7 @@ if (isNull _AI) exitWith _AIType = typeName _AI; -_pos = if (_AIType=="OBJECT") then {_AI} else {param [1,"",[objNull,[]],[2,3]]}; +_pos = if (_AIType isEqualTo "OBJECT") then {_AI} else {param [1,"",[objNull,[]],[2,3]]}; if (_pos isEqualTo "") exitWith { @@ -50,7 +50,7 @@ _client = objNull; if (!isNull _client) then { - _swapped = if (_AIType=="OBJECT") then {_AI setOwner (owner _client)} else {_AI setGroupOwner (owner _client)}; + _swapped = if (_AIType isEqualTo "OBJECT") then {_AI setOwner (owner _client)} else {_AI setGroupOwner (owner _client)}; if (!_swapped) then {