diff --git a/@ExileServer/addons/a3_dms/config.cpp b/@ExileServer/addons/a3_dms/config.cpp index 0310878..c0d4ef0 100644 --- a/@ExileServer/addons/a3_dms/config.cpp +++ b/@ExileServer/addons/a3_dms/config.cpp @@ -5,7 +5,7 @@ class CfgPatches units[] = {}; weapons[] = {}; a3_DMS_version = "March 10, 2017"; - requiredVersion = 1.66; + requiredVersion = 1.68; requiredAddons[] = {"exile_client","exile_server_config"}; }; }; diff --git a/@ExileServer/addons/a3_dms/scripts/fn_FillCrate.sqf b/@ExileServer/addons/a3_dms/scripts/fn_FillCrate.sqf index 27febe0..057fdf2 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_FillCrate.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_FillCrate.sqf @@ -150,7 +150,7 @@ if ((_lootValues isEqualType []) && {!((_lootValues select 1) isEqualType {})}) private _backpackValues = _lootValues select 2; private _backpackCount = 0; private _backpacks = - if ((_backpackValues) isEqualType []) then + if (_backpackValues isEqualType []) then { _backpackCount = _backpackValues select 0; _backpackValues select 1 diff --git a/@ExileServer/addons/a3_dms/scripts/fn_FindSafePos.sqf b/@ExileServer/addons/a3_dms/scripts/fn_FindSafePos.sqf index cd42b0c..89f54bf 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_FindSafePos.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_FindSafePos.sqf @@ -66,7 +66,7 @@ for "_attempts" from 1 to MAX_ATTEMPTS do } else { - [DMS_MinMax_X_Coords call DMS_fnc_SelectRandomVal,DMS_MinMax_Y_Coords call DMS_fnc_SelectRandomVal] isFlatEmpty [_nearestObjectMinDistance, 0, -1, 1, -1, false, objNull] + [DMS_MinMax_X_Coords call DMS_fnc_SelectRandomVal,DMS_MinMax_Y_Coords call DMS_fnc_SelectRandomVal] isFlatEmpty [_nearestObjectMinDistance, -1, -1, 1, -1, false, objNull] }; /* diff --git a/@ExileServer/addons/a3_dms/scripts/fn_IsValidPosition.sqf b/@ExileServer/addons/a3_dms/scripts/fn_IsValidPosition.sqf index a927413..ddbcf5c 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_IsValidPosition.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_IsValidPosition.sqf @@ -47,7 +47,7 @@ else { if ((count _pos)<2) then { - throw ("(ERROR UNDEFINED POSITION)"); + throw ("(UNDEFINED POSITION)"); }; if ((count _pos) isEqualTo 2) then diff --git a/@ExileServer/addons/a3_dms/scripts/fn_OnKilled.sqf b/@ExileServer/addons/a3_dms/scripts/fn_OnKilled.sqf index fcc73d7..833d768 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_OnKilled.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_OnKilled.sqf @@ -127,7 +127,7 @@ if (!isNull _av) then ] select (_av isKindOf "StaticWeapon")) ) then { - _av setDamage 1; + _av setDamage [1, false]; _av setVariable ["ExileDiedAt",time]; [if (_av isKindOf "Air") then {30} else {5}, {_this enableSimulationGlobal false}, _av, false, false] call ExileServer_system_thread_addTask; diff --git a/@ExileServer/addons/a3_dms/scripts/fn_SpawnAISoldier.sqf b/@ExileServer/addons/a3_dms/scripts/fn_SpawnAISoldier.sqf index 15d7475..08fb6b8 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_SpawnAISoldier.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_SpawnAISoldier.sqf @@ -32,7 +32,8 @@ Returns AI Object */ // Enabling this ensures that any optic/bipod/accessory that isn't compatible with a weapon cannot be selected. (Doesn't apply to custom gear sets) -#define USE_EXTRA_CHECKING 1 +// Disabled for now because BIS loves to break things all the time. +//#define USE_EXTRA_CHECKING 1 private _customGearSet = []; diff --git a/@ExileServer/addons/a3_dms/scripts/fn_SpawnBanditMission.sqf b/@ExileServer/addons/a3_dms/scripts/fn_SpawnBanditMission.sqf index f647391..e5870f6 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_SpawnBanditMission.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_SpawnBanditMission.sqf @@ -11,16 +11,17 @@ Simply spawns a mission with the given mission type and passes parameters to it. Returns nothing */ -private _mission = +private _missionName = _this param [0,selectRandom DMS_BanditMissionTypesArray, [""]]; +private _missionCode = [ missionNamespace getVariable format [ "DMS_Mission_%1", - _this param [0,selectRandom DMS_BanditMissionTypesArray, [""]] + _missionName ] ] param [0, "no",[{}]]; -if (_mission isEqualTo "no") then +if (_missionCode isEqualTo "no") then { diag_log format ["DMS ERROR :: Calling DMS_fnc_SpawnBanditMission for a mission that isn't in DMS_BanditMissionTypesArray! Parameters: %1",_this]; } @@ -32,13 +33,13 @@ else DMS_RunningBMissionCount = DMS_RunningBMissionCount + 1; DMS_BMissionDelay = DMS_TimeBetweenMissions call DMS_fnc_SelectRandomVal; - _parameters call _mission; + _parameters call _missionCode; DMS_BMissionLastStart = diag_tickTime; if (DMS_DEBUG) then { - (format ["SpawnBanditMission :: Spawned mission %1 with parameters (%2) | DMS_BMissionDelay set to %3 seconds", _mission, _parameters, DMS_BMissionDelay]) call DMS_fnc_DebugLog; + (format ["SpawnBanditMission :: Spawned mission %1 with parameters (%2) | DMS_BMissionDelay set to %3 seconds", _missionName, _parameters, DMS_BMissionDelay]) call DMS_fnc_DebugLog; }; }; diff --git a/README.md b/README.md index e555058..3536f9c 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ It is highly recommended that you add !="(_this select 0) execVM \"\A3\Structures_F\Wrecks\Scripts\Wreck_Heli_Attack_01.sqf\"" ``` -at ***the END of the line that starts with "7 exec" in scripts.txt*** . [Here is the pastebin](http://pastebin.com/W8bH252U). +at ***the END of the line that starts with "7 exec" in scripts.txt*** (if it exists). [Here is the pastebin](http://pastebin.com/W8bH252U). ***AND:***