Arma3_Exile/DMS_Exile
1
0
Fork 0
mirror of https://github.com/Defent/DMS_Exile.git synced 2024-08-30 16:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes + micro-optimizations

Browse Source
This commit is contained in:
eraser1 2016-05-15 13:55:18 -05:00
parent e3d11a0aa5
commit 218d65b8a0
19 changed files with 103 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
@ExileServer/addons/a3_dms/config.cpp
View File

@ -4,7 +4,7 @@ class CfgPatches
{ {
units[] = {}; units[] = {};
weapons[] = {}; weapons[] = {};
a3_DMS_version = "May 6, 2016 (TEST)"; a3_DMS_version = "May 15, 2016 (TEST)";
requiredVersion = 1.36; requiredVersion = 1.36;
requiredAddons[] = {"exile_client","exile_server_config"}; requiredAddons[] = {"exile_client","exile_server_config"};
}; };

9
@ExileServer/addons/a3_dms/config.sqf
View File

@ -6,13 +6,6 @@
*/ */
// Enables debug logging in DMS functions.
// Logs will be written in the RPT, and if you have infiSTAR's "ARMA_LOG" DLL loaded, it will also produce logs in the server directory.
// If you have mARMA by maca134, DMS will also utilize mARMA logs.
// This will produce A LOT of logs, so make sure you leave it to false unless you know what you're doing.
DMS_DEBUG = false;
DMS_Use_Map_Config = true; // Whether or not to use config overwrites specific to the map. DMS_Use_Map_Config = true; // Whether or not to use config overwrites specific to the map.
/* /*
@ -240,7 +233,7 @@ DMS_SpawnMissions_Scheduled = false; // Whether or not to spawn missions in a sc
DMS_findSafePosBlacklist = [ // For BIS_fnc_findSafePos position blacklist info refer to: http://www.exilemod.com/topic/61-dms-defents-mission-system/?page=18#comment-31190 DMS_findSafePosBlacklist = [ // For position blacklist info refer to: http://www.exilemod.com/topic/61-dms-defents-mission-system/?do=findComment&comment=31190
// An example is given in the altis_config.sqf (it blacklists the salt flats). // An example is given in the altis_config.sqf (it blacklists the salt flats).
/* /*
// Blacklists most of the Northern Taviana Volcano // Blacklists most of the Northern Taviana Volcano

11
@ExileServer/addons/a3_dms/fn_DMS_preInit.sqf
View File

@ -4,7 +4,13 @@
*/ */
#define CALLFILE(FILE) call compile preprocessFileLineNumbers FILE; #define CALLFILE(FILE) call compile preprocessFileLineNumbers FILE;
DMS_HC_Object = objNull; // Enables debug logging in DMS functions. !!!NOTE:!!! You must uncomment the line above if you want DMS to even check whether or not debug mode is enabled!
// Logs will be written in the RPT, and if you have infiSTAR's "ARMA_LOG" DLL loaded, it will also produce logs in the server directory.
// If you have mARMA by maca134, DMS will also utilize mARMA logs.
// This will produce A LOT of logs, so make sure you leave it to false unless you know what you're doing.
DMS_DEBUG = false;
DMS_CleanUpList = []; DMS_CleanUpList = [];
@ -42,6 +48,9 @@ M3E_fnc_getCenter = DMS_fnc_GetCenter;
M3E_fnc_subArr = DMS_fnc_SubArr; M3E_fnc_subArr = DMS_fnc_SubArr;
// Because I fucked up the name on first implementation and don't want to mess anybody up who didn't realize to change every occurence of "DMS_MaxSurfaceNormal" to "DMS_MinSurfaceNormal".
DMS_MaxSurfaceNormal = DMS_MinSurfaceNormal;
DMS_AttemptsUntilThrottle = DMS_AttemptsUntilThrottle + 1; DMS_AttemptsUntilThrottle = DMS_AttemptsUntilThrottle + 1;

5
@ExileServer/addons/a3_dms/scripts/fn_AILocalityManager.sqf
View File

@ -21,8 +21,9 @@ if (!DMS_ai_offload_to_client) exitWith {};
private _groupOwner = groupOwner _group; private _groupOwner = groupOwner _group;
private _ownerObj = objNull; private _ownerObj = objNull;
private _isLocal = local _group;
if !(local _group) then // Only check for the group owner in players if it doesn't belong to the server. if !(_isLocal) then // Only check for the group owner in players if it doesn't belong to the server.
{ {
{ {
if (_groupOwner isEqualTo (owner _x)) exitWith if (_groupOwner isEqualTo (owner _x)) exitWith
@ -33,7 +34,7 @@ if (!DMS_ai_offload_to_client) exitWith {};
}; };
// If the owner doesn't exist or is too far away... Attempt to set a new player owner, and if none are found... and if the group doesn't belong to the server... // If the owner doesn't exist or is too far away... Attempt to set a new player owner, and if none are found... and if the group doesn't belong to the server...
if (((isNull _ownerObj) || {(_ownerObj distance2D _leader)>3500}) && {!([_group,_leader] call DMS_fnc_SetAILocality)} && {!(local _group)}) then if (((isNull _ownerObj) || {(_ownerObj distance2D _leader)>3500}) && {!([_group,_leader] call DMS_fnc_SetAILocality)} && {!_isLocal}) then
{ {
// Reset locality to the server // Reset locality to the server
_group setGroupOwner 2; _group setGroupOwner 2;

73
@ExileServer/addons/a3_dms/scripts/fn_FillCrate.sqf
View File

@ -114,46 +114,52 @@ if (_crate getVariable ["DMS_CrateEnableRope",DMS_EnableBoxMoving]) then
if ((_lootValues isEqualType []) && {!((_lootValues select 1) isEqualType {})}) then if ((_lootValues isEqualType []) && {!((_lootValues select 1) isEqualType {})}) then
{ {
private ["_wepCount", "_weps", "_itemCount", "_items", "_backpackCount", "_backpacks"];
// Weapons // Weapons
if ((_lootValues select 0) isEqualType []) then private _wepValues = _lootValues select 0;
{ private _wepCount = 0;
_wepCount = (_lootValues select 0) select 0; private _weps =
_weps = (_lootValues select 0) select 1; if (_wepValues isEqualType []) then
} {
else _wepCount = _wepValues select 0;
{ _wepValues select 1
_wepCount = _lootValues select 0; }
_weps = DMS_boxWeapons; else
}; {
_wepCount = _wepValues;
DMS_boxWeapons
};
// Items // Items
if ((_lootValues select 1) isEqualType []) then private _itemValues = _lootValues select 1;
{ private _itemCount = 0;
_itemCount = (_lootValues select 1) select 0; private _items =
_items = (_lootValues select 1) select 1; if (_itemValues isEqualType []) then
} {
else _itemCount = _itemValues select 0;
{ _itemValues select 1
_itemCount = _lootValues select 1; }
_items = DMS_boxItems; else
}; {
_itemCount = _itemValues;
DMS_boxItems
};
// Backpacks // Backpacks
if ((_lootValues select 2) isEqualType []) then private _backpackValues = _lootValues select 2;
{ private _backpackCount = 0;
_backpackCount = (_lootValues select 2) select 0; private _backpacks =
_backpacks = (_lootValues select 2) select 1; if ((_backpackValues) isEqualType []) then
} {
else _backpackCount = _backpackValues select 0;
{ _backpackValues select 1
_backpackCount = _lootValues select 2; }
_backpacks = DMS_boxBackpacks; else
}; {
_backpackCount = _backpackValues;
DMS_boxBackpacks
};
if (DMS_DEBUG) then if (DMS_DEBUG) then
{ {
@ -260,7 +266,6 @@ else
_crate addBackpackCargoGlobal _x; _crate addBackpackCargoGlobal _x;
} forEach _backpacks; } forEach _backpacks;
if (DMS_DEBUG) then if (DMS_DEBUG) then
{ {
(format["FillCrate :: Filled crate %1 (at %5) with weapons |%2|, items |%3|, and backpacks |%4|",_crate, _weps, _items, _backpacks, getPosATL _crate]) call DMS_fnc_DebugLog; (format["FillCrate :: Filled crate %1 (at %5) with weapons |%2|, items |%3|, and backpacks |%4|",_crate, _weps, _items, _backpacks, getPosATL _crate]) call DMS_fnc_DebugLog;

9
@ExileServer/addons/a3_dms/scripts/fn_FindSafePos.sqf
View File

@ -20,8 +20,6 @@
*/ */
#define MAX_ATTEMPTS 5000 #define MAX_ATTEMPTS 5000
private ["_pos", "_presetLocs", "_attempts"];
params params
[ [
["_nearestObjectMinDistance", 25, [0] ], ["_nearestObjectMinDistance", 25, [0] ],
@ -45,6 +43,7 @@ DMS_DebugMarkers = [];
private _isValidSpot = false; private _isValidSpot = false;
private _presetLocs = [];
private _presetLocsLength = 0; private _presetLocsLength = 0;
if (DMS_UsePredefinedMissionLocations) then if (DMS_UsePredefinedMissionLocations) then
@ -55,6 +54,8 @@ if (DMS_UsePredefinedMissionLocations) then
}; };
private _pos = [];
for "_attempts" from 1 to MAX_ATTEMPTS do for "_attempts" from 1 to MAX_ATTEMPTS do
{ {
_pos = _pos =
@ -64,7 +65,7 @@ for "_attempts" from 1 to MAX_ATTEMPTS do
} }
else else
{ {
[DMS_MinMax_X_Coords call DMS_fnc_SelectRandomVal,DMS_MinMax_Y_Coords call DMS_fnc_SelectRandomVal] isFlatEmpty [_nearestObjectMinDistance, 0, 9999, 1, 0, _waterSpawn, objNull] [DMS_MinMax_X_Coords call DMS_fnc_SelectRandomVal,DMS_MinMax_Y_Coords call DMS_fnc_SelectRandomVal] isFlatEmpty [_nearestObjectMinDistance, 0, 9999, 1, 0, -1, objNull]
}; };
/* /*
@ -97,7 +98,7 @@ for "_attempts" from 1 to MAX_ATTEMPTS do
if (_isValidSpot) exitWith {}; if (_isValidSpot) exitWith {};
}; };
if (_attempts isEqualTo MAX_ATTEMPTS) exitWith if !(_isValidSpot) exitWith
{ {
diag_log format["DMS ERROR :: Number of attempts in DMS_fnc_findSafePos (%1) reached maximum number of attempts!",MAX_ATTEMPTS]; diag_log format["DMS ERROR :: Number of attempts in DMS_fnc_findSafePos (%1) reached maximum number of attempts!",MAX_ATTEMPTS];
}; };

4
@ExileServer/addons/a3_dms/scripts/fn_GroupReinforcementsManager.sqf
View File

@ -545,7 +545,7 @@ if (!_reinforcementsDepleted && {(diag_tickTime-_lastUpdated)>_updateDelay}) the
if ((!isNil "_unitsToSpawn") && {_unitsToSpawn>0}) then if ((!isNil "_unitsToSpawn") && {_unitsToSpawn>0}) then
{ {
private ["_spawnPos"]; private _spawnPos = [];
if (_maxReinforcementUnits>0) then if (_maxReinforcementUnits>0) then
{ {
@ -583,7 +583,7 @@ if (!_reinforcementsDepleted && {(diag_tickTime-_lastUpdated)>_updateDelay}) the
// Add extra spawning locations if there are not enough. // Add extra spawning locations if there are not enough.
for "_i" from 0 to (_unitsToSpawn-_spawningLocations_count-1) do for "_i" from 0 to (_unitsToSpawn-_spawningLocations_count-1) do
{ {
_spawningLocations pushBack (_spawningLocations select floor(random(_spawningLocations_count+_i))); _spawningLocations pushBack (selectRandom _spawningLocations);
}; };
// Now to spawn the AI... // Now to spawn the AI...

7
@ExileServer/addons/a3_dms/scripts/fn_HeliParatroopers_Monitor.sqf
View File

@ -70,7 +70,7 @@
if ((_heli distance2D _dropPoint)<200) then if ((_heli distance2D _dropPoint)<200) then
{ {
private ["_groupOwner"]; private _groupOwner = [];
private _AIGroup = group _heli; private _AIGroup = group _heli;
@ -89,8 +89,7 @@
{ {
/* /*
moveOut _unit; moveOut _unit;
private ["_parachute", "_dir"]; private _parachute = createVehicle ["Steerable_Parachute_F", (getPosATL _unit), [], 0, "CAN_COLLIDE"];
_parachute = createVehicle ["Steerable_Parachute_F", (getPosATL _unit), [], 0, "CAN_COLLIDE"];
_parachute setDir (getDir _unit); _parachute setDir (getDir _unit);
_parachute enableSimulationGlobal true; _parachute enableSimulationGlobal true;
@ -149,7 +148,7 @@
// Revert and unlock locality if necessary. // Revert and unlock locality if necessary.
if !(isNil "_groupOwner") then if !(_groupOwner isEqualTo []) then
{ {
_AIGroup setGroupOwner _groupOwner; _AIGroup setGroupOwner _groupOwner;
_AIGroup setVariable ["DMS_LockLocality", false]; _AIGroup setVariable ["DMS_LockLocality", false];

11
@ExileServer/addons/a3_dms/scripts/fn_MissionParams.sqf
View File

@ -47,8 +47,7 @@
] ]
*/ */
private ["_missionPosition"]; private _missionPosition = [];
private _extraParams = []; private _extraParams = [];
@ -62,7 +61,7 @@ if (isNil "_this") then
// Simply use generated position with default values. // Simply use generated position with default values.
_missionPosition = _missionPosition =
[ [
25,DMS_WaterNearBlacklist,DMS_MaxSurfaceNormal,DMS_SpawnZoneNearBlacklist,DMS_TraderZoneNearBlacklist,DMS_MissionNearBlacklist,DMS_PlayerNearBlacklist,DMS_TerritoryNearBlacklist,DMS_ThrottleBlacklists 25,DMS_WaterNearBlacklist,DMS_MinSurfaceNormal,DMS_SpawnZoneNearBlacklist,DMS_TraderZoneNearBlacklist,DMS_MissionNearBlacklist,DMS_PlayerNearBlacklist,DMS_TerritoryNearBlacklist,DMS_ThrottleBlacklists
] call DMS_fnc_FindSafePos; ] call DMS_fnc_FindSafePos;
} }
else else
@ -71,7 +70,7 @@ else
{ {
if (params if (params
[ [
["_findSafePosParams",[25,DMS_WaterNearBlacklist,DMS_MaxSurfaceNormal,DMS_SpawnZoneNearBlacklist,DMS_TraderZoneNearBlacklist,DMS_MissionNearBlacklist,DMS_PlayerNearBlacklist,DMS_TerritoryNearBlacklist,DMS_ThrottleBlacklists],[[]]], ["_findSafePosParams",[25,DMS_WaterNearBlacklist,DMS_MinSurfaceNormal,DMS_SpawnZoneNearBlacklist,DMS_TraderZoneNearBlacklist,DMS_MissionNearBlacklist,DMS_PlayerNearBlacklist,DMS_TerritoryNearBlacklist,DMS_ThrottleBlacklists],[[]]],
["_posInfo",[],[[]],[1,2]] ["_posInfo",[],[[]],[1,2]]
]) ])
then then
@ -98,7 +97,7 @@ else
_missionPosition set [2,0]; _missionPosition set [2,0];
}; };
if (!_forceSpawn && {!([_missionPosition,DMS_WaterNearBlacklist,DMS_MaxSurfaceNormal,DMS_SpawnZoneNearBlacklist,DMS_TraderZoneNearBlacklist,DMS_MissionNearBlacklist,DMS_PlayerNearBlacklist,DMS_TerritoryNearBlacklist] call DMS_fnc_IsValidPosition)}) then if (!_forceSpawn && {!([_missionPosition,DMS_WaterNearBlacklist,DMS_MinSurfaceNormal,DMS_SpawnZoneNearBlacklist,DMS_TraderZoneNearBlacklist,DMS_MissionNearBlacklist,DMS_PlayerNearBlacklist,DMS_TerritoryNearBlacklist] call DMS_fnc_IsValidPosition)}) then
{ {
if (DMS_DEBUG) then if (DMS_DEBUG) then
{ {
@ -124,7 +123,7 @@ else
{ {
_missionPosition = _missionPosition =
[ [
25,DMS_WaterNearBlacklist,DMS_MaxSurfaceNormal,DMS_SpawnZoneNearBlacklist,DMS_TraderZoneNearBlacklist,DMS_MissionNearBlacklist,DMS_PlayerNearBlacklist,DMS_TerritoryNearBlacklist,DMS_ThrottleBlacklists 25,DMS_WaterNearBlacklist,DMS_MinSurfaceNormal,DMS_SpawnZoneNearBlacklist,DMS_TraderZoneNearBlacklist,DMS_MissionNearBlacklist,DMS_PlayerNearBlacklist,DMS_TerritoryNearBlacklist,DMS_ThrottleBlacklists
] call DMS_fnc_FindSafePos; ] call DMS_fnc_FindSafePos;
_extraParams = _this; _extraParams = _this;

22
@ExileServer/addons/a3_dms/scripts/fn_OnKilled.sqf
View File

@ -50,12 +50,12 @@ moveOut _unit;
_unit removeAllEventHandlers "HandleDamage"; _unit removeAllEventHandlers "HandleDamage";
// Remove gear according to configs // Remove gear according to configs
if (DMS_clear_AI_body && {(random 100) <= DMS_clear_AI_body_chance}) then if ((_unit getVariable ["DMS_clear_AI_body",DMS_clear_AI_body]) && {(random 100) <= (_unit getVariable ["DMS_clear_AI_body_chance",DMS_clear_AI_body_chance])}) then
{ {
_unit call _removeAll; _unit call _removeAll;
}; };
if (DMS_ai_remove_launchers && {(_launcherVar != "") || {_launcher != ""}}) then if ((_unit getVariable ["DMS_ai_remove_launchers",DMS_ai_remove_launchers]) && {(_launcherVar != "") || {_launcher != ""}}) then
{ {
// Because arma is stupid sometimes // Because arma is stupid sometimes
if (_launcher isEqualTo "") then if (_launcher isEqualTo "") then
@ -91,7 +91,7 @@ if (DMS_ai_remove_launchers && {(_launcherVar != "") || {_launcher != ""}}) then
} forEach (magazines _unit); } forEach (magazines _unit);
}; };
if(DMS_RemoveNVG) then if (_unit getVariable ["DMS_RemoveNVG",DMS_RemoveNVG]) then
{ {
_unit unlinkItem "NVGoggles"; _unit unlinkItem "NVGoggles";
}; };
@ -188,9 +188,9 @@ if (!isNull _av) then
_grp setVariable ["DMS_LockLocality",true]; _grp setVariable ["DMS_LockLocality",true];
// The AI has to be local in order for these commands to work, so I reset locality, just because it's really difficult to deal with otherwise // The AI has to be local in order for these commands to work, so I reset locality, just because it's really difficult to deal with otherwise
if (_owner!=2) then if !(_owner in [2,0]) then
{ {
diag_log format ["Temporarily setting owner of %1 to server from %2. Success: %3",_grp,_owner,_grp setGroupOwner 2]; diag_log format ["DMS Seat Switcher :: Temporarily setting owner of %1 to server from %2. Success: %3",_grp,_owner,_grp setGroupOwner 2];
}; };
sleep 5+(random 3); // 5 to 8 seconds delay after gunner death sleep 5+(random 3); // 5 to 8 seconds delay after gunner death
@ -227,7 +227,7 @@ if (!isNull _av) then
(format["OnKilled :: Switched driver of AI Vehicle (%1) to gunner.",typeOf _av]) call DMS_fnc_DebugLog; (format["OnKilled :: Switched driver of AI Vehicle (%1) to gunner.",typeOf _av]) call DMS_fnc_DebugLog;
}; };
if (_owner!=2) then if !(_owner in [2,0]) then
{ {
private _start = time; private _start = time;
@ -261,7 +261,7 @@ if (!isNull _av) then
sleep 15; sleep 15;
diag_log format ["Resetting ownership of %1 to %2. Success: %3",_grp,_owner,_grp setGroupOwner _owner]; diag_log format ["DMS Seat Switcher :: Resetting ownership of %1 to %2. Success: %3",_grp,_owner,_grp setGroupOwner _owner];
}; };
_grp setVariable ["DMS_LockLocality",false]; _grp setVariable ["DMS_LockLocality",false];
@ -293,7 +293,7 @@ if (isPlayer _killer) then
_roadKilled = true; _roadKilled = true;
if (DMS_explode_onRoadkill) then if (_unit getVariable ["DMS_explode_onRoadkill",DMS_explode_onRoadkill]) then
{ {
private _boom = createVehicle ["SLAMDirectionalMine_Wire_Ammo", [0,0,100], [], 0, "CAN_COLLIDE"]; private _boom = createVehicle ["SLAMDirectionalMine_Wire_Ammo", [0,0,100], [], 0, "CAN_COLLIDE"];
_boom setPosATL (getPosATL _playerObj); _boom setPosATL (getPosATL _playerObj);
@ -306,7 +306,7 @@ if (isPlayer _killer) then
// Remove gear from roadkills if configured to do so // Remove gear from roadkills if configured to do so
if (DMS_remove_roadkill && {(random 100) <= DMS_remove_roadkill_chance}) then if ((_unit getVariable ["DMS_remove_roadkill",DMS_remove_roadkill]) && {(random 100) <= (_unit getVariable ["DMS_remove_roadkill_chance",DMS_remove_roadkill_chance])}) then
{ {
_unit call _removeAll; _unit call _removeAll;
}; };
@ -316,7 +316,7 @@ if (isPlayer _killer) then
// Reveal the killer to the AI units // Reveal the killer to the AI units
if (DMS_ai_share_info) then if (_unit getVariable ["DMS_ai_share_info",DMS_ai_share_info]) then
{ {
private _revealAmount = 4.0; private _revealAmount = 4.0;
@ -333,7 +333,7 @@ if (isPlayer _killer) then
{ {
if ((alive _x) && {!(isPlayer _x) && {(_x distance2D _unit) <= DMS_ai_share_info_distance}}) then if ((alive _x) && {!(isPlayer _x) && {(_x distance2D _unit) <= (_unit getVariable ["DMS_ai_share_info_distance",DMS_ai_share_info_distance])}}) then
{ {
_x reveal [_killer, _revealAmount max (_x knowsAbout _playerObj)]; _x reveal [_killer, _revealAmount max (_x knowsAbout _playerObj)];
}; };

4
@ExileServer/addons/a3_dms/scripts/fn_PlayerAwardOnAIKill.sqf
View File

@ -83,7 +83,7 @@ if ((!isNull _playerObj) && {(_playerUID != "") && {_playerObj isKindOf "Exile_U
if (_moneyChange!=0) then if (_moneyChange!=0) then
{ {
private ["_distance"]; private _distance = [];
// Set client's money // Set client's money
// I also make sure that they don't get negative poptabs // I also make sure that they don't get negative poptabs
@ -202,7 +202,7 @@ if ((!isNull _playerObj) && {(_playerUID != "") && {_playerObj isKindOf "Exile_U
"%1 killed %2 from %3 meters away and received %4 poptabs, and %5 respect.", "%1 killed %2 from %3 meters away and received %4 poptabs, and %5 respect.",
name _playerObj, name _playerObj,
_unitName, _unitName,
if !(isNil "_distance") then {_distance} else {floor(_unit distance _playerObj)}, if (_distance isEqualTo []) then {floor(_unit distance _playerObj)} else {_distance},
_moneyChange, _moneyChange,
_repChange _repChange
]; ];

2
@ExileServer/addons/a3_dms/scripts/fn_SelectMission.sqf
View File

@ -46,7 +46,7 @@ if (diag_fps >= DMS_MinServerFPS && {(count allPlayers) >= DMS_MinPlayerCount})
if (_availableMissions isEqualTo []) exitWith if (_availableMissions isEqualTo []) exitWith
{ {
DMS_StaticMissionLastStart = _time; DMS_StaticMissionLastStar
if (DMS_DEBUG) then if (DMS_DEBUG) then
{ {
(format ["SelectMission :: No available missions! Running missions: %1", DMS_RunningStaticMissions]) call DMS_fnc_DebugLog; (format ["SelectMission :: No available missions! Running missions: %1", DMS_RunningStaticMissions]) call DMS_fnc_DebugLog;

9
@ExileServer/addons/a3_dms/scripts/fn_SpawnAIGroup.sqf
View File

@ -15,8 +15,6 @@
Returns AI Group Returns AI Group
*/ */
private ["_launcherType"];
if !(params if !(params
[ [
@ -44,6 +42,9 @@ if (DMS_DEBUG) then
(format["SpawnAIGroup :: Spawning %1 %2 %3 AI at %4 with %5 difficulty.",_count,_class,_side,_pos,_difficulty]) call DMS_fnc_DebugLog; (format["SpawnAIGroup :: Spawning %1 %2 %3 AI at %4 with %5 difficulty.",_count,_class,_side,_pos,_difficulty]) call DMS_fnc_DebugLog;
}; };
private _launcherType = "";
// if soldier have AT/AA weapons // if soldier have AT/AA weapons
if (_class isEqualType []) then if (_class isEqualType []) then
{ {
@ -80,9 +81,9 @@ for "_i" from 1 to _count do
}; };
// An AI will definitely spawn with a launcher if you define type // An AI will definitely spawn with a launcher if you define type
if ((!isNil "_launcherType") || {DMS_ai_use_launchers && {DMS_ai_launchers_per_group>0}}) then if ((DMS_ai_use_launchers && {DMS_ai_launchers_per_group>0}) || {!_launcherType isEqualTo ""}) then
{ {
if (isNil "_launcherType") then if (_launcherType isEqualTo "") then
{ {
_launcherType = "AT"; _launcherType = "AT";
}; };

10
@ExileServer/addons/a3_dms/scripts/fn_SpawnAIGroup_MultiPos.sqf
View File

@ -23,9 +23,6 @@
Returns AI Group Returns AI Group
*/ */
private ["_launcherType"];
if !(params if !(params
[ [
["_positions","_positions ERROR",[[]]], ["_positions","_positions ERROR",[[]]],
@ -60,6 +57,9 @@ if (DMS_DEBUG) then
(format["SpawnAIGroup_MultiPos :: Spawning %1 %2 %3 AI at positions %4 with %5 difficulty.",_count,_class,_side,_positions,_difficulty]) call DMS_fnc_DebugLog; (format["SpawnAIGroup_MultiPos :: Spawning %1 %2 %3 AI at positions %4 with %5 difficulty.",_count,_class,_side,_positions,_difficulty]) call DMS_fnc_DebugLog;
}; };
private _launcherType = "";
// if soldier have AT/AA weapons // if soldier have AT/AA weapons
if (_class isEqualType []) then if (_class isEqualType []) then
{ {
@ -97,9 +97,9 @@ for "_i" from 1 to _count do
}; };
// An AI will definitely spawn with a launcher if you define type // An AI will definitely spawn with a launcher if you define type
if ((!isNil "_launcherType") || {DMS_ai_use_launchers && {DMS_ai_launchers_per_group>0}}) then if ((DMS_ai_use_launchers && {DMS_ai_launchers_per_group>0}) || {!_launcherType isEqualTo ""}) then
{ {
if (isNil "_launcherType") then if (_launcherType isEqualTo "") then
{ {
_launcherType = "AT"; _launcherType = "AT";
}; };

4
@ExileServer/addons/a3_dms/scripts/fn_SpawnAIStaticMG.sqf
View File

@ -37,7 +37,7 @@ exitWith
private _MGClassInput = private _MGClassInput =
if ((count _this)>5) then if ((count _this)>5) then
{ {
param [5]; _this select 5
} }
else else
{ {
@ -60,8 +60,6 @@ private _guns = _positions apply
_group addVehicle _gun; _group addVehicle _gun;
_guns pushBack _gun;
private _unit = [_group,_x,_class,_difficulty,_side,"Static"] call DMS_fnc_SpawnAISoldier; private _unit = [_group,_x,_class,_difficulty,_side,"Static"] call DMS_fnc_SpawnAISoldier;
_unit moveInGunner _gun; _unit moveInGunner _gun;

6
@ExileServer/addons/a3_dms/scripts/fn_SpawnHeliReinforcement.sqf
View File

@ -21,9 +21,6 @@
Returns the index of the paratrooper info in "DMS_HeliParatrooper_Arr", -1 on error. Returns the index of the paratrooper info in "DMS_HeliParatrooper_Arr", -1 on error.
*/ */
private ["_pilot", "_paratrooperCount", "_unit", "_cargoIndex"];
if !(params if !(params
[ [
["_AIGroup", 0, [grpNull]], ["_AIGroup", 0, [grpNull]],
@ -114,7 +111,7 @@ private _units = (fullCrew [_heli, "", true]) apply
_unit = [_AIGroup,_spawnPos,_class,_difficulty,_side,"Vehicle"] call DMS_fnc_SpawnAISoldier; _unit = [_AIGroup,_spawnPos,_class,_difficulty,_side,"Vehicle"] call DMS_fnc_SpawnAISoldier;
_unit moveInDriver _heli; _unit moveInDriver _heli;
_unit setVariable ["DMS_AssignedVeh",_heli]; _unit setVariable ["DMS_AssignedVeh",_heli];
_pilot = _unit; _unit setDestination [_dropPoint, "VEHICLE PLANNED", true];
}; };
case "commander"; case "commander";
@ -155,7 +152,6 @@ private _units = (fullCrew [_heli, "", true]) apply
// Set the heli pilot's behavior. // Set the heli pilot's behavior.
_pilot setDestination [_dropPoint, "VEHICLE PLANNED", true];
_heli flyInHeight DMS_RHeli_Height; _heli flyInHeight DMS_RHeli_Height;

6
@ExileServer/addons/a3_dms/scripts/fn_SpawnMinefield.sqf
View File

@ -65,10 +65,8 @@ if (DMS_SpawnMinesAroundMissions) then
for "_i" from 1 to _mineCount do for "_i" from 1 to _mineCount do
{ {
private ["_minePos", "_mine"]; private _minePos = _centerPos getPos [random _radius,random 360];
private _mine = createMine ["ATMine", [0,0,0], [], 0];
_minePos = _centerPos getPos [random _radius,random 360];
_mine = createMine ["ATMine", [0,0,0], [], 0];
// Fixes players shooting the mine and causing premature 'splosions // Fixes players shooting the mine and causing premature 'splosions
if (DMS_BulletProofMines) then if (DMS_BulletProofMines) then

2
@ExileServer/addons/a3_dms/scripts/fn_SpawnStaticMission.sqf
View File

@ -48,6 +48,7 @@ try
DMS_MissionCount = DMS_MissionCount - 1; DMS_MissionCount = DMS_MissionCount - 1;
// This will cause mission spawning to run in scheduled, but that should be a fairly minor issue. // This will cause mission spawning to run in scheduled, but that should be a fairly minor issue.
[60, DMS_fnc_SpawnStaticMission, [_missionType], false] call ExileServer_system_thread_addTask; [60, DMS_fnc_SpawnStaticMission, [_missionType], false] call ExileServer_system_thread_addTask;
if (DMS_DEBUG) then if (DMS_DEBUG) then
{ {
(format ["SpawnStaticMission :: Mission ""%1"" requested delay",_missionType]) call DMS_fnc_DebugLog; (format ["SpawnStaticMission :: Mission ""%1"" requested delay",_missionType]) call DMS_fnc_DebugLog;
@ -58,7 +59,6 @@ try
DMS_StaticMissionLastStart = diag_tickTime; DMS_StaticMissionLastStart = diag_tickTime;
DMS_RunningStaticMissions pushBack _missionType; DMS_RunningStaticMissions pushBack _missionType;
if (DMS_DEBUG) then if (DMS_DEBUG) then
{ {
(format ["SpawnStaticMission :: Spawned mission %1 with parameters (%2) | DMS_StaticMissionDelay set to %3 seconds", _missionType, _parameters, DMS_StaticMissionDelay]) call DMS_fnc_DebugLog; (format ["SpawnStaticMission :: Spawned mission %1 with parameters (%2) | DMS_StaticMissionDelay set to %3 seconds", _missionType, _parameters, DMS_StaticMissionDelay]) call DMS_fnc_DebugLog;

5
README.md
View File

@ -122,6 +122,7 @@ ___
- [Valthos from The Altis Project](https://www.thealtisproject.co.uk/) - [Valthos from The Altis Project](https://www.thealtisproject.co.uk/)
- [Flowrider from Optimum Gaming](http://www.optimum-multigaming.com/) - [Flowrider from Optimum Gaming](http://www.optimum-multigaming.com/)
- [CEN from ATD Gaming](http://atdgaming.com/) - [CEN from ATD Gaming](http://atdgaming.com/)
- [second coming from ExileYorkshire](http://exileyorkshire.co.uk/)
___ ___
@ -153,6 +154,10 @@ ___
# Changelog: # Changelog:
### Test Branch: ### Test Branch:
#### May 14, 2016 (2:00 PM CST-America):
* More Micro-optimizations.
* Fixed a lot of various errors from the last test branch update.
#### May 6, 2016 (10:45 PM CST-America): #### May 6, 2016 (10:45 PM CST-America):
* **NEW CONFIG VALUES:** * **NEW CONFIG VALUES:**