From dd4ccb6e61befe56e958d186010055a1954dc97b Mon Sep 17 00:00:00 2001 From: IT07 Date: Fri, 22 Jul 2016 19:34:26 +0200 Subject: [PATCH] Adjusted to new config layout --- a3_vemf_reloaded/fn/fn_findPos.sqf | 2 +- a3_vemf_reloaded/fn/fn_loadInv.sqf | 4 ++-- a3_vemf_reloaded/fn/fn_mines.sqf | 5 ++--- a3_vemf_reloaded/fn/fn_spawnInvasionAI.sqf | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/a3_vemf_reloaded/fn/fn_findPos.sqf b/a3_vemf_reloaded/fn/fn_findPos.sqf index 180871c..6f3b07e 100644 --- a/a3_vemf_reloaded/fn/fn_findPos.sqf +++ b/a3_vemf_reloaded/fn/fn_findPos.sqf @@ -37,7 +37,7 @@ params [ ([["nonPopulated","noMissionPos","missionDistance","missionList"]] call VEMFr_fnc_config) params ["_s0","_s1","_s2","_s3"]; _ms0 = ([["missionSettings",_this6],["skipDistanceReversed"]] call VEMFr_fnc_config) select 0; -if (_this6 in _s3) then { _s0 = ([[_this6],["nonPopulated"]] call VEMFr_fnc_config) select 0 }; +if (_this6 in _s3) then { _s0 = ([["missionSettings",_this6],["nonPopulated"]] call VEMFr_fnc_config) select 0 }; if (_this0 isEqualTo "loc") then { diff --git a/a3_vemf_reloaded/fn/fn_loadInv.sqf b/a3_vemf_reloaded/fn/fn_loadInv.sqf index 8af568d..02f6085 100644 --- a/a3_vemf_reloaded/fn/fn_loadInv.sqf +++ b/a3_vemf_reloaded/fn/fn_loadInv.sqf @@ -59,7 +59,7 @@ if ((_this1 in ("missionList" call VEMFr_fnc_config)) OR (_this1 isEqualTo "Stat _xx addGoggles _g; _g = selectRandom _vests; _xx addVest _g; - _ls = [[_this1],["allowLaunchers","hasLauncherChance"]] call VEMFr_fnc_config; + _ls = [["missionSettings",(_this1)],["allowLaunchers","hasLauncherChance"]] call VEMFr_fnc_config; if ((_ls select 0) isEqualTo 1) then { _lc = _ls select 1; @@ -281,7 +281,7 @@ if ((_this1 in ("missionList" call VEMFr_fnc_config)) OR (_this1 isEqualTo "Stat _xx addHeadGear _g; _g = selectRandom _vests; _xx addVest _g; - _ls = [[_this1],["allowLaunchers","hasLauncherChance"]] call VEMFr_fnc_config; + _ls = [["missionSettings",(_this1)],["allowLaunchers","hasLauncherChance"]] call VEMFr_fnc_config; if ((_ls select 0) isEqualTo 1) then { _lc = _ls select 1; diff --git a/a3_vemf_reloaded/fn/fn_mines.sqf b/a3_vemf_reloaded/fn/fn_mines.sqf index 0a37caa..a4e2d62 100644 --- a/a3_vemf_reloaded/fn/fn_mines.sqf +++ b/a3_vemf_reloaded/fn/fn_mines.sqf @@ -23,8 +23,7 @@ params [ ["_this3", "", [""]] ]; -_s = [[_this3],["mines","minesAmount"]] call VEMFr_fnc_config; -_s params ["_ms","_a"]; +([["missionSettings",(_this3)],["mines","minesAmount"]] call VEMFr_fnc_config) params ["_ms","_a"]; if ((_this3 in ("missionList" call VEMFr_fnc_config)) AND (_ms > 0) AND ((count _this0) isEqualTo 3) AND (_this1 > -1) AND (_this2 > _this1) AND (_a > -1)) then { if (_ms isEqualTo 1) then { _mt = ["ATMine"] }; @@ -36,7 +35,7 @@ if ((_this3 in ("missionList" call VEMFr_fnc_config)) AND (_ms > 0) AND ((count breakOut "mines" }; _r = []; - ["fn_mines", 1, format["Placing %1 mines at %2", _a, _this0]] ExecVM ("log" call VEMFr_fnc_scriptPath); + for "_m" from 1 to _a do { _r pushBack (createMine [selectRandom _mt, ([_this0, _this1, _this2, 2, 0, 20, 0] call BIS_fnc_findSafePos), [], 0]); diff --git a/a3_vemf_reloaded/fn/fn_spawnInvasionAI.sqf b/a3_vemf_reloaded/fn/fn_spawnInvasionAI.sqf index aed13f3..d6d1f98 100644 --- a/a3_vemf_reloaded/fn/fn_spawnInvasionAI.sqf +++ b/a3_vemf_reloaded/fn/fn_spawnInvasionAI.sqf @@ -34,7 +34,7 @@ if (_this4 in ("missionList" call VEMFr_fnc_config)) then ]; _r = [[],[]]; _grps = []; - _s = [["aiSkill", ([["aiSkill"],["difficulty"]] call VEMFr_fnc_config) select 0],["accuracy","aimingShake","aimingSpeed","endurance","spotDistance","spotTime","courage","reloadSpeed","commanding","general"]] call VEMFr_fnc_config; + _s = [["aiSkill",(([["aiSkill"],["difficulty"]] call VEMFr_fnc_config) select 0)],["accuracy","aimingShake","aimingSpeed","endurance","spotDistance","spotTime","courage","reloadSpeed","commanding","general"]] call VEMFr_fnc_config; _s params ["_ccrcy","_mShk","_mSpd","_stmna","_sptDst","_sptTme","_crge","_rldSpd","_cmmndng","_gnrl"]; _bad = ([["blacklists","buildings"],["classes"]] call VEMFr_fnc_config) select 0; _gdHss = []; @@ -55,7 +55,7 @@ if (_this4 in ("missionList" call VEMFr_fnc_config)) then _nHss = true; }; - _cl50s = ([["missionSettings","DynamicLocationInvasion"],["cal50s"]] call VEMFr_fnc_config) select 0; + _cl50s = ([["missionSettings",(_this4)],["cal50s"]] call VEMFr_fnc_config) select 0; _nts = []; // Define units array. the for loops below will fill it with units for "_g" from 1 to _this1 do // Spawn Groups near Position