diff --git a/addons/homebase/config.cpp b/addons/homebase/config.cpp index b809b27e5c3fd4a6f8a940a559e6897b7194c956..2c7a22d7761dda76302256a47ef28e7a04c77af0 100644 --- a/addons/homebase/config.cpp +++ b/addons/homebase/config.cpp @@ -27,6 +27,12 @@ class CfgFunctions { }; }; +#include "\z\ghotimod\addons\main\include\RscExternal.hpp" + class CfgGhotiMod { #include "include\config.hpp" }; + +class RscTitles { + #include "include\RscTitles.hpp" +}; diff --git a/addons/homebase/include/RscConst.hpp b/addons/homebase/include/RscConst.hpp new file mode 100644 index 0000000000000000000000000000000000000000..7bfa7d1fc7ee1005870dd34d48ec22676cb50fb9 --- /dev/null +++ b/addons/homebase/include/RscConst.hpp @@ -0,0 +1,3 @@ +#define IDD_RSCGHOTIBASEEDITORSTATUS -101248 +//--- RscGhotiBaseEditorStatus +#define IDC_RSCGHOTIBASEEDITORSTATUS_TXTSTATS 30035 diff --git a/addons/homebase/include/RscTitles.hpp b/addons/homebase/include/RscTitles.hpp new file mode 100644 index 0000000000000000000000000000000000000000..c6c9baba04665b6d9d08030bf3123c243e888814 --- /dev/null +++ b/addons/homebase/include/RscTitles.hpp @@ -0,0 +1,32 @@ +/* #Kutegy +$[ + 1.063, + ["RscGhotiBaseEditorStatus",[["safezoneX","safezoneY","safezoneW","safezoneH"],"safezoneW / 80","safezoneH / 50","GUI_GRID"],3,1,0], + [1100,"TxtStats",[1,"",["0.83125 * safezoneW + safezoneX","0.8 * safezoneH + safezoneY","0.15625 * safezoneW","0.18 * safezoneH"],[-1,-1,-1,-1],[0,0,0,0.5],[-1,-1,-1,-1],"","-1"],[]] +] +*/ +class RscGhotiBaseEditorStatus { + idd = IDD_RSCGHOTIBASEEDITORSTATUS; + duration = 1e+6; + onLoad = "uiNamespace setVariable['GHOTI_BaseEditorStatus', _this select 0]"; + onUnload = "uiNamespace setVariable['GHOTI_BaseEditorStatus', displayNull]"; + + class Controls { + //////////////////////////////////////////////////////// + // GUI EDITOR OUTPUT START (by goreSplatter, v1.063, #Kutegy) + //////////////////////////////////////////////////////// + + class TxtStats: RscStructuredText + { + idc = IDC_RSCGHOTIBASEEDITORSTATUS_TXTSTATS; + x = QUOTE(0.83125 * safezoneW + safezoneX); + y = QUOTE(0.8 * safezoneH + safezoneY); + w = QUOTE(0.15625 * safezoneW); + h = QUOTE(0.18 * safezoneH); + colorBackground[] = {0,0,0,0.5}; + }; + //////////////////////////////////////////////////////// + // GUI EDITOR OUTPUT END + //////////////////////////////////////////////////////// + }; +}; diff --git a/addons/homebase/script_common.hpp b/addons/homebase/script_common.hpp index fd7ffe9ebf27d4c41fca9b1519bfebbd1f29d889..53a0231e8008e259d94ae7fe5786e18fc9dee9c9 100644 --- a/addons/homebase/script_common.hpp +++ b/addons/homebase/script_common.hpp @@ -1,2 +1,3 @@ #define GM_THIS_COMPONENT QUOTE(Homebase) #include "\z\ghotimod\addons\main\script_common.hpp" +#include "include\RscConst.hpp" diff --git a/addons/homebase/src/client/fn_Base_Client_Editor_Run.sqf b/addons/homebase/src/client/fn_Base_Client_Editor_Run.sqf index eaff2500a697c53cecfa74506aa19543dd992413..3e7379feb2b6b6aa4db3b9a32f8b538d53b3c833 100644 --- a/addons/homebase/src/client/fn_Base_Client_Editor_Run.sqf +++ b/addons/homebase/src/client/fn_Base_Client_Editor_Run.sqf @@ -23,6 +23,78 @@ if !local _object then { waitUntil { local _object }; }; +uiNamespace setVariable["GHOTI_BaseEditorStatus_Layer", "RscGhotiBaseEditorStatus_layer" call BIS_fnc_rscLayer]; + +private _layer = uiNamespace getVariable "GHOTI_BaseEditorStatus_Layer"; + +if !isNull(uiNamespace getVariable["GHOTI_BaseEditorStatus", displayNull]) exitWith { + _layer cutText["", "PLAIN"]; +}; + +_layer cutRsc["RscGhotiBaseEditorStatus", "PLAIN"]; // GHOTI_BaseEditorStatus +waitUntil { !isNull(uiNamespace getVariable["GHOTI_BaseEditorStatus", displayNull]) }; + +private _helper = "Sign_Arrow_Large_F" createVehicleLocal[0,0,0]; +private _bbox = boundingBoxReal _object; +_helper attachTo[_object, [0,_bbox select 1 select 1,0]]; +_helper setVectorDir[0,0,0]; +_helper setVectorUp[1,0,0]; + +_object setVariable["GM_BaseEditor_Data", createHashMapFromArray[ + ["helper", _helper], + ["cleanUp", { + if !assert(params[["_object",objNull,[objNull]]]) exitWith {}; + + deleteVehicle(_object getVariable "GM_BaseEditor_Data" get "helper"); + + player setVariable["GM_BaseEditor_Object", nil]; + _object setVariable["GM_BaseEditor_OrigPos", nil]; + _object setVariable["GM_BaseEditor_Data", nil]; + + private _layer = uiNamespace getVariable "GHOTI_BaseEditorStatus_Layer"; + + if !isNull(uiNamespace getVariable["GHOTI_BaseEditorStatus", displayNull]) then { + _layer cutText["", "PLAIN"]; + }; + + nil; + }], + ["updateStatusRsc", { + if !assert(params[["_object",objNull,[objNull]]]) exitWith {}; + + disableSerialization; + private _display = uiNamespace getVariable "GHOTI_BaseEditorStatus"; + private _text = _display displayCtrl IDC_RSCGHOTIBASEEDITORSTATUS_TXTSTATS; + + _text ctrlSetStructuredText parseText format[ + "<t size='0.8'>" + + "<t color='#ffddcc'>Object:</t> <t color='#ffffff'>%1</t><br />" + + (if (_object getVariable[EPOCH_BUILD_SLOT, false] isNotEqualTo false) then[ + { format["<t color='#ffddcc'>Static slot:</t> <t color='#ffffff'>%1</t><br />", _object getVariable EPOCH_BUILD_SLOT] }, + { format["<t color='#ffddcc'>Storage slot:</t> <t color='#ffffff'>%1</t><br />", _object getVariable EPOCH_STORAGE_SLOT] } + ]) + + "<t color='#ffddcc'>Position:</t> <t color='#ffffff'>%2</t><br />" + + "<t color='#ffddcc'>Rotation:</t> <t color='#ffffff'>%3</t><br />" + + (if ("reference" in (_object getVariable "GM_BaseEditor_Data")) then[ + { format["<t color='#ffddcc'>Reference:</t> <t color='#ffffff'>%1</t><br />", typeOf(_object getVariable "GM_BaseEditor_Data" get "reference")] }, + { "" } + ]) + + "</t><br />"+ + "<t size='0.33'> </t><br />"+ + "<t size='0.5'>"+ + "<t color='#a0a0a0'>P - pick/release reference object</t><br />"+ + "<t color='#a0a0a0'>Shift+A - align with reference object</t><br />"+ + "<t color='#a0a0a0'>Shift+H - toggle helper object</t><br />"+ + "</t>", + typeOf _object, + getPosWorld _object apply { _x toFixed 4 }, + vectorDir _object apply { _x toFixed 4 } + ]; + }] +]]; + +[_object] call (_object getVariable "GM_BaseEditor_Data" get "updateStatusRsc"); + // Add key handler findDisplay 46 displayAddEventHandler["KeyDown", { private _object = player getVariable["GM_BaseEditor_Object", objNull]; @@ -33,16 +105,19 @@ findDisplay 46 displayAddEventHandler["KeyDown", { private _move = { private _vector = _this; - private _pos = getPosWorld _object; + /*private _pos = getPosWorld _object; private _ft = vectorNormalized vectorDir player; _ft set[2, 1]; - _object setPosWorld (_pos vectorAdd (_vector vectorMultiply _ft)); + _object setPosWorld (_pos vectorAdd (_vector vectorMultiply _ft));*/ + _object setPosWorld (getPosWorld _object vectorAdd _this); + [_object] call (_object getVariable "GM_BaseEditor_Data" get "updateStatusRsc"); true; }; private _rotate = { private _dir = vectorDir _object; _dir = [_dir, _this] call BIS_fnc_rotateVector2D; _object setVectorDir _dir; + [_object] call (_object getVariable "GM_BaseEditor_Data" get "updateStatusRsc"); true; }; @@ -53,30 +128,69 @@ findDisplay 46 displayAddEventHandler["KeyDown", { switch true do { case(_keyCode == DIK_RETURN): { [player, "Base_Server", "Editor_SaveObject", [_object]] call GHOTI_fnc_DispatchCall; - player setVariable["GM_BaseEditor_Object", nil]; - _object setVariable["GM_BaseEditor_OrigPos", nil]; - systemChat "Object position saved"; + + [_object] call (_object getVariable "GM_BaseEditor_Data" get "cleanUp"); + + if (_object getVariable[EPOCH_STORAGE_SLOT, false] isNotEqualTo false) then { + ["To persist position, interact with container."] call GHOTI_fnc_Util_ShowHint; + } else { + ["Object position saved."] call GHOTI_fnc_Util_ShowHint; + }; + true; }; case(_keyCode == DIK_ESCAPE): { - player setVariable["GM_BaseEditor_Object", nil]; _object getVariable "GM_BaseEditor_OrigPos" params["_pos","_vdau"]; - _object setVariable["GM_BaseEditor_OrigPos", nil]; _object setPosWorld _pos; _object setVectorDirAndUp _vdau; - systemChat "Aborting editor"; + + [_object] call (_object getVariable "GM_BaseEditor_Data" get "cleanUp"); + true; }; case(_keyCode == DIK_UP): { [-_stepMove, 0, 0] call _move }; case(_keyCode == DIK_DOWN): { [_stepMove, 0, 0] call _move }; - case(_keyCode == DIK_LEFT): { [0, _stepMove, 0] call _move }; - case(_keyCode == DIK_RIGHT): { [0, -_stepMove, 0] call _move }; + case(_keyCode == DIK_LEFT): { [0, -_stepMove, 0] call _move }; + case(_keyCode == DIK_RIGHT): { [0, _stepMove, 0] call _move }; case(_keyCode == DIK_PGDN): { [0, 0, -_stepMove] call _move }; case(_keyCode == DIK_PGUP): { [0, 0, _stepMove] call _move }; case(_keyCode == DIK_W): { _stepRotate call _rotate }; case(_keyCode == DIK_R): { (-_stepRotate) call _rotate }; + case(_keyCode == DIK_A && _shiftP): { + if !("reference" in (_object getVariable "GM_BaseEditor_Data")) then { + ["No reference object picked."] call GHOTI_fnc_Util_ShowHint; + } else { + private _ref = _object getVariable "GM_BaseEditor_Data" get "reference"; + + _object setVectorDirAndUp[ + vectorDir _ref, + vectorUp _ref + ]; + }; + + [_object] call (_object getVariable "GM_BaseEditor_Data" get "updateStatusRsc"); + true; + }; + case(_keyCode == DIK_H && _shiftP): { + attachedObjects _object apply { + _x hideObject !(isObjectHidden _x); + }; + true; + }; + case(_keyCode == DIK_P): { + if ("reference" in (_object getVariable "GM_BaseEditor_Data")) then { + _object getVariable "GM_BaseEditor_Data" deleteAt "reference"; + } else { + if (!isNull cursorTarget && (cursorTarget isNotEqualTo _object)) then { + _object getVariable "GM_BaseEditor_Data" set["reference", cursorTarget]; + }; + }; + + [_object] call (_object getVariable "GM_BaseEditor_Data" get "updateStatusRsc"); + true; + }; default { false } }; }]; @@ -85,6 +199,6 @@ private _slot = _object getVariable[EPOCH_BUILD_SLOT, _object getVariable[EPOCH_ _object setVariable["GM_BaseEditor_OrigPos", [getPosWorld _object, [vectorDir _object, vectorUp _object]]]; player setVariable["GM_BaseEditor_Object", _object]; -systemChat format["Editing base object #%1 (%2)", _slot, typeOf _object]; +//systemChat format["Editing base object #%1 (%2)", _slot, typeOf _object]; nil; diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 12f541d59a6c4818642c634a3c087247f62e5d55..984aedd46ac373c3995bc17801833a735ed16912 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 1 #define MINOR 11 #define PATCH 0 -#define BUILD 1503 +#define BUILD 1505 diff --git a/description.ext b/description.ext index 31a5ffc0665aedeb9d20bdddb6fedc318dfc051b..8bba53dcf85c86de78e7b75fe56664c0017bcfde 100644 --- a/description.ext +++ b/description.ext @@ -122,6 +122,7 @@ class CfgIdentities { #include "addons\ammo-reloading\include\Resources.hpp" #include "addons\debug\include\RscConst.hpp" #include "addons\debug\include\Resources.hpp" +#include "addons\homebase\include\RscConst.hpp" #include "addons\loadout\include\RscConst.hpp" #include "addons\loadout\include\Resources.hpp" #include "addons\main\include\CfgGhotiModConfig.hpp" @@ -140,6 +141,7 @@ class CfgIdentities { class RscTitles { #include "addons\debug\include\RscTitles.hpp" + #include "addons\homebase\include\RscTitles.hpp" #include "addons\player-xp\include\RscTitles.hpp" #include "addons\squatters\include\RscTitles.hpp" #include "addons\status-hud\include\RscTitles.hpp" diff --git a/mission.sqm b/mission.sqm index fd3e058670bf4f6a07f6456e0c9e9aeacad168dd..4b2a07cdb7e0ad64913a246c40074b0cb0f03d5a 100644 --- a/mission.sqm +++ b/mission.sqm @@ -12,7 +12,7 @@ class EditorData }; class ItemIDProvider { - nextID=2215; + nextID=2217; }; class MarkerIDProvider { @@ -20,14 +20,14 @@ class EditorData }; class LayerIndexProvider { - nextID=12044; + nextID=12132; }; class Camera { - pos[]={6863.5815,16.942488,7397.7861}; - dir[]={-0.57881683,-0.63850319,0.50723243}; - up[]={-0.48020685,0.76961917,0.42081791}; - aside[]={0.65906936,-1.4901161e-08,0.75208211}; + pos[]={7105.3706,20.990433,7344.4346}; + dir[]={0.68369383,-0.56704265,0.45937496}; + up[]={0.47066772,0.82368839,0.3162424}; + aside[]={0.55770475,0,-0.83003932}; }; }; binarizationWanted=0; @@ -97,7 +97,6 @@ addons[]= "A3_Props_F_Enoch_Military_Equipment", "A3_Props_F_Decade_Objectives", "A3_Structures_F_EPB_Items_Military", - "Ryanzombies", "A3_Soft_F_MRAP_01", "A3_Modules_F_Curator_Curator", "A3_Structures_F_Exp_Military_ContainerBases", @@ -117,13 +116,15 @@ addons[]= "A3_Drones_F_Weapons_F_Gamma_Items", "A3_Characters_F_Heads", "A3_Characters_F_Exp_Vests", - "A3_Props_F_Enoch_Military_Decontamination" + "A3_Props_F_Enoch_Military_Decontamination", + "rhsusf_c_melb", + "RHS_US_A2_AirImport" }; class AddonsMetaData { class List { - items=52; + items=53; class Item0 { className="A3_Ui_F"; @@ -383,102 +384,110 @@ class AddonsMetaData name="A3_Props_F_Decade_Objectives"; }; class Item38 - { - className="Ryanzombies"; - name="Ryanzombies"; - author="Ryan"; - }; - class Item39 { className="A3_Modules_F_Curator"; name="Arma 3 Zeus Update - Scripted Modules"; author="Bohemia Interactive"; url="https://www.arma3.com"; }; - class Item40 + class Item39 { className="A3_Structures_F_Exp"; name="Arma 3 Apex - Buildings and Structures"; author="Bohemia Interactive"; url="https://www.arma3.com"; }; - class Item41 + class Item40 { className="A3_Props_F_Decade"; name="CFGPATCHES_A3_Props_F_Decade"; author="Bohemia Interactive"; url="https://www.arma3.com"; }; - class Item42 + class Item41 { className="A3_Props_F_Orange"; name="Arma 3 Orange - Decorative and Mission Objects"; author="Bohemia Interactive"; url="https://www.arma3.com"; }; - class Item43 + class Item42 { className="A3_Missions_F_Oldman"; name="Arma 3 Old Man - Playable Content"; author="Bohemia Interactive"; url="https://www.arma3.com"; }; - class Item44 + class Item43 { className="A3_Air_F_EPC"; name="Arma 3 Win Episode - Aircraft"; author="Bohemia Interactive"; url="https://www.arma3.com"; }; - class Item45 + class Item44 { className="A3_Air_F_Jets"; name="Arma 3 Jets - Aircraft"; author="Bohemia Interactive"; url="https://www.arma3.com"; }; - class Item46 + class Item45 { className="A3_Air_F_Exp"; name="Arma 3 Apex - Aircraft"; author="Bohemia Interactive"; url="https://www.arma3.com"; }; - class Item47 + class Item46 { className="rhsusf_c_weapons"; name="RHSUSF Weapons & Accessories"; author="Red Hammer Studios"; url="http://www.rhsmods.org/"; }; - class Item48 + class Item47 { className="A3_Boat_F"; name="Arma 3 Alpha - Boats and Submersibles"; author="Bohemia Interactive"; url="https://www.arma3.com"; }; - class Item49 + class Item48 { className="A3_Weapons_F_Mark"; name="Arma 3 Marksmen - Weapons and Accessories"; author="Bohemia Interactive"; url="https://www.arma3.com"; }; - class Item50 + class Item49 { className="A3_Drones_F"; name="Arma 3 Beta - Drones"; author="Bohemia Interactive"; url="https://www.arma3.com"; }; - class Item51 + class Item50 { className="A3_Characters_F_Exp"; name="Arma 3 Apex - Characters and Clothing"; author="Bohemia Interactive"; url="https://www.arma3.com"; }; + class Item51 + { + className="rhsusf_c_melb"; + name="MELB"; + author="Red Hammer Studios"; + url="http://www.rhsmods.org/"; + }; + class Item52 + { + className="RHS_US_A2_AirImport"; + name="RHSUSF A2 Air Ports"; + author="Red Hammer Studios"; + url="http://www.rhsmods.org/"; + }; }; }; dlcs[]= @@ -11942,7 +11951,7 @@ class Mission }; }; id=870; - atlOffset=1.3453407; + atlOffset=60.779999; }; class Item1 { @@ -12078,11 +12087,11 @@ class Mission }; }; id=886; - atlOffset=-0.020659447; + atlOffset=-0.048500061; }; }; id=293; - atlOffset=35.125893; + atlOffset=34.660446; }; class Item10 { @@ -13302,95 +13311,6 @@ class Mission atlOffset=9.5367432e-07; }; class Item28 - { - dataType="Group"; - side="Independent"; - class Entities - { - items=1; - class Item0 - { - dataType="Object"; - class PositionInfo - { - position[]={7171.334,2.6614389,7239.5034}; - angles[]={0,3.141593,0}; - }; - side="Independent"; - flags=7; - class Attributes - { - }; - id=1911; - type="I_Soldier_A_F"; - }; - }; - class Attributes - { - }; - id=1910; - }; - class Item29 - { - dataType="Group"; - side="Independent"; - class Entities - { - items=1; - class Item0 - { - dataType="Object"; - class PositionInfo - { - position[]={7180.1309,2.6614389,7281.4746}; - }; - side="Independent"; - flags=7; - class Attributes - { - }; - id=1913; - type="RyanZombie15"; - class CustomAttributes - { - class Attribute0 - { - property="speaker"; - expression="_this setspeaker _value;"; - class Value - { - class data - { - singleType="STRING"; - value=""; - }; - }; - }; - class Attribute1 - { - property="pitch"; - expression="_this setpitch _value;"; - class Value - { - class data - { - singleType="SCALAR"; - value=0.95999998; - }; - }; - }; - nAttributes=2; - }; - }; - }; - class Attributes - { - combatMode="BLUE"; - behaviour="CARELESS"; - }; - id=1912; - }; - class Item30 { dataType="Object"; class PositionInfo @@ -13408,7 +13328,7 @@ class Mission type="B_Heli_Light_01_F"; atlOffset=-2.3841858e-07; }; - class Item31 + class Item29 { dataType="Object"; class PositionInfo @@ -13442,7 +13362,7 @@ class Mission nAttributes=1; }; }; - class Item32 + class Item30 { dataType="Logic"; class PositionInfo @@ -13508,7 +13428,7 @@ class Mission nAttributes=4; }; }; - class Item33 + class Item31 { dataType="Object"; class PositionInfo @@ -13525,7 +13445,7 @@ class Mission type="Land_Wreck_Hunter_F"; atlOffset=0.0022773743; }; - class Item34 + class Item32 { dataType="Object"; class PositionInfo @@ -13542,7 +13462,7 @@ class Mission type="Land_Wreck_Offroad_F"; atlOffset=0.00077438354; }; - class Item35 + class Item33 { dataType="Object"; class PositionInfo @@ -13558,7 +13478,7 @@ class Mission id=2034; type="Land_Wreck_HMMWV_F"; }; - class Item36 + class Item34 { dataType="Object"; class PositionInfo @@ -13574,7 +13494,7 @@ class Mission id=2035; type="Land_Wreck_HMMWV_F"; }; - class Item37 + class Item35 { dataType="Object"; class PositionInfo @@ -13635,7 +13555,7 @@ class Mission nAttributes=1; }; }; - class Item38 + class Item36 { dataType="Object"; class PositionInfo @@ -13651,7 +13571,7 @@ class Mission id=2044; type="Land_HBarrier_3_F"; }; - class Item39 + class Item37 { dataType="Object"; class PositionInfo @@ -13667,7 +13587,7 @@ class Mission id=2045; type="PlayerDeathTeleporter_Ghoti"; }; - class Item40 + class Item38 { dataType="Object"; class PositionInfo @@ -13683,7 +13603,7 @@ class Mission id=2046; type="Land_BattlefieldCross_01_green_F"; }; - class Item41 + class Item39 { dataType="Object"; class PositionInfo @@ -13699,7 +13619,7 @@ class Mission id=2048; type="I_MRAP_03_EPOCH5"; }; - class Item42 + class Item40 { dataType="Object"; class PositionInfo @@ -13716,7 +13636,7 @@ class Mission type="O_MRAP_02_EPOCH5"; atlOffset=-2.3841858e-07; }; - class Item43 + class Item41 { dataType="Object"; class PositionInfo @@ -13733,7 +13653,7 @@ class Mission type="Land_LampStreet_02_amplion_F"; atlOffset=2.3841858e-07; }; - class Item44 + class Item42 { dataType="Object"; class PositionInfo @@ -13749,7 +13669,7 @@ class Mission id=2052; type="Land_CampingTable_small_white_F"; }; - class Item45 + class Item43 { dataType="Object"; class PositionInfo @@ -13766,7 +13686,7 @@ class Mission type="Item_Laptop_Unfolded"; atlOffset=2.3841858e-07; }; - class Item46 + class Item44 { dataType="Object"; class PositionInfo @@ -13781,7 +13701,7 @@ class Mission id=2055; type="Chemlight_Red2_NF_Ghoti"; }; - class Item47 + class Item45 { dataType="Object"; class PositionInfo @@ -13796,7 +13716,7 @@ class Mission id=2056; type="Chemlight_Green_NF_Ghoti"; }; - class Item48 + class Item46 { dataType="Object"; class PositionInfo @@ -13811,7 +13731,7 @@ class Mission id=2057; type="Chemlight_Blue_NF_Ghoti"; }; - class Item49 + class Item47 { dataType="Object"; class PositionInfo @@ -13826,7 +13746,7 @@ class Mission id=2058; type="Chemlight_Red_NF_Ghoti"; }; - class Item50 + class Item48 { dataType="Object"; class PositionInfo @@ -13843,7 +13763,7 @@ class Mission type="MissionComputer_Ghoti"; atlOffset=2.3841858e-07; }; - class Item51 + class Item49 { dataType="Object"; class PositionInfo @@ -13859,7 +13779,7 @@ class Mission type="Land_House_Small_06_F"; atlOffset=2.3841858e-07; }; - class Item52 + class Item50 { dataType="Object"; class PositionInfo @@ -13876,7 +13796,7 @@ class Mission type="Land_House_Small_06_F"; atlOffset=2.3841858e-07; }; - class Item53 + class Item51 { dataType="Object"; class PositionInfo @@ -13893,7 +13813,7 @@ class Mission type="Land_House_Small_06_F"; atlOffset=9.5367432e-07; }; - class Item54 + class Item52 { dataType="Object"; class PositionInfo @@ -13909,7 +13829,7 @@ class Mission id=2066; type="Land_Shop_City_05_F"; }; - class Item55 + class Item53 { dataType="Object"; class PositionInfo @@ -13926,7 +13846,7 @@ class Mission type="Land_House_Small_06_F"; atlOffset=2.3841858e-07; }; - class Item56 + class Item54 { dataType="Object"; class PositionInfo @@ -13943,7 +13863,7 @@ class Mission type="B_MRAP_01_EPOCH5_gmg"; atlOffset=-2.3841858e-07; }; - class Item57 + class Item55 { dataType="Object"; class PositionInfo @@ -13959,7 +13879,7 @@ class Mission id=2071; type="B_MRAP_01_EPOCH5_hmg"; }; - class Item58 + class Item56 { dataType="Object"; class PositionInfo @@ -13976,7 +13896,7 @@ class Mission type="B_Plane_CAS_01_dynamicLoadout_F"; atlOffset=-2.3841858e-07; }; - class Item59 + class Item57 { dataType="Object"; class PositionInfo @@ -13992,7 +13912,7 @@ class Mission id=2089; type="B_Plane_Fighter_01_F"; }; - class Item60 + class Item58 { dataType="Object"; class PositionInfo @@ -14009,7 +13929,7 @@ class Mission type="I_C_Plane_Civil_01_F"; atlOffset=2.3841858e-07; }; - class Item61 + class Item59 { dataType="Object"; class PositionInfo @@ -14026,7 +13946,7 @@ class Mission type="B_T_Quadbike_01_F"; atlOffset=-4.529953e-06; }; - class Item62 + class Item60 { dataType="Object"; class PositionInfo @@ -14043,7 +13963,7 @@ class Mission type="FenceMilitaryBaseWall_Ghoti"; atlOffset=2.3841858e-07; }; - class Item63 + class Item61 { dataType="Object"; class PositionInfo @@ -14060,7 +13980,7 @@ class Mission type="BaseLightHalogenLamp_Ghoti"; atlOffset=-0.00014901161; }; - class Item64 + class Item62 { dataType="Object"; class PositionInfo @@ -14076,7 +13996,7 @@ class Mission type="BaseLightController_Ghoti"; atlOffset=1.047307; }; - class Item65 + class Item63 { dataType="Object"; class PositionInfo @@ -14092,7 +14012,7 @@ class Mission type="BaseLightController_Ghoti"; atlOffset=1.0473063; }; - class Item66 + class Item64 { dataType="Object"; class PositionInfo @@ -14109,7 +14029,7 @@ class Mission type="BaseLightHalogenLamp_Ghoti"; atlOffset=-0.00014853477; }; - class Item67 + class Item65 { dataType="Object"; class PositionInfo @@ -14126,7 +14046,7 @@ class Mission type="BaseLightHalogenLamp_Ghoti"; atlOffset=-0.00014853477; }; - class Item68 + class Item66 { dataType="Object"; class PositionInfo @@ -14143,7 +14063,7 @@ class Mission type="Item_rhs_weap_mk18_m320"; atlOffset=-1.9073486e-06; }; - class Item69 + class Item67 { dataType="Group"; side="Civilian"; @@ -14203,7 +14123,7 @@ class Mission }; id=2102; }; - class Item70 + class Item68 { dataType="Object"; class PositionInfo @@ -14219,7 +14139,7 @@ class Mission type="A2_Golf_EPOCH"; atlOffset=2.3841858e-07; }; - class Item71 + class Item69 { dataType="Object"; class PositionInfo @@ -14236,12 +14156,12 @@ class Mission type="B_Truck_01_mover_EPOCH"; atlOffset=9.5367432e-07; }; - class Item72 + class Item70 { dataType="Object"; class PositionInfo { - position[]={2132.1069,1.2435731,13624.849}; + position[]={2132.1069,1.2435737,13624.849}; }; side="Empty"; class Attributes @@ -14249,9 +14169,9 @@ class Mission }; id=2108; type="B_Boat_Transport_01_F"; - atlOffset=1.4855068; + atlOffset=1.4855074; }; - class Item73 + class Item71 { dataType="Object"; class PositionInfo @@ -14268,7 +14188,7 @@ class Mission type="B_Heli_Light_01_dynamicLoadout_F"; atlOffset=-3.528595e-05; }; - class Item74 + class Item72 { dataType="Object"; class PositionInfo @@ -14285,7 +14205,7 @@ class Mission type="O_MRAP_02_hmg_F"; atlOffset=9.5367432e-07; }; - class Item75 + class Item73 { dataType="Object"; class PositionInfo @@ -14302,7 +14222,7 @@ class Mission type="B_Heli_Light_01_dynamicLoadout_F"; atlOffset=-2.3841858e-07; }; - class Item76 + class Item74 { dataType="Object"; class PositionInfo @@ -14318,7 +14238,7 @@ class Mission id=2113; type="I_Heli_Transport_02_EPOCH"; }; - class Item77 + class Item75 { dataType="Object"; class PositionInfo @@ -14335,7 +14255,7 @@ class Mission type="a2_ch47f_armed_EPOCH"; atlOffset=-2.3841858e-07; }; - class Item78 + class Item76 { dataType="Object"; class PositionInfo @@ -14352,7 +14272,7 @@ class Mission type="B_Heli_Transport_03_unarmed_EPOCH"; atlOffset=0.0004928112; }; - class Item79 + class Item77 { dataType="Object"; class PositionInfo @@ -14369,7 +14289,7 @@ class Mission type="a2_ch47f_armed_plus_EPOCH"; atlOffset=1.9073486e-06; }; - class Item80 + class Item78 { dataType="Object"; class PositionInfo @@ -14386,7 +14306,7 @@ class Mission type="O_Heli_Transport_04_EPOCH"; atlOffset=2.3841858e-07; }; - class Item81 + class Item79 { dataType="Object"; class PositionInfo @@ -14403,7 +14323,7 @@ class Mission type="a2_mi8_EPOCH"; atlOffset=2.3841858e-07; }; - class Item82 + class Item80 { dataType="Object"; class PositionInfo @@ -14419,7 +14339,7 @@ class Mission id=2119; type="C_Heli_Light_01_civil_2seat_EPOCH"; }; - class Item83 + class Item81 { dataType="Object"; class PositionInfo @@ -14435,7 +14355,7 @@ class Mission id=2120; type="C_Heli_Light_01_civil_4seat_EPOCH"; }; - class Item84 + class Item82 { dataType="Object"; class PositionInfo @@ -14452,7 +14372,7 @@ class Mission type="O_Heli_Light_02_unarmed_EPOCH"; atlOffset=-2.3841858e-07; }; - class Item85 + class Item83 { dataType="Object"; class PositionInfo @@ -14469,7 +14389,7 @@ class Mission type="uh1h_Epoch"; atlOffset=2.3841858e-07; }; - class Item86 + class Item84 { dataType="Object"; class PositionInfo @@ -14486,7 +14406,7 @@ class Mission type="I_Heli_light_03_unarmed_EPOCH"; atlOffset=-2.3841858e-07; }; - class Item87 + class Item85 { dataType="Object"; class PositionInfo @@ -14503,7 +14423,7 @@ class Mission type="Item_SatPhone"; atlOffset=-1.1920929e-06; }; - class Item88 + class Item86 { dataType="Object"; class PositionInfo @@ -14520,7 +14440,7 @@ class Mission type="Land_Computer_01_black_F"; atlOffset=-7.1525574e-07; }; - class Item89 + class Item87 { dataType="Layer"; name="Districts Points"; @@ -14817,7 +14737,7 @@ class Mission id=2152; atlOffset=-3.0573597; }; - class Item90 + class Item88 { dataType="Marker"; position[]={4991.25,14.549,5182.9482}; @@ -14831,7 +14751,7 @@ class Mission id=2157; atlOffset=-0.00047206879; }; - class Item91 + class Item89 { dataType="Marker"; position[]={5444.8999,3.2650001,4840.9971}; @@ -14845,7 +14765,7 @@ class Mission id=2158; atlOffset=0.00013875961; }; - class Item92 + class Item90 { dataType="Object"; class PositionInfo @@ -14862,7 +14782,7 @@ class Mission id=2159; type="A2_Golf_EPOCH"; }; - class Item93 + class Item91 { dataType="Object"; class PositionInfo @@ -14879,7 +14799,7 @@ class Mission type="DeconShower_Ghoti"; atlOffset=0.0035877228; }; - class Item94 + class Item92 { dataType="Object"; class PositionInfo @@ -14896,7 +14816,7 @@ class Mission id=2165; type="FenceMilitaryBaseWall_Ghoti"; }; - class Item95 + class Item93 { dataType="Object"; class PositionInfo @@ -14913,7 +14833,7 @@ class Mission type="FenceMilitaryBaseWall_Ghoti"; atlOffset=2.3841858e-07; }; - class Item96 + class Item94 { dataType="Object"; class PositionInfo @@ -14946,7 +14866,7 @@ class Mission nAttributes=1; }; }; - class Item97 + class Item95 { dataType="Object"; class PositionInfo @@ -14979,7 +14899,7 @@ class Mission nAttributes=1; }; }; - class Item98 + class Item96 { dataType="Marker"; position[]={4262.7651,4.7637873,8459.6084}; @@ -14994,7 +14914,7 @@ class Mission id=2172; atlOffset=4.7683716e-07; }; - class Item99 + class Item97 { dataType="Object"; class PositionInfo @@ -15011,7 +14931,7 @@ class Mission type="CargoDroneStorageBox_Ghoti"; atlOffset=0.0013885498; }; - class Item100 + class Item98 { dataType="Object"; class PositionInfo @@ -15028,7 +14948,7 @@ class Mission type="Land_House_Small_06_F"; atlOffset=2.3841858e-07; }; - class Item101 + class Item99 { dataType="Object"; class PositionInfo @@ -15045,7 +14965,7 @@ class Mission type="Land_Mil_WallBig_4m_F"; atlOffset=-2.3841858e-07; }; - class Item102 + class Item100 { dataType="Object"; class PositionInfo @@ -15078,7 +14998,7 @@ class Mission nAttributes=1; }; }; - class Item103 + class Item101 { dataType="Object"; class PositionInfo @@ -15095,7 +15015,7 @@ class Mission id=2179; type="SolarGen_EPOCH"; }; - class Item104 + class Item102 { dataType="Object"; class PositionInfo @@ -15113,7 +15033,7 @@ class Mission type="BaseSecurityTurretHigh_Ghoti"; atlOffset=-0.010890245; }; - class Item105 + class Item103 { dataType="Object"; class PositionInfo @@ -15128,7 +15048,7 @@ class Mission id=2186; type="Chemlight_Red_Ghoti"; }; - class Item106 + class Item104 { dataType="Object"; class PositionInfo @@ -15143,7 +15063,7 @@ class Mission id=2187; type="Chemlight_Red_NF_Ghoti"; }; - class Item107 + class Item105 { dataType="Object"; class PositionInfo @@ -15160,7 +15080,7 @@ class Mission id=2188; type="BaseSecurityTurret_Ghoti"; }; - class Item108 + class Item106 { dataType="Object"; class PositionInfo @@ -15175,7 +15095,7 @@ class Mission id=2189; type="Hesco3_EPOCH"; }; - class Item109 + class Item107 { dataType="Object"; class PositionInfo @@ -15192,7 +15112,7 @@ class Mission type="B_BagSupport_BaseSecurityTurret_Ghoti_F"; atlOffset=-4.7683716e-06; }; - class Item110 + class Item108 { dataType="Object"; class PositionInfo @@ -15209,7 +15129,7 @@ class Mission type="B_BagWeapon_BaseSecurityTurretHigh_Ghoti_F"; atlOffset=-4.529953e-06; }; - class Item111 + class Item109 { dataType="Group"; side="West"; @@ -15221,7 +15141,7 @@ class Mission dataType="Object"; class PositionInfo { - position[]={6843.8696,2.6614389,7413.7646}; + position[]={7159.0259,2.6621749,7338.1309}; angles[]={6.2795124,1.9227824,0.0071120295}; }; side="West"; @@ -15400,7 +15320,7 @@ class Mission }; id=1902; }; - class Item112 + class Item110 { dataType="Object"; class PositionInfo @@ -15417,7 +15337,7 @@ class Mission type="Land_PortableDesk_01_panel_black_F"; atlOffset=-1.4305115e-06; }; - class Item113 + class Item111 { dataType="Object"; class PositionInfo @@ -15434,7 +15354,7 @@ class Mission type="CBRNLid_01_olive_F"; atlOffset=-2.3841858e-06; }; - class Item114 + class Item112 { dataType="Object"; class PositionInfo @@ -15451,7 +15371,7 @@ class Mission id=2201; type="BaseTeleporter_Ghoti_F"; }; - class Item115 + class Item113 { dataType="Object"; class PositionInfo @@ -15468,7 +15388,7 @@ class Mission id=2203; type="BaseTeleporter_Ghoti_F"; }; - class Item116 + class Item114 { dataType="Object"; class PositionInfo @@ -15485,7 +15405,7 @@ class Mission type="BaseVegetationHider_Ghoti"; atlOffset=0.00071024895; }; - class Item117 + class Item115 { dataType="Object"; class PositionInfo @@ -15501,7 +15421,7 @@ class Mission type="PortableLight_Double_EPOCH"; atlOffset=2.3841858e-07; }; - class Item118 + class Item116 { dataType="Object"; class PositionInfo @@ -15517,5 +15437,65 @@ class Mission type="BaseLightHalogenLamp_Ghoti"; atlOffset=2.3841858e-07; }; + class Item117 + { + dataType="Object"; + class PositionInfo + { + position[]={7121.3589,4.6001749,7358.1519}; + angles[]={0,1.2291131,0}; + }; + side="Empty"; + flags=4; + class Attributes + { + reportRemoteTargets=1; + receiveRemoteTargets=1; + reportOwnPosition=1; + pylons="rhs_mag_M257_7;rhs_mag_m134_pylon_3000;rhs_mag_m134_pylon_3000;rhsusf_mag_gau19_melb_right;"; + }; + id=2215; + type="RHS_MELB_AH6M"; + atlOffset=-2.3841858e-07; + class CustomAttributes + { + class Attribute0 + { + property="rhs_MELB_TailNumber"; + expression="if(_value != 'NoChange')then{ [_this,'d_SN',_value] call RHS_MELB_fnc_tailNumber}"; + class Value + { + class data + { + singleType="STRING"; + value="NoChange"; + }; + }; + }; + nAttributes=1; + }; + }; + class Item118 + { + dataType="Object"; + class PositionInfo + { + position[]={7125.4302,5.0259714,7344.6338}; + angles[]={0,1.3259964,0}; + }; + side="Empty"; + flags=4; + class Attributes + { + textures="standard"; + reportRemoteTargets=1; + receiveRemoteTargets=1; + reportOwnPosition=1; + pylons="rhs_mag_Sidewinder_heli;rhs_mag_M229_19;rhs_mag_AGM114L_4[0];rhs_mag_AGM114K_4[0];rhs_mag_M151_19;rhs_mag_Sidewinder_heli;rhsusf_M130_CMFlare_Chaff_Magazine_x2;"; + }; + id=2216; + type="RHS_AH64D"; + atlOffset=-2.3841858e-07; + }; }; };