Dev v1.0.0 PR

- change shortName and displayName of radio racks and intercoms - remove file from IFA/ACRE compat that was accidentally included - update version number - update requirements
Drofseh · Jun 19, 2018 · e5bb964 · e5bb964
1 parent 4efc097
commit e5bb964
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 88 deletions.
diff --git a/Addons/FOW_ACRE2_Compat/B_LIB_AssaultPack_Base.hpp b/Addons/FOW_ACRE2_Compat/B_LIB_AssaultPack_Base.hpp
diff --git a/Addons/FOW_ACRE2_Compat/Bag_Base.hpp b/Addons/FOW_ACRE2_Compat/Bag_Base.hpp
@@ -11,6 +11,10 @@ class Bag_Base;
         };
     };
 
+    class fow_b_torn_radio_empty : fow_b_torn_radio {
+        delete TransportItems;
+    };
+
     class fow_b_us_radio : Bag_Base {
         maximumLoad = 120;
         class TransportItems {
@@ -21,6 +25,10 @@ class Bag_Base;
         };
     };
 
+    class fow_b_us_radio_empty : fow_b_us_radio {
+        delete TransportItems;
+    };
+
 class fow_b_uk_p37;
 
     class fow_b_uk_p37_radio : fow_b_uk_p37 {
@@ -33,6 +41,14 @@ class fow_b_uk_p37;
         };
     };
 
+    class fow_b_uk_p37_radio_empty : fow_b_uk_p37_radio {
+        delete TransportItems;
+    };
+
     class fow_b_uk_p37_radio_blanco : fow_b_uk_p37_radio {
         maximumLoad = 200;
     };
+
+    class fow_b_uk_p37_radio_blanco_empty : fow_b_uk_p37_radio_blanco {
+        delete TransportItems;
+    };
diff --git a/Addons/FOW_ACRE2_Compat/FOW_Boats.hpp b/Addons/FOW_ACRE2_Compat/FOW_Boats.hpp
@@ -3,7 +3,7 @@ class fow_lcvp : Boat_F {
     class AcreIntercoms {
         class Intercom_1 {
             displayName = "Crew Intercom";
-            shortName = "ICom";
+            shortName = "IntCm";
             allowedPositions[] = {"crew"};
             disabledPositions[] = {};
             limitedPositions[] = {{"cargo", "all"}};
@@ -15,8 +15,8 @@ class fow_lcvp : Boat_F {
 
     class AcreRacks {
         class Rack_1 {
-            displayName = "Vehicle Radio";
-            shortName = "Rack";
+            displayName = "Radio Set";
+            shortName = "Radio";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {"driver"};
             disabledPositions[] = {};

diff --git a/Addons/FOW_ACRE2_Compat/FOW_Planes.hpp b/Addons/FOW_ACRE2_Compat/FOW_Planes.hpp
@@ -7,7 +7,7 @@ class fow_va_plane_base : Plane_Base_F {
     class AcreIntercoms {
         class Intercom_1 {
             displayName = "Crew Intercom";
-            shortName = "ICom";
+            shortName = "IntCm";
             allowedPositions[] = {"crew"};
             disabledPositions[] = {};
             limitedPositions[] = {{"cargo", "all"}};
@@ -19,8 +19,8 @@ class fow_va_plane_base : Plane_Base_F {
 
     class AcreRacks {
         class Rack_1 {
-            displayName = "Air Radio";
-            shortName = "Air";
+            displayName = "Radio Set - Ichi";
+            shortName = "Set-1";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {"driver","copilot"};
             disabledPositions[] = {};
@@ -30,8 +30,8 @@ class fow_va_plane_base : Plane_Base_F {
             intercom[] = {"none"};
         };
         class Rack_2 {
-            displayName = "Ground Radio";
-            shortName = "Grnd";
+            displayName = "Radio Set - Ni";
+            shortName = "Set-2";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {"driver","copilot"};
             disabledPositions[] = {};
@@ -48,8 +48,8 @@ class fow_va_plane_base;
 class fow_va_f6f_base : fow_va_plane_base {
     class AcreRacks {
         class Rack_1 {
-            displayName = "Air Radio";
-            shortName = "Air";
+            displayName = "Radio Set - Ichi";
+            shortName = "Set-1";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {"driver"};
             disabledPositions[] = {};
@@ -59,8 +59,8 @@ class fow_va_f6f_base : fow_va_plane_base {
             intercom[] = {"none"};
         };
         class Rack_2 {
-            displayName = "Ground Radio";
-            shortName = "Grnd";
+            displayName = "Radio Set - Ni";
+            shortName = "Set-2";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {"driver"};
             disabledPositions[] = {};
@@ -75,8 +75,8 @@ class fow_va_f6f_base : fow_va_plane_base {
 class fow_va_a6m_base : fow_va_plane_base {
     class AcreRacks {
         class Rack_1 {
-            displayName = "Air Radio";
-            shortName = "Air";
+            displayName = "Radio Set - Ichi";
+            shortName = "Set-1";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {"driver"};
             disabledPositions[] = {};
@@ -86,8 +86,8 @@ class fow_va_a6m_base : fow_va_plane_base {
             intercom[] = {"none"};
         };
         class Rack_2 {
-            displayName = "Ground Radio";
-            shortName = "Grnd";
+            displayName = "Radio Set - Ni";
+            shortName = "Set-2";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {"driver"};
             disabledPositions[] = {};

diff --git a/Addons/FOW_ACRE2_Compat/FOW_Tanks.hpp b/Addons/FOW_ACRE2_Compat/FOW_Tanks.hpp
@@ -11,7 +11,7 @@ class fow_v_cromwell : Tank_F {
     class AcreIntercoms {
         class Intercom_1 {
             displayName = "Crew Intercom";
-            shortName = "ICom";
+            shortName = "IntCm";
             allowedPositions[] = {"crew"};
             disabledPositions[] = {};
             limitedPositions[] = {};
@@ -23,8 +23,8 @@ class fow_v_cromwell : Tank_F {
 
     class AcreRacks {
         class Rack_1 {
-            displayName = "Vehicle Radio";
-            shortName = "Rack";
+            displayName = "Radio Set";
+            shortName = "Radio";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {{"turret", {0,2}}};
             disabledPositions[] = {};
@@ -47,7 +47,7 @@ class fow_v_lvta2 : Tank_F {
     class AcreIntercoms {
         class Intercom_1 {
             displayName = "Crew Intercom";
-            shortName = "ICom";
+            shortName = "IntCm";
             allowedPositions[] = {"crew", {"cargo", 0}};
             disabledPositions[] = {};
             limitedPositions[] = {};
@@ -59,8 +59,8 @@ class fow_v_lvta2 : Tank_F {
 
     class AcreRacks {
         class Rack_1 {
-            displayName = "Vehicle Radio";
-            shortName = "Rack";
+            displayName = "Radio Set";
+            shortName = "Radio";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {"driver", {"cargo", 0}};
             disabledPositions[] = {};
@@ -83,7 +83,7 @@ class fow_v_m4a2 : Tank_F {
     class AcreIntercoms {
         class Intercom_1 {
             displayName = "Crew Intercom";
-            shortName = "ICom";
+            shortName = "IntCm";
             allowedPositions[] = {"crew"};
             disabledPositions[] = {};
             limitedPositions[] = {};
@@ -95,8 +95,8 @@ class fow_v_m4a2 : Tank_F {
 
     class AcreRacks {
         class Rack_1 {
-            displayName = "Vehicle Radio";
-            shortName = "Rack";
+            displayName = "Radio Set";
+            shortName = "Radio";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {{"turret", {0,1}}};
             disabledPositions[] = {};
@@ -119,7 +119,7 @@ class fow_v_m5a1 : Tank_F {
     class AcreIntercoms {
         class Intercom_1 {
             displayName = "Crew Intercom";
-            shortName = "ICom";
+            shortName = "IntCm";
             allowedPositions[] = {"crew"};
             disabledPositions[] = {};
             limitedPositions[] = {};
@@ -131,8 +131,8 @@ class fow_v_m5a1 : Tank_F {
 
     class AcreRacks {
         class Rack_1 {
-            displayName = "Vehicle Radio";
-            shortName = "Rack";
+            displayName = "Radio Set";
+            shortName = "Radio";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {{"turret", {0,1}}};
             disabledPositions[] = {};
@@ -155,7 +155,7 @@ class fow_v_panther : Tank_F {
     class AcreIntercoms {
         class Intercom_1 {
             displayName = "Crew Intercom";
-            shortName = "ICom";
+            shortName = "IntCm";
             allowedPositions[] = {"crew"};
             disabledPositions[] = {};
             limitedPositions[] = {};
@@ -167,8 +167,8 @@ class fow_v_panther : Tank_F {
 
     class AcreRacks {
         class Rack_1 {
-            displayName = "Vehicle Radio";
-            shortName = "Rack";
+            displayName = "Radio Set";
+            shortName = "Radio";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {{"turret", {0,1}}};
             disabledPositions[] = {};
@@ -191,7 +191,7 @@ class fow_v_type95_HaGo : Tank_F {
     class AcreIntercoms {
         class Intercom_1 {
             displayName = "Crew Intercom";
-            shortName = "ICom";
+            shortName = "IntCm";
             allowedPositions[] = {"crew"};
             disabledPositions[] = {};
             limitedPositions[] = {};

diff --git a/Addons/FOW_ACRE2_Compat/FOW_Wheeled.hpp b/Addons/FOW_ACRE2_Compat/FOW_Wheeled.hpp
@@ -28,8 +28,8 @@ class fow_v_sdkfz_222 : Wheeled_APC_F {
 
     class AcreRacks {
         class Rack_1 {
-            displayName = "Vehicle Radio";
-            shortName = "Rack";
+            displayName = "Radio Set";
+            shortName = "Radio";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {"gunner"};
             disabledPositions[] = {};
@@ -53,8 +53,8 @@ class fow_v_sdkfz_234_1 : Wheeled_APC_F {
 
     class AcreRacks {
         class Rack_1 {
-            displayName = "Vehicle Radio";
-            shortName = "Rack";
+            displayName = "Radio Set";
+            shortName = "Radio";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {"driver"};
             disabledPositions[] = {};

diff --git a/Addons/FOW_ACRE2_Compat/FOW_WheeledTracked.hpp b/Addons/FOW_ACRE2_Compat/FOW_WheeledTracked.hpp
@@ -11,8 +11,8 @@ class fow_v_sdkfz_250_base : Tank_F {
 
     class AcreRacks {
         class Rack_1 {
-            displayName = "Vehicle Radio";
-            shortName = "Rack";
+            displayName = "Radio Set";
+            shortName = "Radio";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {"driver", {"cargo", 0}};
             disabledPositions[] = {};
@@ -36,8 +36,8 @@ class fow_v_sdkfz_251 : Tank_F {
 
     class AcreRacks {
         class Rack_1 {
-            displayName = "Vehicle Radio";
-            shortName = "Rack";
+            displayName = "Radio Set";
+            shortName = "Radio";
             componentname = "ACRE_VRC64";
             allowedPositions[] = {"driver", {"cargo", 0}};
             disabledPositions[] = {};

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 </p>
 <p align="left">
     <a href="https://github.com/Drofseh/FOW_ACRE2_Compat/releases/latest">
-        <img src="https://img.shields.io/badge/Version-0.3.0-blue.svg" alt="FOW/ACRE2 Compat">
+        <img src="https://img.shields.io/badge/Version-1.0.0-blue.svg" alt="FOW/ACRE2 Compat">
     </a>
 </p>
 A mod for ARMA3 that adds compatibility between the ACRE2 mod and the FOW mod, particularly for vehicle radios, intercoms, and infantry phones.
@@ -29,8 +29,8 @@ The correct radio operator seat must still be used to access the radio GUI and c
 
 #### Requirements
 * FOW Release V
-* ACRE2 v2.5.1.984 dev build
-* ACE3 v3.12.1
+* ACRE2 v2.6.0.990
+* ACE3 v3.12.2
 
 #### Releases
 Releases can be found [here](https://github.com/Drofseh/FOW_ACRE2_Compat/releases).

diff --git a/mod.cpp b/mod.cpp
@@ -1,6 +1,6 @@
 name = "FOW ACRE2 Compatibility";
 author = "Wilhelm Haas (Drofseh)";
-description = "FOW ACRE2 Compatibility - Version 0.3.0";
+description = "FOW ACRE2 Compatibility - Version 1.0.0";
 overview = "Provides compatibility between FOW vehicles and ACRE2 radios.";
 logo = "logo.paa";
 logoOver = "logo.paa";