Merge branch 'master' of github.com:KoffeinFlummi/ACE3

addons/logistics_uavbattery/CfgVehicles.hpp

@@ -1,29 +1,29 @@
 class CfgVehicles {
-  class Helicopter_Base_F;
+    class Helicopter_Base_F;
-  class UAV_01_base_F: Helicopter_Base_F {
+    class UAV_01_base_F: Helicopter_Base_F {
-    class ACE_Actions {
+        class ACE_Actions {
-      class ACE_MainActions {
+            class ACE_MainActions {
-        class GVAR(RefuelUAV) {
+                class GVAR(RefuelUAV) {
-          displayName = "$STR_ACE_logistics_uavbattery_Recharge";
+                    displayName = "$STR_ACE_logistics_uavbattery_Recharge";
-          distance = 4;
+                    distance = 4;
-          condition = QUOTE([ARR_2(_player, _target)] call FUNC(canRefuelUAV));
+                    condition = QUOTE([ARR_2(_player, _target)] call FUNC(canRefuelUAV));
-          statement = QUOTE([ARR_2(_player, _target)] call FUNC(refuelUAV));
+                    statement = QUOTE([ARR_2(_player, _target)] call FUNC(refuelUAV));
-          showDisabled = 0; \
+                    showDisabled = 0; \
-          priority = 1.245; \
+                    priority = 1.245; \
-          icon = QUOTE(PATHTOF(ui\UAV_battery.paa));
+                    icon = QUOTE(PATHTOF(ui\UAV_battery_ca.paa));
+                };
+            };
         };
-      };
     };
-  };
 
-  // Misc box content
+    // Misc box content
-  class Box_NATO_Support_F;
+    class Box_NATO_Support_F;
-  class ACE_Box_Misc: Box_NATO_Support_F {
+    class ACE_Box_Misc: Box_NATO_Support_F {
-    class TransportItems {
+        class TransportItems {
-      class _xx_ACE_UAVBattery {
+            class _xx_ACE_UAVBattery {
-        count = 6;
+                count = 6;
-        name = "ACE_UAVBattery";
+                name = "ACE_UAVBattery";
-      };
+            };
+        };
     };
-  };
 };

addons/logistics_uavbattery/CfgWeapons.hpp

@@ -1,15 +1,15 @@
 class CfgWeapons {
-  class InventoryItem_Base_F;
+    class InventoryItem_Base_F;
-  class ACE_ItemCore;
+    class ACE_ItemCore;
 
-  class ACE_UAVBattery: ACE_ItemCore {
+    class ACE_UAVBattery: ACE_ItemCore {
-    scope = 2;
+        scope = 2;
-    displayName = "$STR_ACE_logistics_uavbattery_Battery_Name";
+        displayName = "$STR_ACE_logistics_uavbattery_Battery_Name";
-    descriptionShort = "$STR_ACE_logistics_uavbattery_Battery_Description";
+        descriptionShort = "$STR_ACE_logistics_uavbattery_Battery_Description";
-    model = QUOTE(PATHTOF(models\ace_battery.p3d));
+        model = QUOTE(PATHTOF(models\ace_battery.p3d));
-    picture = QUOTE(PATHTOF(ui\UAV_battery.paa));
+        picture = QUOTE(PATHTOF(ui\UAV_battery_ca.paa));
-    class ItemInfo: InventoryItem_Base_F {
+        class ItemInfo: InventoryItem_Base_F {
-      mass = 20;
+            mass = 20;
+        };
     };
-  };
 };

addons/missileguidance/CfgVehicles.hpp

@@ -5,7 +5,7 @@ class CfgVehicles {
         class Turrets {
             class MainTurret;
         };
-    }
+    };
 
     class ACE_Comanche_Test : B_Heli_Attack_01_F {
 		displayName = "ACE_Comanche_Test";