Mini-update

This commit is contained in:
eraser1 2015-12-24 16:14:18 -06:00
parent 70fae7bc44
commit 5b0b8c35dd
8 changed files with 24 additions and 47 deletions

View File

@ -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) DMS_AI_KillPercent = 100; // The percent amount of AI that need to be killed for "killPercent" mission requirement (NOT IMPLEMENTED)
/*Mission Marker settings*/ /*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_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_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. 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*/ /*Mission notification settings*/
DMS_PlayerNotificationTypes = [ // Notification types. Supported values are: ["dynamicTextRequest", "standardHintRequest", "systemChatRequest", "textTilesRequest"] 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... //"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. "systemChatRequest" // Always nice to show in chat so that players can scroll up to read the info if they need to.
]; ];

View File

@ -7,7 +7,7 @@ DMS_HC_Object = objNull;
DMS_CleanUpList = []; DMS_CleanUpList = [];
DMS_Version = "December 24 2015"; DMS_Version = "December 24 2015 (Vish Version)";
//Load main config //Load main config

View File

@ -41,7 +41,7 @@
] ]
], ],
[_missionName,_msgWIN,_msgLose], [_missionName,_msgWIN,_msgLose],
[_markerDot,_markerCircle], _markers,
_side, _side,
_difficulty, _difficulty,
_missionEvents, _missionEvents,
@ -71,7 +71,7 @@ if !(params
["_inputUnits","",[[]]], ["_inputUnits","",[[]]],
["_missionObjs","",[[]],[3,4]], ["_missionObjs","",[[]],[3,4]],
["_messages","",[[]],[3]], ["_messages","",[[]],[3]],
["_markers","",[[]],[2]], ["_markers","",[[]],[DMS_MissionMarkerCount]],
["_side","bandit",[""]], ["_side","bandit",[""]],
["_difficulty","moderate",[""]], ["_difficulty","moderate",[""]],
["_missionEvents",[],[[]]] ["_missionEvents",[],[[]]]
@ -144,17 +144,6 @@ try
}; };
if !(_markers params
[
["_markerDot","",[""]],
["_markerCircle","",[""]]
])
then
{
throw format["_markers |%1|",_markers];
};
if !(_onEndingScripts params if !(_onEndingScripts params
[ [
["_onSuccessScripts", [], [[]]], ["_onSuccessScripts", [], [[]]],
@ -187,10 +176,7 @@ try
_msgWIN, _msgWIN,
_msgLose _msgLose
], ],
[ _markers,
_markerDot,
_markerCircle
],
_side, _side,
_difficulty, _difficulty,
_missionEvents, _missionEvents,

View File

@ -51,7 +51,7 @@
_msgWIN, _msgWIN,
_msgLose _msgLose
], ],
[_markerDot,_markerCircle], _markers,
_side, _side,
_difficulty, _difficulty,
_missionEvents, _missionEvents,
@ -81,7 +81,7 @@ if !(params
["_inputUnits","",[[]]], ["_inputUnits","",[[]]],
["_missionObjs","",[[]],[3,4]], ["_missionObjs","",[[]],[3,4]],
["_messages","",[[]],[3]], ["_messages","",[[]],[3]],
["_markers","",[[]],[2]], ["_markers","",[[]],[DMS_MissionMarkerCount]],
["_side","bandit",[""]], ["_side","bandit",[""]],
["_difficulty","moderate",[""]], ["_difficulty","moderate",[""]],
["_missionEvents",[],[[]]] ["_missionEvents",[],[[]]]
@ -145,17 +145,6 @@ try
}; };
if !(_markers params
[
["_markerDot","",[""]],
["_markerCircle","",[""]]
])
then
{
throw format["_markers |%1|",_markers];
};
if !(_onEndingScripts params if !(_onEndingScripts params
[ [
["_onSuccessScripts", [], [[]]], ["_onSuccessScripts", [], [[]]],
@ -189,10 +178,7 @@ try
_msgWIN, _msgWIN,
_msgLose _msgLose
], ],
[ _markers,
_markerDot,
_markerCircle
],
_side, _side,
_difficulty, _difficulty,
_missionEvents, _missionEvents,

View File

@ -37,11 +37,15 @@ if ((_pos isEqualTo "ERROR") || ("_text" isEqualTo "ERROR")) exitWith
}; };
_randomMarker = DMS_MarkerPosRandomization; _randomMarker =
if ((count _this)>3) then if ((count _this)>3) then
{ {
_randomMarker = param [3,DMS_MarkerPosRandomization,[false]]; _this select 3;
}; }
else
{
DMS_MarkerPosRandomization;
};
_num = DMS_MissionCount; _num = DMS_MissionCount;

View File

@ -19,7 +19,7 @@
] ]
], ],
[_missionName,_msgWIN,_msgLose], [_missionName,_msgWIN,_msgLose],
[_markerDot,_markerCircle], _markers,
_missionSide, _missionSide,
_missionDifficulty, _missionDifficulty,
_missionEvents, _missionEvents,

View File

@ -25,7 +25,7 @@
[_mine1,_mine2,...,_mineX] [_mine1,_mine2,...,_mineX]
], ],
[_missionName,_msgWIN,_msgLose], [_missionName,_msgWIN,_msgLose],
[_markerDot,_markerCircle], _markers,
_missionSide, _missionSide,
_missionDifficulty, _missionDifficulty,
_missionEvents, _missionEvents,
@ -54,7 +54,7 @@ if (DMS_StaticMission_Arr isEqualTo []) exitWith {}; // Empty array, no stati
["_inputAIUnits", [], [[]] ], ["_inputAIUnits", [], [[]] ],
["_missionObjs", [], [[]], [4] ], ["_missionObjs", [], [[]], [4] ],
["_msgInfo", [], [[]], [3] ], ["_msgInfo", [], [[]], [3] ],
["_markers", [], [[]], [2] ], ["_markers", [], [[]], [DMS_MissionMarkerCount] ],
["_missionSide", "", [""] ], ["_missionSide", "", [""] ],
["_missionDifficulty", "", [""] ], ["_missionDifficulty", "", [""] ],
["_missionEvents", [], [[]] ], ["_missionEvents", [], [[]] ],

View File

@ -29,7 +29,7 @@ if (isNull _AI) exitWith
_AIType = typeName _AI; _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 if (_pos isEqualTo "") exitWith
{ {
@ -50,7 +50,7 @@ _client = objNull;
if (!isNull _client) then 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 if (!_swapped) then
{ {