Merge branch 'release'

README.md

@@ -3,10 +3,10 @@
 </p>
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases">
-        <img src="https://img.shields.io/badge/Version-3.3.0-blue.svg" alt="ACE3 Version">
+        <img src="https://img.shields.io/badge/Version-3.3.1-blue.svg" alt="ACE3 Version">
     </a>
-    <a href="https://github.com/acemod/ACE3/releases/download/v3.3.0/ace3_3.3.0.zip">
+    <a href="https://github.com/acemod/ACE3/releases/download/v3.3.1/ace3_3.3.1.zip">
-        <img src="http://img.shields.io/badge/Download-56.5_MB-green.svg" alt="ACE3 Download">
+        <img src="http://img.shields.io/badge/Download-62.0_MB-green.svg" alt="ACE3 Download">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="http://img.shields.io/github/issues-raw/acemod/ACE3.svg?label=Issues" alt="ACE3 Issues">

addons/cargo/CfgVehicles.hpp

@@ -10,6 +10,7 @@ class CfgVehicles {
         isGlobal = 1;
         isTriggerActivated = 0;
         author = ECSTRING(common,ACETeam);
+
         class Arguments {
             class enable {
                 displayName = CSTRING(ModuleSettings_enable);
@@ -18,13 +19,13 @@ class CfgVehicles {
                 defaultValue = 1;
             };
         };
+
         class ModuleDescription {
             description = CSTRING(SettingsModule_Description);
             sync[] = {};
         };
     };
 
-
     class LandVehicle;
     class Car: LandVehicle {
         GVAR(space) = 4;
@@ -39,6 +40,7 @@ class CfgVehicles {
             };*/
         };
     };
+
     class Tank: LandVehicle {
         GVAR(space) = 4;
         GVAR(hasCargo) = 1;
@@ -49,36 +51,155 @@ class CfgVehicles {
         GVAR(space) = 8;
         GVAR(hasCargo) = 1;
     };
+
+    // hemets
     class Truck_01_base_F: Truck_F {
-        GVAR(space) = 20;
+        GVAR(space) = 8;
-        GVAR(hasCargo) = 1;
     };
-    class B_Truck_01_box_F: Truck_01_base_F {
+    class B_Truck_01_transport_F: Truck_01_base_F {
+        GVAR(space) = 20;
+    };
+    class B_Truck_01_covered_F: B_Truck_01_transport_F {
+        GVAR(space) = 20;
+    };
+    class B_Truck_01_mover_F: B_Truck_01_transport_F {
+        GVAR(space) = 4;
+    };
+    class B_Truck_01_box_F: B_Truck_01_mover_F {
         GVAR(space) = 40;
-        GVAR(hasCargo) = 1;
+    };
+    class B_Truck_01_Repair_F: B_Truck_01_mover_F {
+        GVAR(space) = 20;
+    };
+    class B_Truck_01_ammo_F: B_Truck_01_mover_F {
+        GVAR(space) = 8;
+    };
+    class B_Truck_01_fuel_F: B_Truck_01_mover_F {
+        GVAR(space) = 4;
+    };
+    class B_Truck_01_medical_F: B_Truck_01_transport_F {
+        GVAR(space) = 8;
     };
 
+    // kamaz'
+    class Truck_02_base_F: Truck_F { //covers "covered" variants
+        GVAR(space) = 20;
+    };
+    class Truck_02_transport_base_F: Truck_02_base_F {
+        GVAR(space) = 20;
+    };
+    class Truck_02_box_base_F: Truck_02_base_F { // repair variant, not actually cargo box like hemet
+        GVAR(space) = 12;
+    };
+    class Truck_02_medical_base_F: Truck_02_box_base_F {
+        GVAR(space) = 8;
+    };
+    class Truck_02_Ammo_base_F: Truck_02_base_F {
+        GVAR(space) = 12;
+    };
+    class Truck_02_fuel_base_F: Truck_02_base_F {
+        GVAR(space) = 4;
+    };
+
+    // typhoon
+    class Truck_03_base_F: Truck_F {
+        GVAR(space) = 8;
+    };
+    class O_Truck_03_transport_F: Truck_03_base_F {
+        GVAR(space) = 20;
+    };
+    class O_Truck_03_covered_F: Truck_03_base_F {
+        GVAR(space) = 20;
+    };
+    class O_Truck_03_repair_F: Truck_03_base_F {
+        GVAR(space) = 12;
+    };
+    class O_Truck_03_ammo_F: Truck_03_base_F {
+        GVAR(space) = 8;
+    };
+    class O_Truck_03_fuel_F: Truck_03_base_F {
+        GVAR(space) = 4;
+    };
+    class O_Truck_03_medical_F: Truck_03_base_F {
+        GVAR(space) = 8;
+    };
+    class O_Truck_03_device_F: Truck_03_base_F {
+        GVAR(space) = 4;
+    };
+
+    // civ trucks
+    class Van_01_base_F: Truck_F {
+        GVAR(space) = 8;
+    };
+    class Van_01_transport_base_F: Van_01_base_F {
+        GVAR(space) = 8;
+    };
+    class Van_01_box_base_F: Van_01_base_F { // repair variant, not actually cargo box like hemet
+        GVAR(space) = 12;
+    };
+    class Van_01_fuel_base_F: Van_01_base_F {
+        GVAR(space) = 4;
+    };
+
+    // misc. vehicles
+    class Quadbike_01_base_F: Car_F {
+        GVAR(space) = 0;
+        GVAR(hasCargo) = 0;
+    };
+
+    class Kart_01_Base_F: Car_F {
+        GVAR(space) = 0;
+        GVAR(hasCargo) = 0;
+    };
+
+    // helicopters
     class Air;
     class Helicopter: Air {
         GVAR(space) = 8;
         GVAR(hasCargo) = 1;
     };
+
     class Heli_Transport_02_base_F;
     class I_Heli_Transport_02_F : Heli_Transport_02_base_F {
         GVAR(space) = 20;
         GVAR(hasCargo) = 1;
     };
+
+    // jets
     class Plane: Air {
-        GVAR(space) = 4;
+        GVAR(space) = 0;
-        GVAR(hasCargo) = 1;
+        GVAR(hasCargo) = 0;
     };
 
+    // boats
     class Ship;
     class Ship_F: Ship {
         GVAR(space) = 4;
         GVAR(hasCargo) = 1;
     };
 
+    class Boat_Civil_01_base_F: Ship_F {
+        GVAR(space) = 4;
+        GVAR(hasCargo) = 1;
+    };
+
+    class Boat_F: Ship_F {};
+    class Rubber_duck_base_F: Boat_F {
+        GVAR(space) = 0;
+        GVAR(hasCargo) = 0;
+    };
+
+    class Boat_Armed_01_base_F: Boat_F {
+        GVAR(space) = 8;
+        GVAR(hasCargo) = 1;
+    };
+
+    // submarines
+    class SDV_01_base_F: Boat_F {
+        GVAR(space) = 0;
+        GVAR(hasCargo) = 0;
+    };
+
     // Static weapons
     class StaticWeapon: LandVehicle {
         GVAR(size) = 2; // 1 = small, 2 = large
@@ -105,6 +226,7 @@ class CfgVehicles {
         GVAR(size) = 11;
         GVAR(canLoad) = 1;
         XEH_ENABLED;
+
         class ACE_Actions {
             class ACE_MainActions {
                 displayName = ECSTRING(interaction,MainAction);
@@ -122,6 +244,7 @@ class CfgVehicles {
         GVAR(hasCargo) = 1;
         GVAR(size) = 4;
         GVAR(canLoad) = 1;
+
         class ACE_Actions {
             class ACE_MainActions {
                 displayName = ECSTRING(interaction,MainAction);
@@ -173,12 +296,14 @@ class CfgVehicles {
         GVAR(size) = 50;
         XEH_ENABLED;
     };
+
     class Ruins_F;
     class Land_Cargo20_military_ruins_F: Ruins_F {
         GVAR(space) = 49;
         GVAR(size) = 50;
         XEH_ENABLED;
     };
+
     class Land_Cargo20_orange_F: Cargo_base_F {
         GVAR(space) = 49;
         GVAR(size) = 50;
@@ -210,7 +335,6 @@ class CfgVehicles {
         XEH_ENABLED;
     };
 
-
     class Land_Cargo40_blue_F: Cargo_base_F {
         GVAR(space) = 99;
         GVAR(size) = 100;
@@ -246,11 +370,13 @@ class CfgVehicles {
         GVAR(size) = 100;
         XEH_ENABLED;
     };
+
     class Land_Cargo40_military_ruins_F: Ruins_F {
         GVAR(space) = 99;
         GVAR(size) = 100;
         XEH_ENABLED;
     };
+
     class Land_Cargo40_orange_F: Cargo_base_F {
         GVAR(space) = 99;
         GVAR(size) = 100;
@@ -281,12 +407,14 @@ class CfgVehicles {
         GVAR(size) = 100;
         XEH_ENABLED;
     };
+
     // small
     class Land_CargoBox_V1_F: ThingX {
         GVAR(space) = 7;
         GVAR(hasCargo) = 1;
         GVAR(size) = 7;
         XEH_ENABLED;
+
         class ACE_Actions {
             class ACE_MainActions {
                 displayName = ECSTRING(interaction,MainAction);
@@ -298,5 +426,4 @@ class CfgVehicles {
             };
         };
    };
-
 };

addons/main/script_mod.hpp

@@ -6,7 +6,7 @@
 #define MAJOR 3
 #define MINOR 3
 #define PATCHLVL 1
-#define BUILD 1
+#define BUILD 2
 
 #define VERSION MAJOR.MINOR.PATCHLVL.BUILD
 #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD

mod.cpp

@@ -1,8 +1,8 @@
-name = "Advanced Combat Environment 3.3.0";
+name = "Advanced Combat Environment 3.3.1";
 picture = "logo_ace3_ca.paa";
 actionName = "GitHub";
 action = "https://github.com/acemod/ACE3";
-description = "ACE3 - Version 3.3.0";
+description = "ACE3 - Version 3.3.1";
 logo = "logo_ace3_ca.paa";
 logoOver = "logo_ace3_ca.paa";
 tooltip = "ACE3";