From 6580e6dc9a2522f7f84d59a0406b04e1bded042d Mon Sep 17 00:00:00 2001 From: eraser1 Date: Sat, 16 Jul 2016 00:16:17 -0500 Subject: [PATCH] Fixing a couple of oopsies --- @ExileServer/addons/a3_dms/config.cpp | 2 +- @ExileServer/addons/a3_dms/config.sqf | 2 +- @ExileServer/addons/a3_dms/fn_DMS_postInit.sqf | 4 ++-- .../addons/a3_dms/missions/static/underwater_stash.sqf | 10 ++++++++++ @ExileServer/addons/a3_dms/scripts/fn_CreateMarker.sqf | 3 +-- .../addons/a3_dms/scripts/fn_PlayerAwardOnAIKill.sqf | 4 ++-- Changelog.md | 5 +++++ 7 files changed, 22 insertions(+), 8 deletions(-) diff --git a/@ExileServer/addons/a3_dms/config.cpp b/@ExileServer/addons/a3_dms/config.cpp index ad57928..c1909dd 100644 --- a/@ExileServer/addons/a3_dms/config.cpp +++ b/@ExileServer/addons/a3_dms/config.cpp @@ -4,7 +4,7 @@ class CfgPatches { units[] = {}; weapons[] = {}; - a3_DMS_version = "July 11, 2016"; + a3_DMS_version = "July 16, 2016"; requiredVersion = 1.36; requiredAddons[] = {"exile_client","exile_server_config"}; }; diff --git a/@ExileServer/addons/a3_dms/config.sqf b/@ExileServer/addons/a3_dms/config.sqf index 2038c53..95fa34b 100644 --- a/@ExileServer/addons/a3_dms/config.sqf +++ b/@ExileServer/addons/a3_dms/config.sqf @@ -22,7 +22,7 @@ //#define GIVE_AI_APEX_WEAPONS 1 // Uncomment this if you want Apex gear on AI. Uniforms, Vests, Backpacks, Helmets,Scopes -//#define GIVE_AI_APEX_GEAR +//#define GIVE_AI_APEX_GEAR 1 // Uncomment this if you want Apex weapons in loot crates //#define USE_APEX_WEAPONS_IN_CRATES 1 diff --git a/@ExileServer/addons/a3_dms/fn_DMS_postInit.sqf b/@ExileServer/addons/a3_dms/fn_DMS_postInit.sqf index d73b26c..2bb5be3 100644 --- a/@ExileServer/addons/a3_dms/fn_DMS_postInit.sqf +++ b/@ExileServer/addons/a3_dms/fn_DMS_postInit.sqf @@ -218,8 +218,8 @@ if (DMS_ShowDifficultyColorLegend) then { missionNamespace setVariable [ - format["DMS_Mission_%1",_missionName], - compileFinal preprocessFileLineNumbers (format ["\x\addons\DMS\missions\bandit\%1.sqf",_missionName]) + format["DMS_Mission_%1",_x], + compileFinal preprocessFileLineNumbers (format ["\x\addons\DMS\missions\bandit\%1.sqf",_x]) ]; [_x] call DMS_fnc_SpawnBanditMission; diff --git a/@ExileServer/addons/a3_dms/missions/static/underwater_stash.sqf b/@ExileServer/addons/a3_dms/missions/static/underwater_stash.sqf index 4a44a52..805d6a1 100644 --- a/@ExileServer/addons/a3_dms/missions/static/underwater_stash.sqf +++ b/@ExileServer/addons/a3_dms/missions/static/underwater_stash.sqf @@ -26,6 +26,16 @@ DMS_CrateCase_DiverGear = "arifle_SDAR_F" ], [ + "20Rnd_556x45_UW_mag", + "20Rnd_556x45_UW_mag", + "20Rnd_556x45_UW_mag", + "20Rnd_556x45_UW_mag", + "20Rnd_556x45_UW_mag", + "20Rnd_556x45_UW_mag", + "20Rnd_556x45_UW_mag", + "20Rnd_556x45_UW_mag", + "20Rnd_556x45_UW_mag", + "20Rnd_556x45_UW_mag", "U_O_Wetsuit", "U_O_Wetsuit", "U_O_Wetsuit", diff --git a/@ExileServer/addons/a3_dms/scripts/fn_CreateMarker.sqf b/@ExileServer/addons/a3_dms/scripts/fn_CreateMarker.sqf index 36cc4f7..7db1370 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_CreateMarker.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_CreateMarker.sqf @@ -111,9 +111,8 @@ if (DMS_MarkerText_ShowMissionPrefix) then if (_randomMarker) then { - private _dir = random 360; private _dis = DMS_MarkerPosRandomRadius call DMS_fnc_SelectRandomVal; - private _npos = _pos getPos [_dis,_dir]; + private _npos = _pos getPos [_dis,random 360]; _circle setMarkerPos _npos; _dot setMarkerPos _npos; diff --git a/@ExileServer/addons/a3_dms/scripts/fn_PlayerAwardOnAIKill.sqf b/@ExileServer/addons/a3_dms/scripts/fn_PlayerAwardOnAIKill.sqf index bb5ad75..d8deba6 100644 --- a/@ExileServer/addons/a3_dms/scripts/fn_PlayerAwardOnAIKill.sqf +++ b/@ExileServer/addons/a3_dms/scripts/fn_PlayerAwardOnAIKill.sqf @@ -131,8 +131,8 @@ if ((!isNull _playerObj) && {(_playerUID != "") && {_playerObj isKindOf "Exile_U { private _group = group _playerObj; private _members = units _group; - //if (!(_group isEqualTo ExileGraveyardGroup) && {(count _members)>1}) then - if ((count _members)>1) then + + if (!(_group isEqualTo ExileServerLoneWolfGroup) && {(count _members)>1}) then { private _msg = format [ diff --git a/Changelog.md b/Changelog.md index 10b6b78..ca16bf7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,11 @@ ### Main Branch +### July 16, 2016 (12:15 AM CST-America): +* Fixed a typo in the post-init when using "DMS_BanditMissionsOnServerStart" (thanks to [jmayr2000 on the forums](http://www.exilemod.com/profile/76602-jmayr2000/) for reporting the issue) +* The "underwater_stash" mission will now actually spawn ammo for the SDARs in the crate on land (thanks to "Valthos" for pointing that out). +* Members in the Exile "Lone Wolf" group will no longer get notified when another "Lone Wolf" kills an AI. + ### July 11, 2016 (7:00 PM CST-America): * Fixed spawning missions on server start if it wasn't listed in static/bandit missions. * Moved the freeze manager to FSM.