localization JP

addons/sys_antenna/CfgAcreComponents.hpp

@@ -142,4 +142,22 @@ class CfgAcreComponents {
         binaryGainFile = QPATHTOF(binary\na-701_gain.aba);
         compatibleRadios[] = {"ACRE_BF888S"};
     };
+
+    class ACRE_4FT_AERIAL_ROD: ACRE_BaseAntenna {
+        name = "4ft Aerial Rod";
+        shortName = "4ft Aerial Rod";
+        connector = ACRE_CONNECTOR_ROD;
+        height = 1.22;
+        binaryGainFile = QPATHTOF(binary\AerialRod_4ft_gain.aba);
+        compatibleRadios[] = {"ACRE_WS38"};
+    };
+
+    class ACRE_12FT_AERIAL_ROD: ACRE_BaseAntenna {
+        name = "12ft Aerial Rod";
+        shortName = "12ft Aerial Rod";
+        connector = ACRE_CONNECTOR_ROD;
+        height = 3.66;
+        binaryGainFile = QPATHTOF(binary\AerialRod_12ft_gain.aba);
+        compatibleRadios[] = {"ACRE_WS38"};
+    };
 };

addons/sys_components/script_acre_component_defines.hpp

@@ -16,10 +16,12 @@
 #define ACRE_CONNECTOR_CONN_MC2127 4
 #define ACRE_CONNECTOR_3_8 5
 #define ACRE_CONNECTOR_SMA 6
+#define ACRE_CONNECTOR_ROD 7
 
 // Racks
 #define ACRE_CONNECTOR_CONN_32PIN 6 // 32 Pin is the 152 side connector.
 #define ACRE_CONNECTOR_CONN_26PIN 7 // Harris 26 AIC pin - 117F to VRC103
 #define ACRE_CONNECTOR_CONN_18PIN 8 // 18pin for the 148 Side connector
 #define ACRE_CONNECTOR_CONN_57PIN 9 // 57pin is the SEM70/80/90 interconnecting connector
 #define ACRE_CONNECTOR_CONN_14PIN 10 // 14 pin CX-4655
+#define ACRE_CONNECTOR_CONN_12PIN 11 // 12 pin for WS-38, interconnecting Wireless Set No. 19 in a vehicle and Wireless Set No. 38

addons/sys_gsa/CfgVehicles.hpp

@@ -20,6 +20,14 @@ class CfgVehicles {
                     showDisabled = 0;
                     icon = QPATHTOF(data\vhf30108\ui\icon_antenna_ca.paa);
                 };
+
+                class GVAR(placeAntenna) {
+                    displayName = CSTRING(placeAntenna);
+                    condition = QUOTE([ARR_2(_player,'ACRE_12FT_ANTENNA')] call EFUNC(sys_core,hasItem));
+                    statement = QUOTE([ARR_3(_player,'ACRE_12FT_ANTENNA',false)] call FUNC(deploy));
+                    showDisabled = 0;
+                    icon = QPATHTOF(data\vhf30108\ui\icon_antenna_ca.paa);
+                };
             };
         };
     };
@@ -180,4 +188,75 @@ class CfgVehicles {
             };
         };
     };
+
+    class ws38_12ft_antenna: House {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
+        scope = 2;
+        scopeCurator = 2;
+        scopeArsenal = 2;
+        displayName = "ACRE WS38 12 feet antenna";
+        model = QPATHTOEF(sys_ws38,data\Models\ws38_radio_antenna.p3d);
+        icon = QPATHTOF(data\vhf30108\ui\icon_antenna_ca.paa);
+        editorPreview = QPATHTOF(data\ws38_antenna\ui\12ft_antenna.jpg);
+        vehicleClass = "Items";
+        ace_dragging_canCarry = 1;
+        ace_dragging_carryPosition[] = {-0.2, 1, 1.3};
+        ace_dragging_carryDirection = 0;
+        ace_dragging_ignoreWeightCarry = 1;
+
+        class AcreComponents {
+            componentName = "ACRE_12FT_AERIAL_ROD";
+            mountedAntenna = "";
+            mastMount[] = {};
+        };
+
+        class ACE_Actions {
+            class ACE_MainActions {
+                selection = "interaction_point";
+                distance = 10;
+                condition = "(true)";
+                position = "[0.2,0.0,-1.5]";
+
+                class ACRE_pickup {
+                    selection = "";
+                    displayName = CSTRING(pickUp);
+                    distance = 10;
+                    condition = "true";
+                    statement = QUOTE([ARR_2(_player,_target)] call DFUNC(pickUp));
+                    showDisabled = 0;
+                    exceptions[] = {};
+                    priority = 5;
+                    //icon = "\idi\acre\addons\ace_interact\data\icons\antenna.paa";
+                };
+
+                class ACRE_connect {
+                    selection = "";
+                    displayName = CSTRING(connect);
+                    distance = 10;
+                    condition = QUOTE(!([ARR_2(_player,_target)] call DFUNC(isAntennaConnected)));
+                    statement = QUOTE(true);
+                    insertChildren = QUOTE([ARR_2(_player,_target)] call DFUNC(connectChildrenActions));
+                    showDisabled = 0;
+                    exceptions[] = {};
+                    priority = 5;
+                    icon = "\idi\acre\addons\ace_interact\data\icons\antenna.paa";
+                };
+
+                class ACRE_disconnect {
+                    selection = "";
+                    displayName = CSTRING(disconnect);
+                    distance = 10;
+                    condition = QUOTE([ARR_2(_player,_target)] call DFUNC(isAntennaConnected));
+                    statement = QUOTE([ARR_2(_player,_target)] call DFUNC(disconnect));
+                    showDisabled = 0;
+                    exceptions[] = {};
+                    priority = 5;
+                    icon = "\idi\acre\addons\ace_interact\data\icons\antenna.paa";
+                };
+            };
+        };
+    };
 };

addons/sys_gsa/CfgWeapons.hpp

@@ -31,4 +31,17 @@ class CfgWeapons {
             mass = 100;
         };
     };
+
+    class ACRE_12FT_ANTENNA: CBA_MiscItem {
+        author[] = {"S. Spartan"};
+        scope = 2;
+        displayName = "WS38 12FT Antenna";
+        descriptionShort = CSTRING(WS3812ftAntenna_description);
+        model = QPATHTOEF(sys_ws38,data\Models\ws38_aerial_bag.p3d);
+        picture = QPATHTOF(data\ws38_antenna\ui\icon_bag.paa);
+
+        class ItemInfo: CBA_MiscItem_ItemInfo {
+            mass = 30;
+        };
+    };
 };

addons/sys_gsa/fnc_deploy.sqf

@@ -32,6 +32,10 @@ switch (_gsaItem) do {
         _gsa = "vhf30108spike";
         _canDeploy = true;
     };
+    case "ACRE_12FT_ANTENNA" : {
+        _gsa = "ws38_12ft_antenna";
+        _canDeploy = true;
+    };
 };
 
 if (_canDeploy) then {

addons/sys_gsa/fnc_pickUp.sqf

@@ -56,6 +56,12 @@ switch (_classname) do {
             };
         };
     };
+    case "ws38_12ft_antenna": {
+        _item = "ACRE_12FT_ANTENNA";
+        if (_unit canAdd _item) then {
+            _canDelete = true;
+        };
+    };
 };
 
 if (_canDelete) then {

addons/sys_gsa/stringtable.xml

@@ -66,6 +66,11 @@
             <Portuguese>Cravar antena com mastro</Portuguese>
             <Turkish>Spike'ı Sopa İle Koy</Turkish>
         </Key>
+        <Key ID="STR_ACRE_sys_gsa_placeAntenna">
+            <English>Place Antenna</English>
+            <German>Antenne setzen</German>
+            <Japanese>アンテナを設置</Japanese>
+        </Key>
         <Key ID="STR_ACRE_sys_gsa_pickup">
             <English>Pick up</English>
             <Spanish>Recoger</Spanish>
@@ -183,6 +188,11 @@
             <Portuguese>Mastro da antena VHF30108</Portuguese>
             <Turkish>VHF30108 Yükseltici Çubuğu</Turkish>
         </Key>
+        <Key ID="STR_ACRE_sys_gsa_WS3812ftAntenna_description">
+            <English>12ft Antenna for Wireless Set No. 38 Mk. II</English>
+            <German>12 Fuß Antenne für Wireless Set No. 38 Mk. II</German>
+            <Japanese>Wireless Set No. 38 Mk. II用12フィートアンテナ</Japanese>
+        </Key>
         <Key ID="STR_ACRE_sys_gsa_inventoryFull">
             <English>Inventory full</English>
             <Spanish>Inventario lleno</Spanish>

addons/sys_rack/CfgAcreRacks.hpp

@@ -182,4 +182,41 @@ class CfgAcreComponents {
         };
     };
 
+    class ACRE_WS19 : ACRE_BaseRack {
+        name = "Wireless Set No. 19";
+
+        connectors[] =  {
+                            {"Antenna", ACRE_CONNECTOR_ROD},
+                            {"Audio In", ACRE_CONNECTOR_U_283},
+                            {"Audio Out", ACRE_CONNECTOR_U_283},
+                            {"Power In", ACRE_CONNECTOR_U_283},
+                            {"Radio", ACRE_CONNECTOR_CONN_12PIN}
+                        };
+        defaultComponents[] = {
+                                {0, "ACRE_12FT_AERIAL_ROD"}
+                            };
+        class Interfaces {
+            class CfgAcreDataInterface {
+                getState                    = QFUNC(getState);
+                setState                    = QFUNC(setState);
+                handleComponentMessage      = QEFUNC(sys_data,noApiSystemFunction);
+
+                initializeComponent         = QFUNC(initializeRack);
+
+                attachComponent             = QFUNC(attachComponent);
+                detachComponent             = QEFUNC(sys_data,noApiSystemFunction);
+                mountRadio                  = QFUNC(ws19MountRadio);
+                unmountRadio                = QFUNC(ws19UnmountRadio);
+                mountableRadio              = QFUNC(ws19MountableRadio);
+            };
+        };
+        class InterfaceClasses {
+            CfgAcreDataInterface = "DefaultRackInterface";
+            CfgAcreInteractInterface = "DefaultRadioInterface";
+            CfgAcreTransmissionInterface = "DefaultRadioInterface";
+            CfgAcrePhysicalInterface = "DefaultRadioInterface";
+        };
+    };
+
+
 };

addons/sys_rack/CfgVehicles.hpp

@@ -26,6 +26,11 @@ class CfgVehicles {
     };
     RADIO_ID_LIST(ACRE_SEM90)
 
+    class ACRE_WS19 : ACRE_BaseRack {
+        displayName = "Wireless Set No. 19";
+    };
+    RADIO_ID_LIST(ACRE_WS19)
+
     // Define which vehicles have racks.
     class All {
         class AcreRacks {};

addons/sys_rack/XEH_PREP.hpp

@@ -46,3 +46,4 @@ PREP_FOLDER(vrc103);
 PREP_FOLDER(vrc110);
 PREP_FOLDER(vrc111);
 PREP_FOLDER(sem90);
+PREP_FOLDER(ws19);

addons/sys_rack/ws19/__PREP__.sqf

@@ -0,0 +1,7 @@
+#include "..\script_component.hpp"
+
+TRACE_1("enter",_this);
+
+PREP_MODULE(ws19,ws19MountRadio);
+PREP_MODULE(ws19,ws19UnmountRadio);
+PREP_MODULE(ws19,ws19MountableRadio);

addons/sys_rack/ws19/fnc_ws19MountRadio.sqf

@@ -0,0 +1,27 @@
+#include "..\script_component.hpp"
+/*
+ * Author: ACRE2Team
+ * Mount radio classname
+ *
+ * Arguments:
+ * 0: Target Vehicle <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [cursorTarget] call acre_sys_rack_fnc_ws19MountRadio
+ *
+ * Public: No
+ */
+
+params ["_rackId", "", "_eventData", ""];
+
+private _radioId = _eventData;
+
+// 12 Pin Connector
+private _attributes = HASH_CREATE;
+[_rackId, 4, _radioId, 2, _attributes, false] call EFUNC(sys_components,attachComplexComponent);
+
+//Enable VAA Mode.
+[_radioId, "setState", ["powerSource", "VAU"]] call EFUNC(sys_data,dataEvent);

addons/sys_rack/ws19/fnc_ws19MountableRadio.sqf

@@ -0,0 +1,31 @@
+#include "..\script_component.hpp"
+/*
+ * Author: ACRE2Team
+ * Check if the radio is mountable in the Wireless Set No. 19 rack.
+ *
+ * Arguments:
+ * 0: Unique rack ID <STRING>
+ * 1: Event type <STRING> (Unused)
+ * 2: Event data with unique radio ID <STRING>
+ * 3: Radio data <ARRAY> (Unused)
+ *
+ * Return Value:
+ * Is radio mountable <BOOL>
+ *
+ * Example:
+ * [cursorTarget] call acre_sys_rack_fnc_ws19MountableRadio
+ *
+ * Public: No
+ */
+
+params ["_rackId", "", "_eventData", ""];
+
+if (([_rackId] call FUNC(getMountedRadio)) != "") exitWith {false}; // If a radio is already mounted we can't mount another.
+
+private _mountable = false;
+private _radioId = _eventData;
+private _baseClass = toLower (BASE_CLASS_CONFIG(_radioId));
+
+if (_baseClass in ["acre_ws38"]) then { _mountable = true; };
+
+_mountable

addons/sys_rack/ws19/fnc_ws19UnmountRadio.sqf

@@ -0,0 +1,26 @@
+#include "..\script_component.hpp"
+/*
+ * Author: ACRE2Team
+ * Unmounts the given radio from an Wireless Set No. 19 vehicle rack.
+ *
+ * Arguments:
+ * 0: Unique rack ID <STRING> <Unused>
+ * 1: Event type <STRING> (Unused)
+ * 2: Event data with unique radio ID <STRING>
+ * 3: Radio data <ARRAY> (Unused)
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [cursorTarget] call acre_sys_rack_fnc_ws19UnmountRadio
+ *
+ * Public: No
+ */
+
+params ["", "", "_eventData", ""];
+
+private _radioId = _eventData;
+
+//Enable VAA Mode.
+[_radioId, "setState", ["powerSource", "BAT"]] call EFUNC(sys_data,dataEvent);

addons/sys_radio/stringtable.xml

@@ -183,6 +183,10 @@
             <Italian>Volume attuale</Italian>
             <Japanese>現在の変更</Japanese>
         </Key>
+        <Key ID="STR_ACRE_sys_radio_ui_RadioMode">
+            <English>Radio Mode Selector</English>
+            <Japanese>ラジオモードセレクター</Japanese>
+        </Key>
         <Key ID="STR_ACRE_sys_radio_ui_Radiooff">
             <English>Radio off</English>
             <German>Funkgerät aus</German>
@@ -205,6 +209,10 @@
             <Portuguese>Canal atual</Portuguese>
             <Japanese>現在のチャンネル</Japanese>
         </Key>
+        <Key ID="STR_ACRE_sys_radio_ui_changeFrequency">
+            <English>Change Frequency</English>
+            <Japanese>周波数を変更</Japanese>
+        </Key>
         <Key ID="STR_ACRE_sys_radio_ui_CurrentChannelBlock">
             <English>Current Channel Block</English>
             <German>Aktueller Kanalblock</German>

addons/sys_sounds/CfgAcreSounds.hpp

@@ -111,5 +111,14 @@ class CfgAcreSounds {
         sound = "\idi\acre\addons\sys_sounds\sounds\baofeng\16.b64";
     };
 
+    class Acre_WS38_start {
+        sound = QPATHTOF(sounds\WS38\start.b64);
+    };
+
+    class Acre_WS38_end {
+        sound = QPATHTOF(sounds\WS38\end.b64);
+    };
+
+
 
 };