From 9d23c57bc0886ca7c9a67089b7aece5eef47c804 Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Thu, 14 Dec 2017 19:10:29 +0100 Subject: [PATCH 01/11] FIX: detect and find position outside rock --- .../core/fnc/common/findposoutsiderock.sqf | 34 +++++++++++++++++++ .../core/fnc/compile.sqf | 1 + .../core/fnc/mil/create_group.sqf | 7 ++-- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf new file mode 100644 index 000000000..53d1307b1 --- /dev/null +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf @@ -0,0 +1,34 @@ + +params ["_rpos"]; + +private _rposASL = [_rpos select 0, _rpos select 1, getTerrainHeightASL _rpos]; + +private _objects = lineIntersectsObjs [[_rposASL select 0 , _rposASL select 1 , (_rposASL select 2) + 1], [_rposASL select 0 , _rposASL select 1 , (_rposASL select 2) + 100],objNull,objNull,false,16]; + +if (_objects isEqualTo []) exitWith {_rpos}; + +private _object = _objects select 0; + +if (_object in nearestTerrainObjects [_object, ["Rock"], 1]) then { + + _roads = _rpos nearRoads 100; + if (_roads isEqualTo []) then { + _rpos = [_rpos,5,50,10,false] call btc_fnc_findsafepos; + } else { + _rpos = getPos (_roads select 0); + }; +}; + +if (btc_debug) then { + private _objects = lineIntersectsObjs [[_rposASL select 0 , _rposASL select 1 , (_rposASL select 2) + 1], [_rposASL select 0 , _rposASL select 1 , (_rposASL select 2) + 100],objNull,objNull,false,16]; + private _object = _objects select 0; + if (_object in nearestTerrainObjects [_object, ["Rock"], 1]) then { + systemChat "FIND POS OUTSIDE ROCK: Still inside rock"; + createmarker [format ["btc_inrock_%1", _rpos], _rpos]; + format ["btc_inrock_%1", _rpos] setmarkertype "mil_unknown"; + format ["btc_inrock_%1", _rpos] setMarkerText "In rock"; + format ["btc_inrock_%1", _rpos] setMarkerSize [0.5, 0.5]; + }; +}; + +_rpos diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/compile.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/compile.sqf index 89069ecd0..c8f284c20 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/compile.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/compile.sqf @@ -26,6 +26,7 @@ if (isServer) then { btc_fnc_find_closecity = compile preprocessFile "core\fnc\common\find_closecity.sqf"; btc_fnc_deletegroup = compile preprocessFile "core\fnc\common\deletegroup.sqf"; btc_fnc_delete = compile preprocessFile "core\fnc\common\delete.sqf"; + btc_fnc_findPosOutsideRock = compile preprocessFile "core\fnc\common\findposoutsiderock.sqf"; //CITY btc_fnc_city_activate = compile preprocessFile "core\fnc\city\activate.sqf"; diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/mil/create_group.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/mil/create_group.sqf index 5e8110b0d..c3524ea2d 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/mil/create_group.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/mil/create_group.sqf @@ -16,18 +16,19 @@ switch (typeName _city) do { _rpos = [_pos, _area, btc_p_sea] call btc_fnc_randomize_pos; -_pos_iswater = (surfaceIsWater _rpos); +_pos_iswater = surfaceIsWater _rpos; if (_pos_iswater) then { _unit_type = selectRandom btc_type_divers; } else { _unit_type = selectRandom btc_type_units; - _newpos = _rpos findEmptyPosition [0, 40]; + _newpos = _rpos findEmptyPosition [0, 40, _unit_type]; if !(_newpos isEqualTo []) then {_rpos = _newpos;}; + _rpos = [_rpos] call btc_fnc_findPosOutsideRock; }; _group = createGroup btc_enemy_side; [_group createUnit [_unit_type, _rpos, [], 0, "NONE"]] joinSilent _group; -(leader _group) setpos _rpos; +(leader _group) setPos _rpos; _in_house = false; switch (true) do { From 4ab14df6f2dc5bb1286e255e0135e0bf128346ba Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Fri, 15 Dec 2017 11:41:03 +0100 Subject: [PATCH 02/11] FIX: debug for findposoutsiderock --- .../core/fnc/common/findposoutsiderock.sqf | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf index 53d1307b1..2af407c39 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf @@ -2,15 +2,12 @@ params ["_rpos"]; private _rposASL = [_rpos select 0, _rpos select 1, getTerrainHeightASL _rpos]; - -private _objects = lineIntersectsObjs [[_rposASL select 0 , _rposASL select 1 , (_rposASL select 2) + 1], [_rposASL select 0 , _rposASL select 1 , (_rposASL select 2) + 100],objNull,objNull,false,16]; +private _objects = lineIntersectsObjs [[_rposASL select 0, _rposASL select 1, (_rposASL select 2) + 1], [_rposASL select 0, _rposASL select 1, (_rposASL select 2) + 100], objNull, objNull, false, 16]; if (_objects isEqualTo []) exitWith {_rpos}; private _object = _objects select 0; - if (_object in nearestTerrainObjects [_object, ["Rock"], 1]) then { - _roads = _rpos nearRoads 100; if (_roads isEqualTo []) then { _rpos = [_rpos,5,50,10,false] call btc_fnc_findsafepos; @@ -19,15 +16,21 @@ if (_object in nearestTerrainObjects [_object, ["Rock"], 1]) then { }; }; -if (btc_debug) then { - private _objects = lineIntersectsObjs [[_rposASL select 0 , _rposASL select 1 , (_rposASL select 2) + 1], [_rposASL select 0 , _rposASL select 1 , (_rposASL select 2) + 100],objNull,objNull,false,16]; - private _object = _objects select 0; - if (_object in nearestTerrainObjects [_object, ["Rock"], 1]) then { - systemChat "FIND POS OUTSIDE ROCK: Still inside rock"; - createmarker [format ["btc_inrock_%1", _rpos], _rpos]; - format ["btc_inrock_%1", _rpos] setmarkertype "mil_unknown"; - format ["btc_inrock_%1", _rpos] setMarkerText "In rock"; - format ["btc_inrock_%1", _rpos] setMarkerSize [0.5, 0.5]; +if (btc_debug_log) then { + _rposASL = [_rpos select 0, _rpos select 1, getTerrainHeightASL _rpos]; + _objects = lineIntersectsObjs [[_rposASL select 0, _rposASL select 1, (_rposASL select 2) + 1], [_rposASL select 0, _rposASL select 1, (_rposASL select 2) + 100], objNull, objNull, false, 16]; + if !(_objects isEqualTo []) then { + _object = _objects select 0; + if (_object in nearestTerrainObjects [_object, ["Rock"], 1]) then { + diag_log format ["FIND POS OUTSIDE ROCK: POS %1 Still inside rock", _rposASL]; + if (btc_debug) then { + systemChat "FIND POS OUTSIDE ROCK: Still inside rock"; + private _marker = createmarker [format ["btc_inrock_%1", _rpos], _rpos]; + _marker setmarkertype "mil_unknown"; + _marker setMarkerText "In rock"; + _marker setMarkerSize [0.5, 0.5]; + }; + }; }; }; From 0878358a0873c2db7027ad70052ec286077f40f5 Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Fri, 15 Dec 2017 20:05:39 +0100 Subject: [PATCH 03/11] Find rock more accurately --- .../core/fnc/common/findposoutsiderock.sqf | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf index 2af407c39..92edbbe2d 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf @@ -1,13 +1,12 @@ params ["_rpos"]; -private _rposASL = [_rpos select 0, _rpos select 1, getTerrainHeightASL _rpos]; -private _objects = lineIntersectsObjs [[_rposASL select 0, _rposASL select 1, (_rposASL select 2) + 1], [_rposASL select 0, _rposASL select 1, (_rposASL select 2) + 100], objNull, objNull, false, 16]; +private _objects = lineIntersectsObjs [[_rpos select 0, _rpos select 1, (getTerrainHeightASL _rpos) + 1], [_rpos select 0, _rpos select 1, (getTerrainHeightASL _rpos) + 100], objNull, objNull, false, 16]; if (_objects isEqualTo []) exitWith {_rpos}; private _object = _objects select 0; -if (_object in nearestTerrainObjects [_object, ["Rock"], 1]) then { +if (_object in nearestTerrainObjects [_object, ["HIDE", "ROCK", "ROCKS"], 1]) then { _roads = _rpos nearRoads 100; if (_roads isEqualTo []) then { _rpos = [_rpos,5,50,10,false] call btc_fnc_findsafepos; @@ -17,11 +16,10 @@ if (_object in nearestTerrainObjects [_object, ["Rock"], 1]) then { }; if (btc_debug_log) then { - _rposASL = [_rpos select 0, _rpos select 1, getTerrainHeightASL _rpos]; - _objects = lineIntersectsObjs [[_rposASL select 0, _rposASL select 1, (_rposASL select 2) + 1], [_rposASL select 0, _rposASL select 1, (_rposASL select 2) + 100], objNull, objNull, false, 16]; + _objects = lineIntersectsObjs [[_rpos select 0, _rpos select 1, (getTerrainHeightASL _rpos) + 1], [_rpos select 0, _rpos select 1, (getTerrainHeightASL _rpos) + 100], objNull, objNull, false, 16]; if !(_objects isEqualTo []) then { _object = _objects select 0; - if (_object in nearestTerrainObjects [_object, ["Rock"], 1]) then { + if (_object in nearestTerrainObjects [_object, ["HIDE", "ROCK", "ROCKS"], 1]) then { diag_log format ["FIND POS OUTSIDE ROCK: POS %1 Still inside rock", _rposASL]; if (btc_debug) then { systemChat "FIND POS OUTSIDE ROCK: Still inside rock"; From 1d0d4990a83d71d6f253f7b121d7a81943fd8007 Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Sun, 17 Dec 2017 10:58:26 +0100 Subject: [PATCH 04/11] FIX: _rposASL --- .../core/fnc/common/findposoutsiderock.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf index 92edbbe2d..4db662186 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/findposoutsiderock.sqf @@ -20,7 +20,7 @@ if (btc_debug_log) then { if !(_objects isEqualTo []) then { _object = _objects select 0; if (_object in nearestTerrainObjects [_object, ["HIDE", "ROCK", "ROCKS"], 1]) then { - diag_log format ["FIND POS OUTSIDE ROCK: POS %1 Still inside rock", _rposASL]; + diag_log format ["FIND POS OUTSIDE ROCK: POS %1 Still inside rock", _rpos]; if (btc_debug) then { systemChat "FIND POS OUTSIDE ROCK: Still inside rock"; private _marker = createmarker [format ["btc_inrock_%1", _rpos], _rpos]; From 4075f1773aa875207ae43b705646501b720343a6 Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Tue, 19 Dec 2017 12:56:38 +0100 Subject: [PATCH 05/11] Remove objNull in btc_vehicles --- =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/save.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/save.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/save.sqf index dca3fa8b7..d8fb28300 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/save.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/save.sqf @@ -124,7 +124,7 @@ _array_veh = []; _data pushBack _cont; _array_veh pushBack _data; //diag_log format ["VEH %1 DATA %2",_x,_data]; -} foreach btc_vehicles; +} foreach (btc_vehicles - [objNull]); profileNamespace setVariable [format ["btc_hm_%1_vehs",_name],_array_veh]; //Objects status From 5c384ffb9b43401a8638888c7ed8806ad18eb204 Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Wed, 20 Dec 2017 19:15:03 +0100 Subject: [PATCH 06/11] Add a waypoint to diver to the closer location --- .../core/fnc/common/task_patrol.sqf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/task_patrol.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/task_patrol.sqf index b4ba1e4cb..656a469d8 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/task_patrol.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/task_patrol.sqf @@ -40,6 +40,15 @@ for "_i" from 0 to (2 + (floor (random 3))) do }; }; +if (_allowwater) then { + private _nearestLocation = nearestLocation [_pos, ""]; + private _wp = _group addWaypoint [locationPosition _nearestLocation, 0]; + _wp setWaypointType "MOVE"; + _wp setWaypointCompletionRadius 20; + _wp setWaypointCombatMode "RED"; + _wp setWaypointTimeout [20, 30, 60]; +}; + private _wp = _group addWaypoint [_pos, 0]; _wp setWaypointType "CYCLE"; _wp setWaypointCompletionRadius 20; \ No newline at end of file From ea6d0e48aef822ba39c0fa381c026c71f188f5bb Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Wed, 20 Dec 2017 19:39:00 +0100 Subject: [PATCH 07/11] FIX: remove ACE module Since ACE 3.12, ACE module are deprecated (https://slack-files.com/T047TJFFL-F8CF8TVJR-e953dbf392) --- .../core/def/mission.sqf | 1 + =BTC=co@30_Hearts_and_Minds.Altis/mission.sqm | 972 ++++------------ .../mission_Tanoa.sqm | 1028 ++++------------- 3 files changed, 462 insertions(+), 1539 deletions(-) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf index 66faefea0..30ebbacc0 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf @@ -67,6 +67,7 @@ btc_p_debug = "btc_p_debug" call BIS_fnc_getParamValue; if (ace_medical_maxReviveTime > 0) then {ace_medical_enableRevive = 1;ace_medical_preventInstaDeath = true}; ace_medical_enableFor = 1; ace_cargo_enable = false; +ace_respawn_savePreDeathGear = true; //btc_acre_mod = isClass(configFile >> "cfgPatches" >> "acre_main"); //btc_tfr_mod = isClass(configFile >> "cfgPatches" >> "task_force_radio"); diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm b/=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm index 16055fb4e..bd601203e 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm +++ b/=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm @@ -16,7 +16,7 @@ class EditorData }; class Camera { - pos[]={8332.7754,117.25275,10068.063}; + pos[]={8330.0225,187.05653,10023.455}; dir[]={0.053734943,-0.82017767,0.5696947}; up[]={0.077020578,0.57209378,0.81656778}; aside[]={0.99564278,3.8654252e-007,-0.093911856}; @@ -41,9 +41,6 @@ addons[]= "A3_Characters_F", "ace_explosives", "A3_Modules_F_Curator_Curator", - "ace_respawn", - "ace_advanced_ballistics", - "ace_winddeflection", "rhsusf_c_fmtv", "rhsusf_c_RG33L" }; @@ -51,7 +48,7 @@ class AddonsMetaData { class List { - items=19; + items=16; class Item0 { className="A3_Ui_F"; @@ -147,33 +144,12 @@ class AddonsMetaData url="https://www.arma3.com"; }; class Item14 - { - className="ace_respawn"; - name="ACE3 - Respawn"; - author="ACE-Team"; - url="http://ace3mod.com/"; - }; - class Item15 - { - className="ace_advanced_ballistics"; - name="ACE3 - Advanced Ballistics"; - author="ACE-Team"; - url="http://ace3mod.com/"; - }; - class Item16 - { - className="ace_winddeflection"; - name="ACE3 - Wind Deflection"; - author="ACE-Team"; - url="http://ace3mod.com/"; - }; - class Item17 { className="rhsusf_c_fmtv"; name="FMTV Trucks"; url="http://www.rhsmods.org/"; }; - class Item18 + class Item15 { className="rhsusf_c_RG33L"; name="RG33L MRAP"; @@ -202,7 +178,7 @@ class CustomAttributes name="Multiplayer"; class Attribute0 { - property="RespawnButton"; + property="RespawnTemplates"; expression="true"; class Value { @@ -212,16 +188,15 @@ class CustomAttributes { type[]= { - "SCALAR" + "ARRAY" }; }; - value=1; }; }; }; class Attribute1 { - property="RespawnTemplates"; + property="RespawnButton"; expression="true"; class Value { @@ -231,9 +206,10 @@ class CustomAttributes { type[]= { - "ARRAY" + "SCALAR" }; }; + value=1; }; }; }; @@ -243,6 +219,149 @@ class CustomAttributes { name="Scenario"; class Attribute0 + { + property="cba_settings_hash"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=4; + class Item0 + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="#CBA_HASH#"; + }; + }; + class Item1 + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=1; + class Item0 + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="ace_respawn_savepredeathgear"; + }; + }; + }; + }; + }; + class Item2 + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=1; + class Item0 + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=2; + class Item0 + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + class Item1 + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + }; + }; + }; + }; + }; + class Item3 + { + class data + { + nil=1; + class type + { + type[]= + { + "ANY" + }; + }; + }; + }; + }; + }; + }; + }; + class Attribute1 { property="EnableDebugConsole"; expression="true"; @@ -261,7 +380,7 @@ class CustomAttributes }; }; }; - nAttributes=1; + nAttributes=2; }; }; class Mission @@ -293,7 +412,7 @@ class Mission }; class Entities { - items=57; + items=52; class Item0 { dataType="Marker"; @@ -707,7 +826,7 @@ class Mission class PositionInfo { position[]={8323.1582,73.944031,10113.102}; - angles[]={0.074527748,0.89397335,0.018663859}; + angles[]={0.074525557,0.89397508,0.018657569}; }; side="Empty"; flags=4; @@ -718,6 +837,29 @@ class Mission }; id=14; type="Land_HelipadSquare_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isRepairFacility"; + expression="_this setVariable ['ace_isRepairFacility',_value, true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1; + }; + }; + }; + nAttributes=1; + }; }; class Item11 { @@ -1103,670 +1245,87 @@ class Mission }; class Item24 { - dataType="Logic"; - class PositionInfo - { - position[]={8290.0527,56.416218,9962.876}; - }; - id=72; - type="ACE_ModuleRespawn"; - class CustomAttributes + dataType="Group"; + side="West"; + class Entities { - class Attribute0 + items=1; + class Item0 { - property="ACE_ModuleRespawn_RemoveDeadBodiesDisconnected"; - expression="_this setVariable ['RemoveDeadBodiesDisconnected',_value,true];"; - class Value + dataType="Object"; + class PositionInfo { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; + position[]={8304.6758,75.941444,10055.586}; + angles[]={0,1.0172668,0}; }; - }; - class Attribute1 - { - property="ACE_ModuleRespawn_SavePreDeathGear"; - expression="_this setVariable ['SavePreDeathGear',_value,true];"; - class Value + side="West"; + flags=7; + class Attributes { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; + isPlayable=1; }; + id=90; + type="B_medic_F"; }; - nAttributes=2; }; + class Attributes + { + }; + id=89; }; class Item25 { - dataType="Logic"; - class PositionInfo - { - position[]={8320.5127,72.481377,10123.821}; - }; - id=74; - type="ACE_moduleAssignRepairFacility"; - class CustomAttributes + dataType="Group"; + side="West"; + class Entities { - class Attribute0 + items=1; + class Item0 { - property="ACE_moduleAssignRepairFacility_role"; - expression="_this setVariable ['role',_value,true];"; - class Value + dataType="Object"; + class PositionInfo { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=1; - }; + position[]={8303.626,75.941444,10057.26}; + angles[]={0,1.0172668,0}; }; - }; - class Attribute1 - { - property="ACE_moduleAssignRepairFacility_EnableList"; - expression="_this setVariable ['EnableList',_value,true];"; - class Value + side="West"; + flags=7; + class Attributes { - class data - { - class type - { - type[]= - { - "STRING" - }; - }; - value=""; - }; + isPlayable=1; }; + id=92; + type="B_medic_F"; }; - nAttributes=2; }; + class Attributes + { + }; + id=91; }; class Item26 { - dataType="Logic"; - class PositionInfo - { - position[]={8276.9385,56.550854,9954.5273}; - }; - id=75; - type="ACE_moduleRepairSettings"; - class CustomAttributes + dataType="Group"; + side="West"; + class Entities { - class Attribute0 + items=1; + class Item0 { - property="ACE_moduleRepairSettings_fullRepairLocation"; - expression="_this setVariable ['fullRepairLocation',_value,true];"; - class Value + dataType="Object"; + class PositionInfo { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=2; - }; + position[]={8310.3896,75.941444,10060.23}; + angles[]={0,5.701921,0}; }; - }; - class Attribute1 - { - property="ACE_moduleRepairSettings_engineerSetting_fullRepair"; - expression="_this setVariable ['engineerSetting_fullRepair',_value,true];"; - class Value + side="West"; + flags=7; + class Attributes { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0; - }; + isPlayable=1; }; - }; - class Attribute2 - { - property="ACE_moduleRepairSettings_engineerSetting_Repair"; - expression="_this setVariable ['engineerSetting_Repair',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=1; - }; - }; - }; - class Attribute3 - { - property="ACE_moduleRepairSettings_consumeItem_ToolKit"; - expression="_this setVariable ['consumeItem_ToolKit',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0; - }; - }; - }; - class Attribute4 - { - property="ACE_moduleRepairSettings_repairDamageThreshold"; - expression="_this setVariable ['repairDamageThreshold',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0.60000002; - }; - }; - }; - class Attribute5 - { - property="ACE_moduleRepairSettings_wheelRepairRequiredItems"; - expression="_this setVariable ['wheelRepairRequiredItems',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0; - }; - }; - }; - class Attribute6 - { - property="ACE_moduleRepairSettings_repairDamageThreshold_Engineer"; - expression="_this setVariable ['repairDamageThreshold_Engineer',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0.40000001; - }; - }; - }; - class Attribute7 - { - property="ACE_moduleRepairSettings_engineerSetting_Wheel"; - expression="_this setVariable ['engineerSetting_Wheel',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0; - }; - }; - }; - class Attribute8 - { - property="ACE_moduleRepairSettings_addSpareParts"; - expression="_this setVariable ['addSpareParts',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - nAttributes=9; - }; - }; - class Item27 - { - dataType="Logic"; - class PositionInfo - { - position[]={8282.9766,57.551399,9962.9941}; - }; - id=80; - type="ace_advanced_ballistics_ModuleSettings"; - class CustomAttributes - { - class Attribute0 - { - property="ace_advanced_ballistics_ModuleSettings_simulationRadius"; - expression="_this setVariable ['simulationRadius',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=3000; - }; - }; - }; - class Attribute1 - { - property="ace_advanced_ballistics_ModuleSettings_barrelLengthInfluenceEnabled"; - expression="_this setVariable ['barrelLengthInfluenceEnabled',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - class Attribute2 - { - property="ace_advanced_ballistics_ModuleSettings_bulletTraceEnabled"; - expression="_this setVariable ['bulletTraceEnabled',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - class Attribute3 - { - property="ace_advanced_ballistics_ModuleSettings_simulationInterval"; - expression="_this setVariable ['simulationInterval',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0; - }; - }; - }; - class Attribute4 - { - property="ace_advanced_ballistics_ModuleSettings_disabledInFullAutoMode"; - expression="_this setVariable ['disabledInFullAutoMode',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=0; - }; - }; - }; - class Attribute5 - { - property="ace_advanced_ballistics_ModuleSettings_simulateForEveryone"; - expression="_this setVariable ['simulateForEveryone',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=0; - }; - }; - }; - class Attribute6 - { - property="ace_advanced_ballistics_ModuleSettings_simulateForSnipers"; - expression="_this setVariable ['simulateForSnipers',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - class Attribute7 - { - property="ace_advanced_ballistics_ModuleSettings_simulateForGroupMembers"; - expression="_this setVariable ['simulateForGroupMembers',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=0; - }; - }; - }; - class Attribute8 - { - property="ace_advanced_ballistics_ModuleSettings_ammoTemperatureEnabled"; - expression="_this setVariable ['ammoTemperatureEnabled',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - class Attribute9 - { - property="ace_advanced_ballistics_ModuleSettings_enabled"; - expression="_this setVariable ['enabled',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=0; - }; - }; - }; - nAttributes=10; - }; - }; - class Item28 - { - dataType="Logic"; - class PositionInfo - { - position[]={8277.0547,58.537991,9962.7119}; - }; - id=81; - type="ace_winddeflection_ModuleSettings"; - class CustomAttributes - { - class Attribute0 - { - property="ace_winddeflection_ModuleSettings_simulationInterval"; - expression="_this setVariable ['simulationInterval',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0.050000001; - }; - }; - }; - class Attribute1 - { - property="ace_winddeflection_ModuleSettings_enabled"; - expression="_this setVariable ['enabled',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - class Attribute2 - { - property="ace_winddeflection_ModuleSettings_simulationRadius"; - expression="_this setVariable ['simulationRadius',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=3000; - }; - }; - }; - class Attribute3 - { - property="ace_winddeflection_ModuleSettings_vehicleEnabled"; - expression="_this setVariable ['vehicleEnabled',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - nAttributes=4; - }; - }; - class Item29 - { - dataType="Group"; - side="West"; - class Entities - { - items=1; - class Item0 - { - dataType="Object"; - class PositionInfo - { - position[]={8304.6758,75.941444,10055.586}; - angles[]={0,1.0172668,0}; - }; - side="West"; - flags=7; - class Attributes - { - isPlayable=1; - }; - id=90; - type="B_medic_F"; - }; - }; - class Attributes - { - }; - id=89; - }; - class Item30 - { - dataType="Group"; - side="West"; - class Entities - { - items=1; - class Item0 - { - dataType="Object"; - class PositionInfo - { - position[]={8303.626,75.941444,10057.26}; - angles[]={0,1.0172668,0}; - }; - side="West"; - flags=7; - class Attributes - { - isPlayable=1; - }; - id=92; - type="B_medic_F"; - }; - }; - class Attributes - { - }; - id=91; - }; - class Item31 - { - dataType="Group"; - side="West"; - class Entities - { - items=1; - class Item0 - { - dataType="Object"; - class PositionInfo - { - position[]={8310.3896,75.941444,10060.23}; - angles[]={0,5.701921,0}; - }; - side="West"; - flags=7; - class Attributes - { - isPlayable=1; - }; - id=94; - type="B_Soldier_F"; + id=94; + type="B_Soldier_F"; }; }; class Attributes @@ -1774,7 +1333,7 @@ class Mission }; id=93; }; - class Item32 + class Item27 { dataType="Group"; side="West"; @@ -1804,7 +1363,7 @@ class Mission }; id=95; }; - class Item33 + class Item28 { dataType="Group"; side="West"; @@ -1834,7 +1393,7 @@ class Mission }; id=97; }; - class Item34 + class Item29 { dataType="Group"; side="West"; @@ -1864,7 +1423,7 @@ class Mission }; id=99; }; - class Item35 + class Item30 { dataType="Group"; side="West"; @@ -1894,7 +1453,7 @@ class Mission }; id=101; }; - class Item36 + class Item31 { dataType="Group"; side="West"; @@ -1924,7 +1483,7 @@ class Mission }; id=103; }; - class Item37 + class Item32 { dataType="Group"; side="West"; @@ -1956,7 +1515,7 @@ class Mission id=105; atlOffset=0.028755188; }; - class Item38 + class Item33 { dataType="Group"; side="West"; @@ -1988,7 +1547,7 @@ class Mission id=107; atlOffset=0.072166443; }; - class Item39 + class Item34 { dataType="Group"; side="West"; @@ -2018,7 +1577,7 @@ class Mission }; id=109; }; - class Item40 + class Item35 { dataType="Group"; side="West"; @@ -2048,7 +1607,7 @@ class Mission }; id=111; }; - class Item41 + class Item36 { dataType="Group"; side="West"; @@ -2078,7 +1637,7 @@ class Mission }; id=113; }; - class Item42 + class Item37 { dataType="Group"; side="West"; @@ -2108,7 +1667,7 @@ class Mission }; id=115; }; - class Item43 + class Item38 { dataType="Group"; side="West"; @@ -2138,7 +1697,7 @@ class Mission }; id=117; }; - class Item44 + class Item39 { dataType="Group"; side="West"; @@ -2168,7 +1727,7 @@ class Mission }; id=119; }; - class Item45 + class Item40 { dataType="Group"; side="West"; @@ -2198,7 +1757,7 @@ class Mission }; id=121; }; - class Item46 + class Item41 { dataType="Group"; side="West"; @@ -2228,7 +1787,7 @@ class Mission }; id=123; }; - class Item47 + class Item42 { dataType="Group"; side="West"; @@ -2260,7 +1819,7 @@ class Mission id=125; atlOffset=0.0039749146; }; - class Item48 + class Item43 { dataType="Group"; side="West"; @@ -2292,7 +1851,7 @@ class Mission id=127; atlOffset=0.0039749146; }; - class Item49 + class Item44 { dataType="Group"; side="West"; @@ -2322,7 +1881,7 @@ class Mission }; id=129; }; - class Item50 + class Item45 { dataType="Group"; side="West"; @@ -2352,7 +1911,7 @@ class Mission }; id=131; }; - class Item51 + class Item46 { dataType="Object"; class PositionInfo @@ -2394,7 +1953,7 @@ class Mission nAttributes=1; }; }; - class Item52 + class Item47 { dataType="Object"; class PositionInfo @@ -2436,7 +1995,7 @@ class Mission nAttributes=1; }; }; - class Item53 + class Item48 { dataType="Object"; class PositionInfo @@ -2478,7 +2037,7 @@ class Mission nAttributes=1; }; }; - class Item54 + class Item49 { dataType="Logic"; class PositionInfo @@ -2490,7 +2049,7 @@ class Mission id=153; type="HeadlessClient_F"; }; - class Item55 + class Item50 { dataType="Object"; class PositionInfo @@ -2533,7 +2092,7 @@ class Mission nAttributes=1; }; }; - class Item56 + class Item51 { dataType="Object"; class PositionInfo @@ -2576,25 +2135,4 @@ class Mission }; }; }; - class Connections - { - class LinkIDProvider - { - nextID=1; - }; - class Links - { - items=1; - class Item0 - { - linkID=0; - item0=74; - item1=14; - class CustomData - { - type="Sync"; - }; - }; - }; - }; }; diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/mission_Tanoa.sqm b/=BTC=co@30_Hearts_and_Minds.Altis/mission_Tanoa.sqm index 71dc98e1f..060f7ad88 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/mission_Tanoa.sqm +++ b/=BTC=co@30_Hearts_and_Minds.Altis/mission_Tanoa.sqm @@ -39,9 +39,6 @@ addons[]= "A3_Characters_F", "ace_explosives", "A3_Modules_F_Curator_Curator", - "ace_respawn", - "ace_advanced_ballistics", - "ace_winddeflection", "RHS_US_A2Port_Armor", "rhsusf_vehicles", "rhsusf_c_fmtv", @@ -51,7 +48,7 @@ class AddonsMetaData { class List { - items=19; + items=16; class Item0 { className="A3_Ui_F"; @@ -136,44 +133,23 @@ class AddonsMetaData url="https://www.arma3.com"; }; class Item12 - { - className="ace_respawn"; - name="ACE3 - Respawn"; - author="ACE-Team"; - url="http://ace3mod.com/"; - }; - class Item13 - { - className="ace_advanced_ballistics"; - name="ACE3 - Advanced Ballistics"; - author="ACE-Team"; - url="http://ace3mod.com/"; - }; - class Item14 - { - className="ace_winddeflection"; - name="ACE3 - Wind Deflection"; - author="ACE-Team"; - url="http://ace3mod.com/"; - }; - class Item15 { className="RHS_US_A2Port_Armor"; name="M2 Bradley IFV"; url="http://www.rhsmods.org/"; }; - class Item16 + class Item13 { className="rhsusf_vehicles"; name="rhsusf_vehicles"; }; - class Item17 + class Item14 { className="rhsusf_c_fmtv"; name="FMTV Trucks"; url="http://www.rhsmods.org/"; }; - class Item18 + class Item15 { className="rhsusf_c_RG33L"; name="RG33L MRAP"; @@ -202,7 +178,7 @@ class CustomAttributes name="Multiplayer"; class Attribute0 { - property="RespawnTemplates"; + property="RespawnButton"; expression="true"; class Value { @@ -212,15 +188,16 @@ class CustomAttributes { type[]= { - "ARRAY" + "SCALAR" }; }; + value=1; }; }; }; class Attribute1 { - property="RespawnButton"; + property="RespawnTemplates"; expression="true"; class Value { @@ -230,10 +207,9 @@ class CustomAttributes { type[]= { - "SCALAR" + "ARRAY" }; }; - value=1; }; }; }; @@ -293,7 +269,7 @@ class Mission }; class Entities { - items=57; + items=52; class Item0 { dataType="Marker"; @@ -416,7 +392,7 @@ class Mission class PositionInfo { position[]={4253.375,19.517353,3990.375}; - angles[]={6.2671871,0.52168256,0.058600098}; + angles[]={6.2671809,0.52167892,0.058608156}; }; side="Empty"; flags=4; @@ -430,6 +406,25 @@ class Mission class CustomAttributes { class Attribute0 + { + property="ace_isRepairFacility"; + expression="_this setVariable ['ace_isRepairFacility',_value, true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1; + }; + }; + }; + class Attribute1 { property="ace_isMedicalFacility"; expression="_this setVariable [""ace_medical_isMedicalFacility"",_value,true];"; @@ -448,7 +443,7 @@ class Mission }; }; }; - nAttributes=1; + nAttributes=2; }; }; class Item6 @@ -980,770 +975,161 @@ class Mission expression="_this setpitch _value;"; class Value { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=1.04; - }; - }; - }; - class Attribute2 - { - property="ace_isSurrendered"; - expression="if (_value) then {[objNull,[_this],true] call ace_captives_fnc_moduleSurrender}"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=0; - }; - }; - }; - nAttributes=3; - }; - }; - }; - class Attributes - { - }; - id=28; - atlOffset=-1.9073486e-006; - }; - class Item17 - { - dataType="Group"; - side="West"; - class Entities - { - items=1; - class Item0 - { - dataType="Object"; - class PositionInfo - { - position[]={4213.9482,19.380545,4021.1812}; - angles[]={6.2698536,4.1308832,6.2698536}; - }; - side="West"; - flags=6; - class Attributes - { - skill=0.60000002; - description="Engineer"; - isPlayable=1; - }; - id=31; - type="B_engineer_F"; - atlOffset=3.8146973e-006; - class CustomAttributes - { - class Attribute0 - { - property="ace_isHandcuffed"; - expression="if (_value) then {[objNull,[_this],true] call ace_captives_fnc_moduleHandcuffed}"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=0; - }; - }; - }; - class Attribute1 - { - property="pitch"; - expression="_this setpitch _value;"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0.99000001; - }; - }; - }; - class Attribute2 - { - property="ace_isSurrendered"; - expression="if (_value) then {[objNull,[_this],true] call ace_captives_fnc_moduleSurrender}"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=0; - }; - }; - }; - nAttributes=3; - }; - }; - }; - class Attributes - { - }; - id=30; - atlOffset=3.8146973e-006; - }; - class Item18 - { - dataType="Logic"; - class PositionInfo - { - position[]={3985.1992,-5.0633116,3906.0693}; - angles[]={6.272521,0,0.093063653}; - }; - name="btc_curator"; - init="this addEventHandler ['CuratorObjectPlaced',{_this call btc_fnc_eh_CuratorObjectPlaced}];"; - id=71; - type="ModuleCurator_F"; - class CustomAttributes - { - class Attribute0 - { - property="ModuleCurator_F_Owner"; - expression="_this setVariable ['Owner',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "STRING" - }; - }; - value="#adminLogged"; - }; - }; - }; - class Attribute1 - { - property="ModuleCurator_F_Forced"; - expression="_this setVariable ['Forced',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0; - }; - }; - }; - class Attribute2 - { - property="ModuleCurator_F_Name"; - expression="_this setVariable ['Name',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "STRING" - }; - }; - value=""; - }; - }; - }; - class Attribute3 - { - property="ModuleInfo"; - expression="false"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - class Attribute4 - { - property="ModuleCurator_F_Addons"; - expression="_this setVariable ['Addons',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=3; - }; - }; - }; - nAttributes=5; - }; - }; - class Item19 - { - dataType="Logic"; - class PositionInfo - { - position[]={4019.623,-3.7731285,3926.0391}; - angles[]={0.021331646,0,6.2645183}; - }; - id=72; - type="ACE_ModuleRespawn"; - atlOffset=0.41534662; - class CustomAttributes - { - class Attribute0 - { - property="ACE_ModuleRespawn_RemoveDeadBodiesDisconnected"; - expression="_this setVariable ['RemoveDeadBodiesDisconnected',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - class Attribute1 - { - property="ACE_ModuleRespawn_SavePreDeathGear"; - expression="_this setVariable ['SavePreDeathGear',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - nAttributes=2; - }; - }; - class Item20 - { - dataType="Logic"; - class PositionInfo - { - position[]={4261.6733,23.156195,3986.2942}; - angles[]={0,5.9109015,0}; - }; - id=74; - type="ACE_moduleAssignRepairFacility"; - atlOffset=3.0099945; - class CustomAttributes - { - class Attribute0 - { - property="ACE_moduleAssignRepairFacility_role"; - expression="_this setVariable ['role',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=1; - }; - }; - }; - class Attribute1 - { - property="ACE_moduleAssignRepairFacility_EnableList"; - expression="_this setVariable ['EnableList',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "STRING" - }; - }; - value=""; - }; - }; - }; - nAttributes=2; - }; - }; - class Item21 - { - dataType="Logic"; - class PositionInfo - { - position[]={4006.5088,-4.0501103,3917.6904}; - angles[]={0.018663859,0,0.013332055}; - }; - id=75; - type="ACE_moduleRepairSettings"; - class CustomAttributes - { - class Attribute0 - { - property="ACE_moduleRepairSettings_fullRepairLocation"; - expression="_this setVariable ['fullRepairLocation',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=2; - }; - }; - }; - class Attribute1 - { - property="ACE_moduleRepairSettings_engineerSetting_fullRepair"; - expression="_this setVariable ['engineerSetting_fullRepair',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0; - }; - }; - }; - class Attribute2 - { - property="ACE_moduleRepairSettings_engineerSetting_Repair"; - expression="_this setVariable ['engineerSetting_Repair',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=1; - }; - }; - }; - class Attribute3 - { - property="ACE_moduleRepairSettings_consumeItem_ToolKit"; - expression="_this setVariable ['consumeItem_ToolKit',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0; - }; - }; - }; - class Attribute4 - { - property="ACE_moduleRepairSettings_repairDamageThreshold"; - expression="_this setVariable ['repairDamageThreshold',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0.60000002; - }; - }; - }; - class Attribute5 - { - property="ACE_moduleRepairSettings_wheelRepairRequiredItems"; - expression="_this setVariable ['wheelRepairRequiredItems',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0; - }; - }; - }; - class Attribute6 - { - property="ACE_moduleRepairSettings_repairDamageThreshold_Engineer"; - expression="_this setVariable ['repairDamageThreshold_Engineer',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0.40000001; - }; - }; - }; - class Attribute7 - { - property="ACE_moduleRepairSettings_engineerSetting_Wheel"; - expression="_this setVariable ['engineerSetting_Wheel',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0; - }; - }; - }; - class Attribute8 - { - property="ACE_moduleRepairSettings_addSpareParts"; - expression="_this setVariable ['addSpareParts',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - nAttributes=9; - }; - }; - class Item22 - { - dataType="Logic"; - class PositionInfo - { - position[]={4012.5469,-2.5048904,3926.1572}; - }; - id=80; - type="ace_advanced_ballistics_ModuleSettings"; - atlOffset=1.6238766; - class CustomAttributes - { - class Attribute0 - { - property="ace_advanced_ballistics_ModuleSettings_simulationRadius"; - expression="_this setVariable ['simulationRadius',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=3000; - }; - }; - }; - class Attribute1 - { - property="ace_advanced_ballistics_ModuleSettings_barrelLengthInfluenceEnabled"; - expression="_this setVariable ['barrelLengthInfluenceEnabled',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - class Attribute2 - { - property="ace_advanced_ballistics_ModuleSettings_bulletTraceEnabled"; - expression="_this setVariable ['bulletTraceEnabled',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=1; - }; - }; - }; - class Attribute3 - { - property="ace_advanced_ballistics_ModuleSettings_simulationInterval"; - expression="_this setVariable ['simulationInterval',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "SCALAR" - }; - }; - value=0; - }; - }; - }; - class Attribute4 - { - property="ace_advanced_ballistics_ModuleSettings_disabledInFullAutoMode"; - expression="_this setVariable ['disabledInFullAutoMode',_value,true];"; - class Value - { - class data - { - class type - { - type[]= - { - "BOOL" - }; - }; - value=0; - }; - }; - }; - class Attribute5 - { - property="ace_advanced_ballistics_ModuleSettings_simulateForEveryone"; - expression="_this setVariable ['simulateForEveryone',_value,true];"; - class Value - { - class data - { - class type - { - type[]= + class data { - "BOOL" + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1.04; }; }; - value=0; }; - }; - }; - class Attribute6 - { - property="ace_advanced_ballistics_ModuleSettings_simulateForSnipers"; - expression="_this setVariable ['simulateForSnipers',_value,true];"; - class Value - { - class data + class Attribute2 { - class type + property="ace_isSurrendered"; + expression="if (_value) then {[objNull,[_this],true] call ace_captives_fnc_moduleSurrender}"; + class Value { - type[]= + class data { - "BOOL" + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; }; }; - value=1; }; + nAttributes=3; }; }; - class Attribute7 + }; + class Attributes + { + }; + id=28; + atlOffset=-1.9073486e-006; + }; + class Item17 + { + dataType="Group"; + side="West"; + class Entities + { + items=1; + class Item0 { - property="ace_advanced_ballistics_ModuleSettings_simulateForGroupMembers"; - expression="_this setVariable ['simulateForGroupMembers',_value,true];"; - class Value + dataType="Object"; + class PositionInfo { - class data + position[]={4213.9482,19.380545,4021.1812}; + angles[]={6.2698536,4.1308832,6.2698536}; + }; + side="West"; + flags=6; + class Attributes + { + skill=0.60000002; + description="Engineer"; + isPlayable=1; + }; + id=31; + type="B_engineer_F"; + atlOffset=3.8146973e-006; + class CustomAttributes + { + class Attribute0 { - class type + property="ace_isHandcuffed"; + expression="if (_value) then {[objNull,[_this],true] call ace_captives_fnc_moduleHandcuffed}"; + class Value { - type[]= + class data { - "BOOL" + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; }; }; - value=0; }; - }; - }; - class Attribute8 - { - property="ace_advanced_ballistics_ModuleSettings_ammoTemperatureEnabled"; - expression="_this setVariable ['ammoTemperatureEnabled',_value,true];"; - class Value - { - class data + class Attribute1 { - class type + property="pitch"; + expression="_this setpitch _value;"; + class Value { - type[]= + class data { - "BOOL" + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.99000001; }; }; - value=1; }; - }; - }; - class Attribute9 - { - property="ace_advanced_ballistics_ModuleSettings_enabled"; - expression="_this setVariable ['enabled',_value,true];"; - class Value - { - class data + class Attribute2 { - class type + property="ace_isSurrendered"; + expression="if (_value) then {[objNull,[_this],true] call ace_captives_fnc_moduleSurrender}"; + class Value { - type[]= + class data { - "BOOL" + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; }; }; - value=0; }; + nAttributes=3; }; }; - nAttributes=10; }; + class Attributes + { + }; + id=30; + atlOffset=3.8146973e-006; }; - class Item23 + class Item18 { dataType="Logic"; class PositionInfo { - position[]={4006.625,0,3925.875}; + position[]={3985.1992,-5.0633116,3906.0693}; + angles[]={6.272521,0,0.093063653}; }; - id=81; - type="ace_winddeflection_ModuleSettings"; - atlOffset=4.1486669; + name="btc_curator"; + init="this addEventHandler ['CuratorObjectPlaced',{_this call btc_fnc_eh_CuratorObjectPlaced}];"; + id=71; + type="ModuleCurator_F"; class CustomAttributes { class Attribute0 { - property="ace_winddeflection_ModuleSettings_simulationInterval"; - expression="_this setVariable ['simulationInterval',_value,true];"; + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; class Value { class data @@ -1752,17 +1138,17 @@ class Mission { type[]= { - "SCALAR" + "STRING" }; }; - value=0.050000001; + value="#adminLogged"; }; }; }; class Attribute1 { - property="ace_winddeflection_ModuleSettings_enabled"; - expression="_this setVariable ['enabled',_value,true];"; + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; class Value { class data @@ -1771,17 +1157,17 @@ class Mission { type[]= { - "BOOL" + "SCALAR" }; }; - value=1; + value=0; }; }; }; class Attribute2 { - property="ace_winddeflection_ModuleSettings_simulationRadius"; - expression="_this setVariable ['simulationRadius',_value,true];"; + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; class Value { class data @@ -1790,17 +1176,17 @@ class Mission { type[]= { - "SCALAR" + "STRING" }; }; - value=3000; + value=""; }; }; }; class Attribute3 { - property="ace_winddeflection_ModuleSettings_vehicleEnabled"; - expression="_this setVariable ['vehicleEnabled',_value,true];"; + property="ModuleInfo"; + expression="false"; class Value { class data @@ -1816,10 +1202,29 @@ class Mission }; }; }; - nAttributes=4; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=3; + }; + }; + }; + nAttributes=5; }; }; - class Item24 + class Item19 { dataType="Group"; side="West"; @@ -1912,7 +1317,7 @@ class Mission id=89; atlOffset=1.9073486e-006; }; - class Item25 + class Item20 { dataType="Group"; side="West"; @@ -2005,7 +1410,7 @@ class Mission id=91; atlOffset=-3.8146973e-006; }; - class Item26 + class Item21 { dataType="Group"; side="West"; @@ -2096,7 +1501,7 @@ class Mission }; id=93; }; - class Item27 + class Item22 { dataType="Group"; side="West"; @@ -2189,7 +1594,7 @@ class Mission id=95; atlOffset=-3.8146973e-006; }; - class Item28 + class Item23 { dataType="Group"; side="West"; @@ -2280,7 +1685,7 @@ class Mission }; id=97; }; - class Item29 + class Item24 { dataType="Group"; side="West"; @@ -2371,7 +1776,7 @@ class Mission }; id=99; }; - class Item30 + class Item25 { dataType="Group"; side="West"; @@ -2464,7 +1869,7 @@ class Mission id=101; atlOffset=1.9073486e-006; }; - class Item31 + class Item26 { dataType="Group"; side="West"; @@ -2557,7 +1962,7 @@ class Mission id=103; atlOffset=-3.8146973e-006; }; - class Item32 + class Item27 { dataType="Group"; side="West"; @@ -2650,7 +2055,7 @@ class Mission id=105; atlOffset=-1.9073486e-006; }; - class Item33 + class Item28 { dataType="Group"; side="West"; @@ -2743,7 +2148,7 @@ class Mission id=107; atlOffset=3.8146973e-006; }; - class Item34 + class Item29 { dataType="Group"; side="West"; @@ -2775,7 +2180,7 @@ class Mission id=109; atlOffset=-1.9073486e-006; }; - class Item35 + class Item30 { dataType="Group"; side="West"; @@ -2805,7 +2210,7 @@ class Mission }; id=111; }; - class Item36 + class Item31 { dataType="Group"; side="West"; @@ -2898,7 +2303,7 @@ class Mission id=113; atlOffset=-3.8146973e-006; }; - class Item37 + class Item32 { dataType="Group"; side="West"; @@ -2989,7 +2394,7 @@ class Mission }; id=115; }; - class Item38 + class Item33 { dataType="Group"; side="West"; @@ -3080,7 +2485,7 @@ class Mission }; id=117; }; - class Item39 + class Item34 { dataType="Group"; side="West"; @@ -3173,7 +2578,7 @@ class Mission id=119; atlOffset=-3.8146973e-006; }; - class Item40 + class Item35 { dataType="Group"; side="West"; @@ -3266,7 +2671,7 @@ class Mission id=121; atlOffset=-3.8146973e-006; }; - class Item41 + class Item36 { dataType="Group"; side="West"; @@ -3359,7 +2764,7 @@ class Mission id=123; atlOffset=-3.8146973e-006; }; - class Item42 + class Item37 { dataType="Group"; side="West"; @@ -3391,7 +2796,7 @@ class Mission id=125; atlOffset=-5.7220459e-006; }; - class Item43 + class Item38 { dataType="Group"; side="West"; @@ -3423,7 +2828,7 @@ class Mission id=127; atlOffset=-3.8146973e-006; }; - class Item44 + class Item39 { dataType="Group"; side="West"; @@ -3455,7 +2860,7 @@ class Mission id=129; atlOffset=5.7220459e-006; }; - class Item45 + class Item40 { dataType="Group"; side="West"; @@ -3485,7 +2890,7 @@ class Mission }; id=131; }; - class Item46 + class Item41 { dataType="Object"; class PositionInfo @@ -3528,7 +2933,7 @@ class Mission nAttributes=1; }; }; - class Item47 + class Item42 { dataType="Object"; class PositionInfo @@ -3608,7 +3013,7 @@ class Mission nAttributes=3; }; }; - class Item48 + class Item43 { dataType="Object"; class PositionInfo @@ -3688,7 +3093,7 @@ class Mission nAttributes=3; }; }; - class Item49 + class Item44 { dataType="Object"; class PositionInfo @@ -3769,7 +3174,7 @@ class Mission nAttributes=3; }; }; - class Item50 + class Item45 { dataType="Object"; class PositionInfo @@ -3849,7 +3254,7 @@ class Mission nAttributes=3; }; }; - class Item51 + class Item46 { dataType="Object"; class PositionInfo @@ -3891,7 +3296,7 @@ class Mission nAttributes=1; }; }; - class Item52 + class Item47 { dataType="Object"; class PositionInfo @@ -3933,7 +3338,7 @@ class Mission nAttributes=1; }; }; - class Item53 + class Item48 { dataType="Object"; class PositionInfo @@ -3975,7 +3380,7 @@ class Mission nAttributes=1; }; }; - class Item54 + class Item49 { dataType="Logic"; class PositionInfo @@ -3988,7 +3393,7 @@ class Mission id=246; type="HeadlessClient_F"; }; - class Item55 + class Item50 { dataType="Object"; class PositionInfo @@ -4031,7 +3436,7 @@ class Mission nAttributes=1; }; }; - class Item56 + class Item51 { dataType="Object"; class PositionInfo @@ -4074,25 +3479,4 @@ class Mission }; }; }; - class Connections - { - class LinkIDProvider - { - nextID=1; - }; - class Links - { - items=1; - class Item0 - { - linkID=0; - item0=74; - item1=14; - class CustomData - { - type="Sync"; - }; - }; - }; - }; }; From 039e99a99b14a9e476f77b8fd16ff55a66eec28e Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Sun, 24 Dec 2017 01:04:24 +0100 Subject: [PATCH 08/11] Remove ACE setting from param and use mission.sqm fro them SInce ACE 3.12, ACE setting is suppose to be choose in mission.sqm or on the fly by server admin or client. So mission parameter is no more usefull to change ACE setting. Also add debugconsole for admin ONLY --- .../core/def/mission.sqf | 10 - .../core/def/param.hpp | 24 -- .../description.ext | 3 +- =BTC=co@30_Hearts_and_Minds.Altis/mission.sqm | 181 +++++++++- .../mission_Tanoa.sqm | 332 +++++++++++++++++- 5 files changed, 507 insertions(+), 43 deletions(-) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf index 30ebbacc0..aa0e258e7 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf @@ -30,9 +30,6 @@ _info_chance = "btc_p_info_chance" call BIS_fnc_getParamValue; //<< Medical options >> btc_p_redeploy = ("btc_p_redeploy" call BIS_fnc_getParamValue) isEqualTo 1; -ace_medical_level = "btc_p_med_level" call BIS_fnc_getParamValue; -ace_medical_enableAdvancedWounds = ("btc_p_adv_wounds" call BIS_fnc_getParamValue) isEqualTo 1; -ace_medical_maxReviveTime = "btc_p_rev" call BIS_fnc_getParamValue; //<< Skill options >> btc_p_set_skill = ("btc_p_set_skill" call BIS_fnc_getParamValue) isEqualTo 1; @@ -57,18 +54,11 @@ btc_p_side_mission_cycle = ("btc_p_side_mission_cycle" call BIS_fnc_getParamValu //<< Other options >> _p_rep = "btc_p_rep" call BIS_fnc_getParamValue; -ace_rearm_level = "btc_p_rearm" call BIS_fnc_getParamValue; btc_p_garage = ("btc_p_garage" call BIS_fnc_getParamValue) isEqualTo 1; _p_city_radius = ("btc_p_city_radius" call BIS_fnc_getParamValue) * 100; btc_p_trigger = if (("btc_p_trigger" call BIS_fnc_getParamValue) isEqualTo 1) then {"this && !btc_db_is_saving && (false in (thisList apply {_x isKindOf 'Plane'})) && (false in (thisList apply {(_x isKindOf 'Helicopter') && (speed _x > 190)}))"} else {"this && !btc_db_is_saving"}; btc_p_debug = "btc_p_debug" call BIS_fnc_getParamValue; -//OPTION must be use for H&M -if (ace_medical_maxReviveTime > 0) then {ace_medical_enableRevive = 1;ace_medical_preventInstaDeath = true}; -ace_medical_enableFor = 1; -ace_cargo_enable = false; -ace_respawn_savePreDeathGear = true; - //btc_acre_mod = isClass(configFile >> "cfgPatches" >> "acre_main"); //btc_tfr_mod = isClass(configFile >> "cfgPatches" >> "task_force_radio"); diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp b/=BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp index d138987d4..7b74e8de4 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp @@ -125,24 +125,6 @@ class Params { texts[]={"Off","On"}; default = 1; }; - class btc_p_med_level { - title = " Medical Level"; - values[] = {1,2}; - texts[] = {"Basic","Advanced"}; - default = 1; - }; - class btc_p_adv_wounds { - title = " Advanced Wounds"; - values[] = {0,1}; - texts[] = {"Off","On"}; - default = 1; - }; - class btc_p_rev { - title = " Revive time:"; - values[]={0,60,120,180,240,300,600,900,1200,999999}; - texts[]={"Off","60","120","180","240","300","600","900","1200","999999"}; - default = 600; - }; class btc_p_skill_title { title = "<< A3 Skill options >>"; values[]={0}; @@ -257,12 +239,6 @@ class Params { texts[]={"Very Low","Low","Normal","High"}; default = 200; }; - class btc_p_rearm { - title = " Rearm Level:"; - values[]={0,1,2}; - texts[]={"Entire vehicle","Entire magazine","Amount based on caliber"}; - default = 1; - }; class btc_p_garage { title = " Activate garage for admin:"; values[]={0,1}; diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/description.ext b/=BTC=co@30_Hearts_and_Minds.Altis/description.ext index 54aaec63e..5b030e121 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/description.ext +++ b/=BTC=co@30_Hearts_and_Minds.Altis/description.ext @@ -3,6 +3,7 @@ loadScreen = "core\img\btc.paa"; author = Giallustio; onLoadName = Hearts and Minds; onLoadMission = www.blacktemplars.altervista.org; +enabledebugconsole = 1; #include "core\def\dlg_def.hpp" @@ -32,4 +33,4 @@ class RscTitles { #include "core\def\functions.hpp" -#include "core\fnc\eh\extended_InitPost_EH.hpp" \ No newline at end of file +#include "core\fnc\eh\extended_InitPost_EH.hpp" diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm b/=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm index bd601203e..db732af38 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm +++ b/=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm @@ -263,7 +263,7 @@ class CustomAttributes }; class value { - items=1; + items=4; class Item0 { class data @@ -278,6 +278,48 @@ class CustomAttributes value="ace_respawn_savepredeathgear"; }; }; + class Item1 + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="ace_medical_enablefor"; + }; + }; + class Item2 + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="ace_cargo_enable"; + }; + }; + class Item3 + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="ace_rearm_level"; + }; + }; }; }; }; @@ -294,8 +336,98 @@ class CustomAttributes }; class value { - items=1; + items=4; class Item0 + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=2; + class Item0 + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + class Item1 + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1; + }; + }; + }; + }; + }; + class Item1 + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=2; + class Item0 + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1; + }; + }; + class Item1 + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + }; + }; + class Item2 { class data { @@ -324,6 +456,51 @@ class CustomAttributes }; }; class Item1 + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1; + }; + }; + }; + }; + }; + class Item3 + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=2; + class Item0 + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1; + }; + }; + class Item1 { class data { diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/mission_Tanoa.sqm b/=BTC=co@30_Hearts_and_Minds.Altis/mission_Tanoa.sqm index 060f7ad88..d0d5a927f 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/mission_Tanoa.sqm +++ b/=BTC=co@30_Hearts_and_Minds.Altis/mission_Tanoa.sqm @@ -178,7 +178,7 @@ class CustomAttributes name="Multiplayer"; class Attribute0 { - property="RespawnButton"; + property="RespawnTemplates"; expression="true"; class Value { @@ -188,16 +188,15 @@ class CustomAttributes { type[]= { - "SCALAR" + "ARRAY" }; }; - value=1; }; }; }; class Attribute1 { - property="RespawnTemplates"; + property="RespawnButton"; expression="true"; class Value { @@ -207,9 +206,10 @@ class CustomAttributes { type[]= { - "ARRAY" + "SCALAR" }; }; + value=1; }; }; }; @@ -219,6 +219,326 @@ class CustomAttributes { name="Scenario"; class Attribute0 + { + property="cba_settings_hash"; + expression="false"; + class Value + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=4; + class Item0 + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="#CBA_HASH#"; + }; + }; + class Item1 + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=4; + class Item0 + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="ace_medical_enablefor"; + }; + }; + class Item1 + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="ace_rearm_level"; + }; + }; + class Item2 + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="ace_respawn_savepredeathgear"; + }; + }; + class Item3 + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="ace_cargo_enable"; + }; + }; + }; + }; + }; + class Item2 + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=4; + class Item0 + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=2; + class Item0 + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1; + }; + }; + class Item1 + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + }; + }; + class Item1 + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=2; + class Item0 + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=1; + }; + }; + class Item1 + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + }; + }; + class Item2 + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=2; + class Item0 + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + class Item1 + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + }; + }; + class Item3 + { + class data + { + class type + { + type[]= + { + "ARRAY" + }; + }; + class value + { + items=2; + class Item0 + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=0; + }; + }; + class Item1 + { + class data + { + class type + { + type[]= + { + "BOOL" + }; + }; + value=1; + }; + }; + }; + }; + }; + }; + }; + }; + class Item3 + { + class data + { + nil=1; + class type + { + type[]= + { + "ANY" + }; + }; + }; + }; + }; + }; + }; + }; + class Attribute1 { property="EnableDebugConsole"; expression="true"; @@ -237,7 +557,7 @@ class CustomAttributes }; }; }; - nAttributes=1; + nAttributes=2; }; }; class Mission From 68e628ec9dddcb3c06791abc05c860327183f878 Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Tue, 26 Dec 2017 14:18:22 +0100 Subject: [PATCH 09/11] Add: advanced engineer to repair vehicles at logistic point --- =BTC=co@30_Hearts_and_Minds.Altis/mission.sqm | 83 ++++++++++++++++--- .../mission_Tanoa.sqm | 70 ++++++++++++---- 2 files changed, 126 insertions(+), 27 deletions(-) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm b/=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm index db732af38..60ee41c20 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm +++ b/=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm @@ -16,10 +16,10 @@ class EditorData }; class Camera { - pos[]={8330.0225,187.05653,10023.455}; - dir[]={0.053734943,-0.82017767,0.5696947}; - up[]={0.077020578,0.57209378,0.81656778}; - aside[]={0.99564278,3.8654252e-007,-0.093911856}; + pos[]={8297.6123,93.258369,10061.557}; + dir[]={0.58210856,-0.81064433,0.064327784}; + up[]={0.80575699,0.58552009,0.089042641}; + aside[]={0.10984567,4.5113848e-007,-0.99401075}; }; }; binarizationWanted=0; @@ -178,7 +178,7 @@ class CustomAttributes name="Multiplayer"; class Attribute0 { - property="RespawnTemplates"; + property="RespawnButton"; expression="true"; class Value { @@ -188,15 +188,16 @@ class CustomAttributes { type[]= { - "ARRAY" + "SCALAR" }; }; + value=1; }; }; }; class Attribute1 { - property="RespawnButton"; + property="RespawnTemplates"; expression="true"; class Value { @@ -206,10 +207,9 @@ class CustomAttributes { type[]= { - "SCALAR" + "ARRAY" }; }; - value=1; }; }; }; @@ -1290,18 +1290,79 @@ class Mission class PositionInfo { position[]={8306.8721,76.060417,10067.928}; - angles[]={6.2418771,2.3351603,0}; + angles[]={6.2418733,2.3351631,0}; }; side="West"; flags=6; class Attributes { skill=0.60000002; - description="Engineer"; + description="Advanced engineer"; isPlayable=1; }; id=31; type="B_engineer_F"; + class CustomAttributes + { + class Attribute0 + { + property="ace_isEngineer"; + expression="if (_value != -1) then {_this setVariable ['ace_isEngineer',_value, true];}"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=2; + }; + }; + }; + class Attribute1 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male02ENG"; + }; + }; + }; + class Attribute2 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=0.99000001; + }; + }; + }; + nAttributes=3; + }; }; }; class Attributes diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/mission_Tanoa.sqm b/=BTC=co@30_Hearts_and_Minds.Altis/mission_Tanoa.sqm index d0d5a927f..1857d241d 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/mission_Tanoa.sqm +++ b/=BTC=co@30_Hearts_and_Minds.Altis/mission_Tanoa.sqm @@ -16,10 +16,10 @@ class EditorData }; class Camera { - pos[]={4238.0225,23.444588,3976.3384}; - dir[]={0.0033626116,-0.12773004,0.9918986}; - up[]={0.00043315504,0.99179304,0.12790467}; - aside[]={1.0000873,-7.9231859e-007,-0.0033897087}; + pos[]={4207.9165,39.892441,4004.0476}; + dir[]={0.23425245,-0.75864172,0.60809433}; + up[]={0.2727313,0.6514526,0.70798182}; + aside[]={0.93324167,-1.1265511e-006,-0.35950708}; }; }; binarizationWanted=0; @@ -178,7 +178,7 @@ class CustomAttributes name="Multiplayer"; class Attribute0 { - property="RespawnTemplates"; + property="RespawnButton"; expression="true"; class Value { @@ -188,15 +188,16 @@ class CustomAttributes { type[]= { - "ARRAY" + "SCALAR" }; }; + value=1; }; }; }; class Attribute1 { - property="RespawnButton"; + property="RespawnTemplates"; expression="true"; class Value { @@ -206,10 +207,9 @@ class CustomAttributes { type[]= { - "SCALAR" + "ARRAY" }; }; - value=1; }; }; }; @@ -1349,20 +1349,20 @@ class Mission dataType="Object"; class PositionInfo { - position[]={4213.9482,19.380545,4021.1812}; - angles[]={6.2698536,4.1308832,6.2698536}; + position[]={4213.9482,19.380543,4021.1812}; + angles[]={6.2698507,4.1308804,6.2698507}; }; side="West"; flags=6; class Attributes { skill=0.60000002; - description="Engineer"; + description="Advanced engineer"; isPlayable=1; }; id=31; type="B_engineer_F"; - atlOffset=3.8146973e-006; + atlOffset=1.9073486e-006; class CustomAttributes { class Attribute0 @@ -1385,6 +1385,44 @@ class Mission }; }; class Attribute1 + { + property="ace_isEngineer"; + expression="if (_value != -1) then {_this setVariable ['ace_isEngineer',_value, true];}"; + class Value + { + class data + { + class type + { + type[]= + { + "SCALAR" + }; + }; + value=2; + }; + }; + }; + class Attribute2 + { + property="speaker"; + expression="_this setspeaker _value;"; + class Value + { + class data + { + class type + { + type[]= + { + "STRING" + }; + }; + value="Male02ENG"; + }; + }; + }; + class Attribute3 { property="pitch"; expression="_this setpitch _value;"; @@ -1403,7 +1441,7 @@ class Mission }; }; }; - class Attribute2 + class Attribute4 { property="ace_isSurrendered"; expression="if (_value) then {[objNull,[_this],true] call ace_captives_fnc_moduleSurrender}"; @@ -1422,7 +1460,7 @@ class Mission }; }; }; - nAttributes=3; + nAttributes=5; }; }; }; @@ -1430,7 +1468,7 @@ class Mission { }; id=30; - atlOffset=3.8146973e-006; + atlOffset=1.9073486e-006; }; class Item18 { From ce5715f5f333bf9059055f2c2c9b830ad13e063e Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Fri, 29 Dec 2017 00:05:40 +0100 Subject: [PATCH 10/11] FIX: JIP interaction with terminal --- =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/hack.sqf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/hack.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/hack.sqf index 1624fbdde..4d20eabe8 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/hack.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/hack.sqf @@ -31,7 +31,6 @@ _marker setMarkerSize [0.6, 0.6]; //// Create terminal \\\\ private _terminal = createVehicle ["Land_DataTerminal_01_F", _pos, [], 0, "CAN_COLLIDE"]; -{btc_side_done = false} remoteExec ["call", 0]; _pos = [[_pos, 100] call btc_fnc_randomize_pos, 50, 500, 30, 0, 60 * (pi / 180), 0] call BIS_fnc_findSafePos; private _launchsite = createVehicle ["Land_PenBlack_F", _pos, [], 0, "FLY"]; @@ -40,9 +39,9 @@ private _launchsite = createVehicle ["Land_PenBlack_F", _pos, [], 0, "FLY"]; private _action = ["Open","Start Hacking","\A3\ui_f\data\igui\cfg\simpleTasks\types\intel_ca.paa",{ [_this select 0,3] call BIS_fnc_dataTerminalAnimate; {btc_side_done = true} remoteExec ["call", 0]; - },{!btc_side_done}] call ace_interact_menu_fnc_createAction; + },{isNil "btc_side_done"}] call ace_interact_menu_fnc_createAction; [_this select 0, 0, ["ACE_MainActions"], _action] call ace_interact_menu_fnc_addActionToObject; -}] remoteExec ["call", -2]; +}] remoteExec ["call", -2, _terminal]; waitUntil {sleep 5; (btc_side_aborted || btc_side_failed || btc_side_done)}; if (btc_side_aborted || btc_side_failed) exitWith { @@ -64,6 +63,7 @@ _groups apply {_x setBehaviour "CARELESS"}; waitUntil {sleep 5; (btc_side_aborted || btc_side_failed || ({_x isEqualTo grpNull} count _groups > 0) || !(_city getVariable ["active", false]))}; if (btc_side_aborted || btc_side_failed) exitWith { + {btc_side_done = Nil} remoteExec ["call", -2]; 16 remoteExec ["btc_fnc_task_fail", 0]; [[_marker], [_terminal], [], []] call btc_fnc_delete; btc_side_assigned = false;publicVariable "btc_side_assigned"; @@ -81,7 +81,7 @@ private _rocket = createVehicle ["ace_rearm_Missile_AGM_02_F", [_pos select 0, _ private _fx = createVehicle ["test_EmptyObjectForSmoke", [_pos select 0, _pos select 1, _altitude], [], 0, "CAN_COLLIDE"]; _fx attachTo [_rocket,[0,0,0]]; -{btc_side_done = false} remoteExec ["call", 0]; +{btc_side_done = Nil} remoteExec ["call", -2]; btc_side_assigned = false;publicVariable "btc_side_assigned"; [[_marker], [_rocket, _terminal], [_fx], []] call btc_fnc_delete; if (btc_side_aborted || btc_side_failed || !(_city getVariable ["active", false])) exitWith { From f7d29047690197ca33257352286cef88545ff3d7 Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Fri, 29 Dec 2017 23:23:01 +0100 Subject: [PATCH 11/11] Add: 1.17.6 --- =BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf | 2 +- =BTC=co@30_Hearts_and_Minds.Altis/core/doc.sqf | 2 +- README.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf index aa0e258e7..bb55da2ec 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf @@ -1,7 +1,7 @@ private ["_p_civ_veh","_p_db","_p_en","_hideout_n","_cache_info_def","_cache_info_ratio","_info_chance","_p_rep","_p_skill","_c_array","_tower","_array","_chopper","_p_civ","_btc_rearming_vehicles","_vehicles","_magazines","_p_city_radius","_magazines_static","_static","_btc_rearming_static","_magazines_clean","_weapons_usefull","_magazines_static_clean","_p_en_AA"]; -btc_version = 1.17; diag_log format ["=BTC= HEARTS AND MINDS VERSION %1",(str(btc_version) + ".5")]; +btc_version = 1.17; diag_log format ["=BTC= HEARTS AND MINDS VERSION %1",(str(btc_version) + ".6")]; //Param diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/doc.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/doc.sqf index 05a366860..2afa21d6a 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/doc.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/doc.sqf @@ -149,6 +149,6 @@ player createDiaryRecord ["Documentation", ["Interaction", " player createDiaryRecord ["Documentation", [ "Version", - format [" Version %1 ",(str(btc_version) + ".5")] + format [" Version %1 ",(str(btc_version) + ".6")] ] ]; diff --git a/README.md b/README.md index ab5a64bec..eaa350ddb 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@

- - H&M Version + + H&M Version H&M Downloads