Merge pull request #63 from Heartbroken-Git/indev5.1

Merge de la 5.1 pour sa release

24eBAC_Vehicles/Classes/CfgPatches.hpp

@@ -87,7 +87,10 @@ class CfgPatches
 			"24eBAC_VedetteMN",
 			"24eBAC_HorsBordDouanes",
 			"24eBAC_HorsBordGN",
-			"24eBAC_HorsBordMN"
+			"24eBAC_HorsBordMN",
+			"24eBAC_RhibGN","24eBAC_RhibGN_HV",
+			"24eBAC_RhibMN",
+			"24eBAC_RhibAA"
 		};
 		weapons[] = {};
 		requiredVersion = 0.1;

24eBAC_Vehicles/Classes/CfgVehicles.hpp

@@ -78,4 +78,8 @@ class cfgVehicles
 	// Hors-bord
 	class C_Boat_Civil_01_police_F;
 	#include "Vehicles\Hors-Bord.hpp"
+
+	// RHIB
+	class B_G_Boat_Transport_02_F;
+	#include "Vehicles\RHIB.hpp"
 };

24eBAC_Vehicles/Classes/Vehicles/RHIB.hpp

@@ -0,0 +1,55 @@
+class 24eBAC_RhibGN:B_G_Boat_Transport_02_F {
+    _generalMacro = "B_G_Boat_Transport_02_F";
+    scope = 2;
+    scopeCurator = 2;
+    side = 1;
+    faction = "TFD_GN";
+    displayName="RHIB";
+    author = "Heartbroken";
+    crew = "TFD_Gendarme_Depart";
+    // hiddenSelections[]= {"Camo_1", "Camo_2"};
+    // hiddenSelectionsTextures[]= {"\24eBAC_Vehicles\Data\Hors-Bord\Hors-BordDouanes_ext.paa","\a3\boat_f_gamma\Boat_Civil_01\data\Boat_Civil_01_int_police_co.paa"};
+    typicalCargo[] = {"TFD_Gendarme_Depart"};
+};
+
+class 24eBAC_RhibMN:B_G_Boat_Transport_02_F {
+    _generalMacro = "B_G_Boat_Transport_02_F";
+    scope = 2;
+    scopeCurator = 2;
+    side = 1;
+    faction = "TFD_MN";
+    displayName="RHIB";
+    author = "Heartbroken";
+    crew = "TFD_Marin_TPBpc";
+    typicalCargo[] = {"TFD_Marin_TPBpc"};
+};
+
+class 24eBAC_RhibAA:B_G_Boat_Transport_02_F {
+    _generalMacro = "B_G_Boat_Transport_02_F";
+    scope = 2;
+    scopeCurator = 2;
+    side = 1;
+    faction = "TFD_AA";
+    displayName="RHIB";
+    author = "Heartbroken";
+    crew = "B_soldier_F";
+    hiddenSelections[]= {"Camo_1", "Camo_2"};
+    hiddenSelectionsTextures[]= {"\24eBAC_Vehicles\Data\RHIB_Mil\RHIBgris_ext.paa","\A3\Boat_F_Exp\Boat_Transport_02\Data\Boat_Transport_02_interior_2_CO.paa"};
+    textureList[]= {"Gris", 1};
+    typicalCargo[] = {"B_soldier_F"};
+};
+
+class 24eBAC_RhibGN_HV:B_G_Boat_Transport_02_F {
+    _generalMacro = "B_G_Boat_Transport_02_F";
+    scope = 2;
+    scopeCurator = 2;
+    side = 1;
+    faction = "TFD_GN";
+    displayName="RHIB (Haute Visibilite)";
+    author = "Heartbroken";
+    crew = "TFD_Gendarme_Depart";
+    hiddenSelections[]= {"Camo_1", "Camo_2"};
+    hiddenSelectionsTextures[]= {"\24eBAC_Vehicles\Data\RHIB_Mil\RHIBorange_ext.paa","\A3\Boat_F_Exp\Boat_Transport_02\Data\Boat_Transport_02_interior_2_CO.paa"};
+    textureList[] = {"Orange", 1};
+    typicalCargo[] = {"TFD_Gendarme_Depart"};
+};

README.md

@@ -1,11 +1,13 @@
 # TFP_CORE
+
 The TFP CORE modification for ArmA III is a pack containing music, patches and retextures used by the different groups I, Heartbroken, have been a part of during my time in ArmA 3. While not intended for download by anyone else but my current team French teams can get the modpack too for it contains some basic French looking retextures for Vanilla vehicles.
 
 ## Instructions
-If downloaded from SyncWithSix the mod should work like any other ArmA III mod on Sync.
-If downloaded directly from GitHub extract @TFP_CORE from its .zip file and copy-paste it in your root ArmA III directory. Then enable it either on the ArmA III launcher or directly ingame.
+
+Extract @TFP_CORE from its .zip file and copy-paste it in your root ArmA III directory. Then enable it either on the ArmA III launcher or directly ingame.
 
 ## License
+
 @TFP_CORE an ArmA III modification by Heartbroken *et al.*  
 ![Arma Public License Share Alike (APL-SA)](https://www.bistudio.com/assets/img/licenses/APL-SA.png)  
 This mod is published under the *Arma Public License Share Alike (APL-SA)* as written in the `LICENSE.md` file included with it ([retrieved on the 22nd of September 2017 from here](https://www.bistudio.com/community/licenses/arma-public-license-share-alike)).  

TFD_Objects/Classes/Flags.hpp

@@ -1,164 +1,175 @@
 class TFD_DrapeauUE : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Drapeau (UE)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_UE.paa'"
 	}
 };
 
 class TFD_DrapeauFR : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Drapeau (France)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_FR.paa'"
 	}
 };
 
+class TFD_DrapeauFRbzh : FlagCarrier {
+	_generalMacro = "FlagCarrier";
+    scope = 2;
+	scopeCurator=2;
+    displayName="Drapeau (Bretagne)";
+	author = "Heartbroken";
+	class EventHandlers {
+		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_FRbzh.paa'"
+	}
+};
+
 class TFD_DrapeauBE : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Drapeau (Belgique)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_BE.paa'"
 	}
 };
 
 class TFD_DrapeauTFP : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Drapeau (TFP)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_TFP.paa'"
 	}
 };
 
 class TFD_Drapeau24eBAC : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Drapeau (24eBAC)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_24eBAC.paa'"
 	}
 };
 
 class TFD_DrapeauTFD : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Drapeau (TFD)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_TFD.paa'"
 	}
 };
 
 class TFD_DrapeauURSS : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Drapeau (URSS)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_URSS.paa'"
 	}
 };
 
 class TFD_DrapeauOPEXKoto : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Drapeau (OPEX Suricate)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_OPEXKoto.paa'"
 	}
 };
 
 class TFD_DrapeauCH : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Drapeau (Republique Populaire de Chine)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_CH.paa'"
 	}
 };
 
 class TFD_DrapeauCHPLA : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Etendard (Republique Populaire de Chine)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_CHPLA.paa'"
 	}
 };
 
 class TFD_DrapeauGB : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Drapeau (Gabon)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_GB.paa'"
 	}
 };
 
 class TFD_DrapeauJP : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Drapeau (Japon)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_JP.paa'"
 	}
 };
 
 class TFD_DrapeauJPJSDF : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Etendard (Japon)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_JPJSDF.paa'"
 	}
 };
 
 class TFD_DrapeauMO : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
     scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
     displayName="Drapeau (Maroc)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_MO.paa'"
 	}
 };
 
 class TFD_DrapeauNG : FlagCarrier {
-	_generalMacro = "FlagCarrier"; 
+	_generalMacro = "FlagCarrier";
 	scope = 2;
-	scopeCurator=2;		
+	scopeCurator=2;
 	displayName="Drapeau (Niger)";
-	author = "Heartbroken";	
+	author = "Heartbroken";
 	class EventHandlers {
 		init="(_this select 0) setFlagTexture '\TFD_Objects\Data\Drapeau_NG.paa'"
 	}
-};
+};