Cleanup

README.md

@@ -3,15 +3,15 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/acemod/ACE3/releases">
-        <img src="https://img.shields.io/badge/Version-3.5.0-blue.svg?style=flat-square" alt="ACE3 Version">
-    </a>
-    <a href="https://github.com/acemod/ACE3/releases/download/v3.5.0/ace3_3.5.0.zip">
-        <img src="https://img.shields.io/badge/Download-72.6_MB-green.svg?style=flat-square" alt="ACE3 Download">
+    <a href="https://github.com/acemod/ACE3/releases/latest">
+        <img src="https://img.shields.io/badge/Version-3.5.1-blue.svg?style=flat-square" alt="ACE3 Version">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">
     </a>
+    <a href="https://github.com/acemod/ACE3/releases">
+        <img src="https://img.shields.io/github/downloads/acemod/ACE3/total.svg?style=flat-square&label=Downloads" alt="ACE3 Downloads">
+    </a>
     <a href="https://forums.bistudio.com/topic/181341-ace3-a-collaborative-merger-between-agm-cse-and-ace/?p=2859670">
         <img src="https://img.shields.io/badge/BIF-Thread-lightgrey.svg?style=flat-square" alt="BIF Thread">
     </a>

addons/attach/functions/fnc_getChildrenAttachActions.sqf

@@ -8,7 +8,7 @@
  * 1: Player <OBJECT>
  *
  * Return Value:
- * ChildActiosn<ARRAY>
+ * ChildActions <ARRAY>
  *
  * Example:
  * [player, player] call ace_attach_fnc_getChildrenAttachActions

addons/captives/functions/fnc_canStopEscorting.sqf

@@ -4,6 +4,7 @@
  *
  * Arguments:
  * 0: caller (player) <OBJECT>
+ * 1: target <OBJECT> (optional)
  *
  * Return Value:
  * The return value <BOOL>

addons/cargo/functions/fnc_canUnloadItem.sqf

@@ -5,7 +5,7 @@
  * Arguments:
  * 0: loaded Object <OBJECT>
  * 1: Object <OBJECT>
- * 2: Unloader (player) (optional)<OBJECT>
+ * 2: Unloader (player) <OBJECT> (optional)
  *
  * Return Value:
  * Can be unloaded <BOOL>

addons/common/functions/fnc_displayTextStructured.sqf

@@ -6,7 +6,7 @@
  * 0: Text <ANY>
  * 1: Size of the textbox <NUMBER> (default: 1.5)
  * 2: Target Unit. Will only display if target is the player controlled object <OBJECT> (default: ACE_player)
- * 3: Custom Width <NUMBER>(optional)
+ * 3: Custom Width <NUMBER> (optional)
  *
  * Return Value:
  * None

addons/common/functions/fnc_dumpArray.sqf

@@ -4,7 +4,7 @@
  *
  * Arguments:
  * 0: Array to be dumped <ARRAY>
- * 1: Depth <NUMBER>(optional)
+ * 1: Depth <NUMBER> (optional)
  *
  * Return Value:
  * None

addons/common/functions/fnc_findUnloadPosition.sqf

@@ -6,9 +6,9 @@
  * Arguments:
  * 0: Source Vehicle <OBJECT>
  * 1: Cargo Classname <STRING>
- * 2: Unloader (player) <OBJECT>(optional)
- * 3: Max Distance (meters) <NUMBER>(optional)
- * 4: Check Vehicle is Stable <BOOL>(optional)
+ * 2: Unloader (player) <OBJECT> (optional)
+ * 3: Max Distance (meters) <NUMBER> (optional)
+ * 4: Check Vehicle is Stable <BOOL> (optional)
  *
  * Return Value:
  * Unload PositionAGL (Can Be [] if no valid pos found) <ARRAY>

addons/common/functions/fnc_showHud.sqf

@@ -4,8 +4,8 @@
  * Bitwise AND Logic (a single false in a mask will make it false)
  *
  * Arguments:
- * 0: Source ID <STRING>(optional)
- * 1: Show Hud Bool Array (8 to set, empty to remove) <ARRAY>(optional)
+ * 0: Source ID <STRING> (optional)
+ * 1: Show Hud Bool Array (8 to set, empty to remove) <ARRAY> (optional)
  * - [hud, info, radar, compass, direction, menu, group, cursors]
  * - hud: Boolean - show scripted HUD (same as normal showHUD true/false)
  * - info: Boolean - show vehicle + soldier info (hides weapon info from the HUD as well)

addons/common/functions/fnc_unloadPersonLocal.sqf

@@ -5,7 +5,7 @@
  * Arguments:
  * 0: unit to unload <OBJECT>
  * 1: Vehicle <OBJECT>
- * 2: Unloader (player) <OBJECT>(optional)
+ * 2: Unloader (player) <OBJECT> (optional)
  *
  * Return Value:
  * Returns true if succesfully unloaded person <BOOL>

addons/disarming/functions/fnc_disarmDropItems.sqf

@@ -7,7 +7,7 @@
  * 0: caller (player) <OBJECT>
  * 1: target <OBJECT>
  * 2: classnamess <ARRAY>
- * 3: Do Not Drop Ammo <BOOL>(optional)
+ * 3: Do Not Drop Ammo <BOOL> (optional)
  *
  * Return Value:
  * Nothing

addons/hearing/functions/fnc_updateVolume.sqf

@@ -4,7 +4,7 @@
  *
  * Arguments:
  * 0: Args <ARRAY>
- * -----0: Just update volume (skip ringing/recovery) <BOOL>(optional)
+ * -----0: Just update volume (skip ringing/recovery) <BOOL> (optional)
  *
  * Return Value:
  * None

addons/interact_menu/functions/fnc_createAction.sqf

@@ -9,12 +9,12 @@
  * 2: Icon <STRING>
  * 3: Statement <CODE>
  * 4: Condition <CODE>
- * 5: Insert children code <CODE> (Optional)
- * 6: Action parameters <ANY> (Optional)
- * 7: Position (Position array, Position code or Selection Name) <ARRAY>, <CODE> or <STRING> (Optional)
- * 8: Distance <NUMBER> (Optional)
- * 9: Other parameters [showDisabled,enableInside,canCollapse,runOnHover,doNotCheckLOS] <ARRAY> (Optional)
- * 10: Modifier function <CODE> (Optional)
+ * 5: Insert children code <CODE> (optional)
+ * 6: Action parameters <ANY> (optional)
+ * 7: Position (Position array, Position code or Selection Name) <ARRAY>, <CODE> or <STRING> (optional)
+ * 8: Distance <NUMBER> (optional)
+ * 9: Other parameters [showDisabled,enableInside,canCollapse,runOnHover,doNotCheckLOS] <ARRAY> (optional)
+ * 10: Modifier function <CODE> (optional)
  *
  * Return Value:
  * Action <ARRAY>

addons/microdagr/functions/fnc_openDisplay.sqf

@@ -3,7 +3,7 @@
  * Changes the display mode of the microDAGR
  *
  * Arguments:
- * 0: Display Mode to show the microDAGR in <NUMBER>(optional)
+ * 0: Display Mode to show the microDAGR in <NUMBER> (optional)
  *
  * Return Value:
  * None

addons/mk6mortar/functions/fnc_loadMagazineTimer.sqf

@@ -6,7 +6,7 @@
  * 0: static <OBJECT>
  * 1: unit <OBJECT>
  * 2: time to load <NUMBER>
- * 3: magazineClassOptional (optional)<STRING>
+ * 3: magazineClassOptional <STRING> (optional)
  *
  * Return Value:
  * None

addons/rearm/CfgVehicles.hpp

@@ -14,8 +14,8 @@
         };
 
 #define MACRO_REARM_TRUCK_ACTIONS \
-        class ACE_Actions : ACE_Actions { \
-            class ACE_MainActions : ACE_MainActions { \
+        class ACE_Actions: ACE_Actions { \
+            class ACE_MainActions: ACE_MainActions { \
                 class GVAR(ReadSupplyCounter) { \
                     displayName = CSTRING(ReadSupplyCounter); \
                     distance = REARM_ACTION_DISTANCE; \

optionals/compat_adr_97/$PBOPREFIX$

@@ -0,0 +1 @@
+z\ace\addons\compat_adr_90

optionals/compat_adr_97/CfgAmmo.hpp

@@ -0,0 +1,14 @@
+class CfgAmmo {
+    class BulletBase;
+    class B_570x28_Ball: BulletBase {
+        ACE_caliber = 5.7;
+        ACE_bulletLength = 21.6; // http://blog.thejustnation.org/2011/04/5-7x28mm-ammo-review/
+        ACE_bulletMass = 2; // based on the SS190
+        ACE_ballisticCoefficients[] = {0.177}; //http://m.delphiforums.com/autogun/messages/5267/7
+        ACE_velocityBoundaries[] = {};
+        ACE_standardAtmosphere = "ASM"; // 50/50 chance to get it right
+        ACE_dragModel = 7;
+        ACE_muzzleVelocities[] = {716,776};
+        ACE_barrelLengths[] = {264,407};
+    };
+};

optionals/compat_adr_97/CfgMagazines.hpp

@@ -0,0 +1,7 @@
+class CfgMagazines {
+    class CA_Magazine;
+    class 50Rnd_570x28_SMG_03: CA_Magazine {
+        displayName = CSTRING(P90_Mag_Name);
+        descriptionShort = CSTRING(P90_Mag_DescriptionShort);
+    };
+};

optionals/compat_adr_97/CfgWeapons.hpp

@@ -0,0 +1,67 @@
+class CfgWeapons {
+
+    class Rifle_Base_F;
+    class SMG_03_TR_BASE: Rifle_Base_F {
+        ACE_barrelTwist = 228.6; // 1:9 inch twist
+        ACE_barrelLenght = 407;
+        ACE_twistDirection = 1;
+        modes[]= {
+            "Single"
+        };
+    };
+    class SMG_03_TR_black: SMG_03_TR_BASE{
+        displayName = CSTRING(PS90_TR_Black_Name);
+    };
+    class SMG_03_TR_khaki: SMG_03_TR_black {
+        displayName = CSTRING(PS90_TR_Khaki_Name);
+    };
+    class SMG_03_TR_camo: SMG_03_TR_black {
+        displayName = CSTRING(PS90_TR_Camo_Name);
+    };
+    class SMG_03_TR_hex: SMG_03_TR_BASE {
+        displayName = CSTRING(PS90_TR_Hex_Name);
+    };
+    class SMG_03_black: SMG_03_TR_BASE {
+        displayName = CSTRING(PS90_Black_Name);
+    };
+    class SMG_03_khaki: SMG_03_black {
+        displayName = CSTRING(PS90_Khaki_Name);
+    };
+    class SMG_03_camo: SMG_03_black {
+        displayName = CSTRING(PS90_Camo_Name);
+    };
+    class SMG_03_hex: SMG_03_black {
+        displayName = CSTRING(PS90_Hex_Name);
+    };
+    class SMG_03C_BASE: SMG_03_TR_BASE {
+        ACE_barrelLenght = 264;
+        modes[]= {
+            "Single",
+            "FullAuto"
+        };
+    };
+    class SMG_03C_TR_black: SMG_03C_BASE {
+        displayName = CSTRING(P90_TR_Black_Name);
+    };
+    class SMG_03C_TR_khaki: SMG_03C_TR_black {
+        displayName = CSTRING(P90_TR_Khaki_Name);
+    };
+    class SMG_03C_TR_camo: SMG_03C_TR_black {
+        displayName = CSTRING(P90_TR_Camo_Name);
+    };
+    class SMG_03C_TR_hex: SMG_03C_TR_black {
+        displayName = CSTRING(P90_TR_Hex_Name);
+    };
+    class SMG_03C_black: SMG_03C_Base {
+        displayName = CSTRING(P90_Black_Name);
+    };
+    class SMG_03C_khaki: SMG_03C_black {
+        displayName = CSTRING(P90_Khaki_Name);
+    };
+    class SMG_03C_camo: SMG_03C_black {
+        displayName = CSTRING(P90_Camo_Name);
+    };
+    class SMG_03C_hex: SMG_03C_black {
+        displayName = CSTRING(P90_Hex_Name);
+    };
+};

optionals/compat_adr_97/config.cpp

@@ -0,0 +1,18 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"A3_Weapons_F_Mod"};
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"Nic547"};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgWeapons.hpp"
+#include "CfgAmmo.hpp"
+#include "CfgMagazines.hpp"

optionals/compat_adr_97/script_component.hpp

@@ -0,0 +1,5 @@
+#define COMPONENT compat_adr_97
+
+#include "\z\ace\addons\main\script_mod.hpp"
+
+#include "\z\ace\addons\main\script_macros.hpp"