Add ACE Arsenal Stats (#1053)

IDI-Systems · Apr 8, 2021 · d113d03 · d113d03
1 parent fbdc2f3
commit d113d03
Show file tree

Hide file tree

Showing 14 changed files with 174 additions and 0 deletions.
diff --git a/addons/ace_interact/XEH_PREP.hpp b/addons/ace_interact/XEH_PREP.hpp
@@ -1,4 +1,7 @@
 PREP(actionSetMTT);
+PREP(arsenalStats_externalSpeaker);
+PREP(arsenalStats_frequencyRange);
+PREP(arsenalStats_transmitPower);
 PREP(generateConnectors);
 PREP(generateConnectorActions);
 PREP(generateConnectorList);

diff --git a/addons/ace_interact/ace_arsenal_stats.hpp b/addons/ace_interact/ace_arsenal_stats.hpp
@@ -0,0 +1,39 @@
+ class ace_arsenal_stats {
+    class statBase;
+    class GVAR(frequencyRange): statBase {
+        scope = 2;
+        stats[] = {QEGVAR(arsenalStats,frequencyMin), QEGVAR(arsenalStats,frequencyMax)};
+        displayName= CSTRING(arsenalStats_frequencyRange);
+        showText = 1;
+        textStatement = QUOTE(call FUNC(arsenalStats_frequencyRange));
+        condition = QUOTE((getNumber(_this select 1 >> 'acre_isRadio')) == 1);
+        tabs[] = {{}, {7}}; // Misc-Items on right tab
+    };
+    class GVAR(transmitPower): statBase {
+        scope = 2;
+        stats[] = {QEGVAR(arsenalStats,transmitPower)};
+        displayName= CSTRING(arsenalStats_transmitPower);
+        showText = 1;
+        textStatement = QUOTE(call FUNC(arsenalStats_transmitPower));
+        condition = QUOTE((getNumber(_this select 1 >> 'acre_isRadio')) == 1);
+        tabs[] = {{}, {7}};
+    };
+    class GVAR(effectiveRange): statBase {
+        scope = 2;
+        stats[] = {QEGVAR(arsenalStats,effectiveRange)};
+        displayName= CSTRING(arsenalStats_effectiveRange);
+        showText = 1;
+        textStatement = QUOTE(getText ((_this select 1) >> (_this select 0 select 0)));
+        condition = QUOTE((getNumber(_this select 1 >> 'acre_isRadio')) == 1);
+        tabs[] = {{}, {7}};
+    };
+    class GVAR(externalSpeaker): statBase {
+        scope = 2;
+        stats[] = {QEGVAR(arsenalStats,externalSpeaker)};
+        displayName= CSTRING(arsenalStats_externalSpeaker);
+        showText = 1;
+        textStatement = QUOTE(call FUNC(arsenalStats_externalSpeaker));
+        condition = QUOTE((getNumber(_this select 1 >> 'acre_isRadio')) == 1);
+        tabs[] = {{}, {7}};
+    };
+ };
diff --git a/addons/ace_interact/config.cpp b/addons/ace_interact/config.cpp
@@ -16,3 +16,4 @@ class CfgPatches {
 
 #include "CfgVehicles.hpp"
 #include "CfgEventHandlers.hpp"
+#include "ace_arsenal_stats.hpp"
diff --git a/addons/ace_interact/fnc_arsenalStats_externalSpeaker.sqf b/addons/ace_interact/fnc_arsenalStats_externalSpeaker.sqf
@@ -0,0 +1,22 @@
+#include "script_component.hpp"
+/*
+ * Author: PabstMirror
+ * Shows arsenal stats
+ *
+ * Arguments:
+ * 0: Stats Array of config strings <ARRAY>
+ * 1: Radio Cfg <CONFIG>
+ *
+ * Return Value:
+ * <STRING>
+ *
+ * Example:
+ * [["acre_arsenalStats_externalSpeaker"], configFile >> "CfgWeapons" >> "ACRE_PRC117F"] call acre_ace_interact_fnc_arsenalStats_externalSpeaker
+ *
+ * Public: No
+ */
+
+params ["_statsArray", "_itemCfg"];
+
+private _val = getNumber (_itemCfg >> (_statsArray select 0));
+if (_val > 0) then { localize "str_lib_info_yes" } else { localize "str_lib_info_no" }
diff --git a/addons/ace_interact/fnc_arsenalStats_frequencyRange.sqf b/addons/ace_interact/fnc_arsenalStats_frequencyRange.sqf
@@ -0,0 +1,34 @@
+#include "script_component.hpp"
+/*
+ * Author: PabstMirror
+ * Shows arsenal stats for frequency range
+ *
+ * Arguments:
+ * 0: Stats Array of config strings <ARRAY>
+ * 1: Radio Cfg <CONFIG>
+ *
+ * Return Value:
+ * <STRING>
+ *
+ * Example:
+ * [["..min", "...max"], configFile >> "CfgWeapons" >> "ACRE_PRC117F"] call acre_ace_interact_fnc_arsenalStats_frequencyRange
+ *
+ * Public: No
+ */
+
+params ["_statsArray", "_itemCfg"];
+
+_statsArray = _statsArray apply {
+    private _value = getNumber (_itemCfg >> _x);
+    switch (true) do {
+        case (_value == 0): {"?"};
+        case (_value < 1e6): {format ["%1kHz", _value / 1e3]};
+        case (_value < 1e9): {format ["%1MHz", _value / 1e6]};
+        default {format ["%1GHz", _value / 1e9]};
+    };
+};
+
+// note: doesn't handle non-contiguous ranges,
+// and just because 2 radios are on same freq doesn't mean their bandwidth/modulation will be compatible..
+
+format ["%1 - %2", _statsArray#0, _statsArray#1]
diff --git a/addons/ace_interact/fnc_arsenalStats_transmitPower.sqf b/addons/ace_interact/fnc_arsenalStats_transmitPower.sqf
@@ -0,0 +1,24 @@
+#include "script_component.hpp"
+/*
+ * Author: PabstMirror
+ * Shows arsenal stats
+ *
+ * Arguments:
+ * 0: Stats Array of config strings <ARRAY>
+ * 1: Radio Cfg <CONFIG>
+ *
+ * Return Value:
+ * <STRING>
+ *
+ * Example:
+ * [["...power"], configFile >> "CfgWeapons" >> "ACRE_PRC117F"] call acre_ace_interact_fnc_arsenalStats_transmitPower
+ *
+ * Public: No
+ */
+
+params ["_statsArray", "_itemCfg"];
+
+private _power = getNumber (_itemCfg >> _statsArray select 0); //in milliwatts
+
+if (_power == 0) exitWith {"?"};
+if (_power >= 1e3) then { format ["%1W", _power/1000] } else { format ["%1mW",_power] }
diff --git a/addons/ace_interact/stringtable.xml b/addons/ace_interact/stringtable.xml
@@ -186,5 +186,17 @@
             <Chinesesimp>把天线往上弯曲</Chinesesimp>
             <Portuguese>Dobrar antena para cima</Portuguese>
         </Key>
+        <Key ID="STR_ACRE_ace_interact_arsenalStats_frequencyRange">
+            <English>Frequency Range</English>
+        </Key>
+        <Key ID="STR_ACRE_ace_interact_arsenalStats_transmitPower">
+            <English>Transmit Power</English>
+        </Key>
+        <Key ID="STR_ACRE_ace_interact_arsenalStats_effectiveRange">
+            <English>Effective Range (Urban)</English>
+        </Key>
+        <Key ID="STR_ACRE_ace_interact_arsenalStats_externalSpeaker">
+            <English>External Speaker</English>
+        </Key>
     </Package>
 </Project>
diff --git a/addons/sys_prc117f/CfgWeapons.hpp b/addons/sys_prc117f/CfgWeapons.hpp
@@ -20,6 +20,11 @@ class CfgWeapons {
         class Library {
             libTextDesc = QUOTE(NAME_PRC117F);
         };
+
+        EGVAR(arsenalStats,frequencyMin) = 30e6;
+        EGVAR(arsenalStats,frequencyMax) = 512e6;
+        EGVAR(arsenalStats,transmitPower) = 20000;
+        EGVAR(arsenalStats,effectiveRange) = "20+km (10-20km)";
     };
 
     RADIO_ID_LIST(ACRE_PRC117F)

diff --git a/addons/sys_prc148/CfgWeapons.hpp b/addons/sys_prc148/CfgWeapons.hpp
@@ -19,6 +19,12 @@ class CfgWeapons {
         class Library {
             libTextDesc = QUOTE(NAME_PRC148);
         };
+
+        EGVAR(arsenalStats,frequencyMin) = 30e6;
+        EGVAR(arsenalStats,frequencyMax) = 512e6;
+        EGVAR(arsenalStats,transmitPower) = 5000;
+        EGVAR(arsenalStats,effectiveRange) = "5-7km (3-5km)";
+        EGVAR(arsenalStats,externalSpeaker) = 1;
     };
     /*
     class ACRE_PRC148_UHF: ACRE_BaseRadio {

diff --git a/addons/sys_prc152/CfgWeapons.hpp b/addons/sys_prc152/CfgWeapons.hpp
@@ -19,6 +19,12 @@ class CfgWeapons {
         class Library {
             libTextDesc = QUOTE(NAME_PRC152);
         };
+
+        EGVAR(arsenalStats,frequencyMin) = 30e6;
+        EGVAR(arsenalStats,frequencyMax) = 512e6;
+        EGVAR(arsenalStats,transmitPower) = 5000;
+        EGVAR(arsenalStats,effectiveRange) = "5-7km (3-5km)";
+        EGVAR(arsenalStats,externalSpeaker) = 1;
     };
 
     RADIO_ID_LIST(ACRE_PRC152)

diff --git a/addons/sys_prc343/CfgWeapons.hpp b/addons/sys_prc343/CfgWeapons.hpp
@@ -22,6 +22,11 @@ class CfgWeapons {
         class Library {
             libTextDesc = QUOTE(NAME_PRC343);
         };
+
+        EGVAR(arsenalStats,frequencyMin) = 2.4e9;
+        EGVAR(arsenalStats,frequencyMax) = 2.483e9;
+        EGVAR(arsenalStats,transmitPower) = 100;
+        EGVAR(arsenalStats,effectiveRange) = "850m (400m)";
     };
 
     RADIO_ID_LIST(ACRE_PRC343)

diff --git a/addons/sys_prc77/CfgWeapons.hpp b/addons/sys_prc77/CfgWeapons.hpp
@@ -20,6 +20,11 @@ class CfgWeapons {
         class Library {
             libTextDesc = QUOTE(NAME_PRC77);
         };
+
+        EGVAR(arsenalStats,frequencyMin) = 30e6;
+        EGVAR(arsenalStats,frequencyMax) = 80e6;
+        EGVAR(arsenalStats,transmitPower) = 4000; // depends on frequency, but this is max
+        EGVAR(arsenalStats,effectiveRange) = "3-5km (1-3km)";
     };
 
     RADIO_ID_LIST(ACRE_PRC77)

diff --git a/addons/sys_sem52sl/CfgWeapons.hpp b/addons/sys_sem52sl/CfgWeapons.hpp
@@ -20,6 +20,12 @@ class CfgWeapons {
         class Library {
             libTextDesc = QUOTE(NAME_SEM52SL);
         };
+
+        EGVAR(arsenalStats,frequencyMin) = 46e3;
+        EGVAR(arsenalStats,frequencyMax) = 65.975e6;
+        EGVAR(arsenalStats,transmitPower) = 1000;
+        EGVAR(arsenalStats,effectiveRange) = "2-4km (1-2km)"; // not sure?
+        EGVAR(arsenalStats,externalSpeaker) = 1;
     };
 
     RADIO_ID_LIST(ACRE_SEM52SL)

diff --git a/addons/sys_sem70/CfgWeapons.hpp b/addons/sys_sem70/CfgWeapons.hpp
@@ -21,6 +21,12 @@ class CfgWeapons {
         class Library {
             libTextDesc = QUOTE(NAME_SEM70);
         };
+
+        EGVAR(arsenalStats,frequencyMin) = 46e3;
+        EGVAR(arsenalStats,frequencyMax) = 65.975e6;
+        EGVAR(arsenalStats,transmitPower) = 4000;
+        EGVAR(arsenalStats,effectiveRange) = "3-5km (1-3km)"; // not sure?
+        EGVAR(arsenalStats,externalSpeaker) = 1;
     };
 
     RADIO_ID_LIST(ACRE_SEM70)