From f383e8701db770d52811069bffb8d0bc223f99f2 Mon Sep 17 00:00:00 2001
From: commy2
Date: Wed, 16 Sep 2015 19:27:32 +0200
Subject: [PATCH 1/4] increase trucks cargo space
---
addons/cargo/CfgVehicles.hpp | 105 ++++++++++++++++++++++++++++++++---
1 file changed, 98 insertions(+), 7 deletions(-)
diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp
index 1cb82bdff8..2b5a637e8a 100644
--- a/addons/cargo/CfgVehicles.hpp
+++ b/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,13 +51,94 @@ class CfgVehicles {
GVAR(space) = 8;
GVAR(hasCargo) = 1;
};
+
+ // hemets
class Truck_01_base_F: Truck_F {
- GVAR(space) = 20;
- GVAR(hasCargo) = 1;
+ GVAR(space) = 8;
};
- 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;
};
class Air;
@@ -63,11 +146,13 @@ class CfgVehicles {
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;
};
+
class Plane: Air {
GVAR(space) = 4;
GVAR(hasCargo) = 1;
@@ -105,6 +190,7 @@ class CfgVehicles {
GVAR(size) = 11;
GVAR(canLoad) = 1;
XEH_ENABLED;
+
class ACE_Actions {
class ACE_MainActions {
displayName = ECSTRING(interaction,MainAction);
@@ -122,6 +208,7 @@ class CfgVehicles {
GVAR(hasCargo) = 1;
GVAR(size) = 4;
GVAR(canLoad) = 1;
+
class ACE_Actions {
class ACE_MainActions {
displayName = ECSTRING(interaction,MainAction);
@@ -173,12 +260,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 +299,6 @@ class CfgVehicles {
XEH_ENABLED;
};
-
class Land_Cargo40_blue_F: Cargo_base_F {
GVAR(space) = 99;
GVAR(size) = 100;
@@ -246,11 +334,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 +371,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 +390,4 @@ class CfgVehicles {
};
};
};
-
};
From b7715152e21599255e6992bdb3c21c781bf5a4fc Mon Sep 17 00:00:00 2001
From: commy2
Date: Wed, 16 Sep 2015 20:12:56 +0200
Subject: [PATCH 2/4] correct cargo capacities for quads, karts, boats and jets
---
addons/cargo/CfgVehicles.hpp | 40 ++++++++++++++++++++++++++++++++++--
1 file changed, 38 insertions(+), 2 deletions(-)
diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp
index 2b5a637e8a..ccc23a99aa 100644
--- a/addons/cargo/CfgVehicles.hpp
+++ b/addons/cargo/CfgVehicles.hpp
@@ -141,6 +141,18 @@ class CfgVehicles {
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;
@@ -153,17 +165,41 @@ class CfgVehicles {
GVAR(hasCargo) = 1;
};
+ // jets
class Plane: Air {
- GVAR(space) = 4;
- GVAR(hasCargo) = 1;
+ GVAR(space) = 0;
+ 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
From c748e56f4a86948adf7b7b92f351974b03635784 Mon Sep 17 00:00:00 2001
From: ViperMaul
Date: Wed, 16 Sep 2015 11:42:01 -0700
Subject: [PATCH 3/4] bump v3.3.1.2
---
addons/main/script_mod.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
index e2e42e9695..e7b0479d24 100644
--- a/addons/main/script_mod.hpp
+++ b/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
From 8488bea67cae04592c59439b10f531dd6a8a87ea Mon Sep 17 00:00:00 2001
From: ViperMaul
Date: Wed, 16 Sep 2015 11:48:52 -0700
Subject: [PATCH 4/4] bump v
---
README.md | 6 +++---
mod.cpp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index c98983d880..146784e36b 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,10 @@
-
+
-
-
+
+
diff --git a/mod.cpp b/mod.cpp
index 20d9f44d59..d7b52260b0 100644
--- a/mod.cpp
+++ b/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";