Merge pull request #309 from maxcloutier13/dev

Ajout: Lighter medbag + bodybags

cfg_misc.cpp

@@ -0,0 +1,7 @@
+class FSGm_ItemCore;
+class InventoryItem_Base_F;
+class FSGm_ItemMedicBag: FSGm_ItemCore {
+    class ItemInfo: InventoryItem_Base_F {
+        mass = 15;
+    };
+};

config.cpp

@@ -18,8 +18,10 @@ class cfgWeapons
 	#include "cfg_guns.cpp"
 	// Custom accessories ---------------------------------------
 	#include "cfg_acc.hpp"
-	// Mortar stuff
+	// Mortar stuff -------------------------------------------
 	#include "cfg_mortar.cpp"
+	// Items -------------------------------------------------
+	#include "cfg_misc.cpp"
 };
 class cfgGlasses
 {

loadouts/mk2/backpack_basic.sqf

@@ -8,6 +8,7 @@ for "_i" from 1 to 10 do {
 };
 player addItemToBackpack "ACE_salineIV_500";
 player addItemToBackpack "ACE_salineIV_500";
+player addItemToBackpack "ACE_bodyBag";
 // === Items ================================
 player addItemToBackpack "ACE_EntrenchingTool";
 player addItemToBackpack "WBK_HeadLampItem";

loadouts/mk2/backpack_med.sqf

@@ -1,36 +1,21 @@
 // Basic basic loadout (Pretty universal)
 // === Meds ================================
-for "_i" from 1 to 50 do {
-	player addItemToBackpack "ACE_fieldDressing";
-};
-for "_i" from 1 to 5 do {
-	player addItemToBackpack "ACE_salineIV";
-};
-for "_i" from 1 to 5 do {
-	player addItemToBackpack "ACE_salineIV_500";
-};
-for "_i" from 1 to 5 do {
-	player addItemToBackpack "ACE_salineIV_250";
-};
-for "_i" from 1 to 20 do {
-	player addItemToBackpack "FF_Painkiller";
-};
-for "_i" from 1 to 20 do {
-	player addItemToBackpack "ACE_morphine";
-};
-for "_i" from 1 to 20 do {
-	player addItemToBackpack "ACE_epinephrine";
-};
-for "_i" from 1 to 4 do {
-	player addItemToBackpack "ACE_splint";
-};
-for "_i" from 1 to 4 do {
-	player addItemToBackpack "ACE_tourniquet";
-};
-for "_i" from 1 to 3 do {
-	player addItemToBackpack "SmokeShellPurple";
-};
+for "_i" from 1 to 50 do {player addItemToBackpack "ACE_fieldDressing";};
+for "_i" from 1 to 5 do {player addItemToBackpack "ACE_salineIV";};
+for "_i" from 1 to 5 do {player addItemToBackpack "ACE_salineIV_500";};
+for "_i" from 1 to 5 do {player addItemToBackpack "ACE_salineIV_250";};
+for "_i" from 1 to 20 do {player addItemToBackpack "FF_Painkiller";};
+for "_i" from 1 to 20 do {player addItemToBackpack "ACE_morphine";};
+for "_i" from 1 to 20 do {player addItemToBackpack "ACE_epinephrine";};
+player addItemToBackpack "ACE_adenosine";
+player addItemToBackpack "ACE_adenosine";
+for "_i" from 1 to 4 do {player addItemToBackpack "ACE_splint";};
+for "_i" from 1 to 4 do {player addItemToBackpack "ACE_tourniquet";};
+for "_i" from 1 to 3 do {player addItemToBackpack "SmokeShellPurple";};
 player addItemToBackpack "FSGm_ItemMedicBag";
 player addItemToBackpack "ACE_SpraypaintRed";
 player addItemToBackpack "ACE_personalAidKit";
-player addItemToBackpack "KNB_PanelRed";
+player addItemToBackpack "KNB_PanelRed";
+for "_i" from 1 to 4 do {
+	player addItemToBackpack "ACE_bodyBag";
+};

vehicles/cgqc_heli_heavy.sqf

@@ -130,6 +130,11 @@ class TransportItems
 		count = 10;
 		name = "ACE_tourniquet";
 	};
+	class _xx_ACE_bodyBag
+	{
+		count = 5;
+		name = "ACE_bodyBag";
+	};
 
 	// items ------------------------------------------------
 	class _xx_ACE_EarPlugs

vehicles/cgqc_heli_light.sqf

@@ -129,6 +129,11 @@ class TransportItems
 		count = 5;
 		name = "ACE_tourniquet";
 	};
+	class _xx_ACE_bodyBag
+	{
+		count = 2;
+		name = "ACE_bodyBag";
+	};
 
 	// items ------------------------------------------------
 	class _xx_ACE_EarPlugs

vehicles/cgqc_heli_medium.sqf

@@ -130,6 +130,11 @@ class TransportItems
 		count = 5;
 		name = "ACE_tourniquet";
 	};
+	class _xx_ACE_bodyBag
+	{
+		count = 5;
+		name = "ACE_bodyBag";
+	};
 
 	// items ------------------------------------------------
 	class _xx_ACE_EarPlugs

vehicles/cgqc_vic_loadout_command.cpp

@@ -90,6 +90,11 @@ class TransportItems{
 		count = 2;
 		name = "ACE_tourniquet";
 	};
+	class _xx_ACE_bodyBag
+	{
+		count = 2;
+		name = "ACE_bodyBag";
+	};
 	class _xx_FSGm_ItemMedicBag
 	{
 		count = 1;

vehicles/cgqc_vic_loadout_ifv.cpp

@@ -137,6 +137,11 @@ class TransportItems{
 		count = 2;
 		name = "ACE_tourniquet";
 	};
+	class _xx_ACE_bodyBag
+	{
+		count = 5;
+		name = "ACE_bodyBag";
+	};
 	class _xx_FSGm_ItemMedicBag
 	{
 		count = 1;

vehicles/cgqc_vic_loadout_medium.cpp

@@ -34,6 +34,11 @@ class TransportItems{
 		count = 2;
 		name = "ACE_tourniquet";
 	};
+	class _xx_ACE_bodyBag
+	{
+		count = 5;
+		name = "ACE_bodyBag";
+	};
     class _xx_ACRE_PRC152
     {
         count = 1;
@@ -44,22 +49,6 @@ class TransportItems{
         count = 1;
         name = "ACRE_PRC343";
     };
-	class _xx_ACE_40mm_Flare_white
-	{
-		count = 5;
-		magazine = "ACE_40mm_Flare_white";
-	};
-	class _xx_UGL_FlareRed_F
-	{
-		count = 5;
-		magazine = "UGL_FlareRed_F";
-	};
-	class _xx_ACE_40mm_Flare_ir
-	{
-		count = 5;
-		magazine = "ACE_40mm_Flare_ir";
-	};
-
 };
 class TransportWeapons{
     class _xx_launch_NLAW_F
@@ -117,6 +106,21 @@ class TransportMagazines{
 		count = 2;
 		magazine = "ACE_M84";
 	};
+	class _xx_ACE_40mm_Flare_white
+	{
+		count = 5;
+		magazine = "ACE_40mm_Flare_white";
+	};
+	class _xx_UGL_FlareRed_F
+	{
+		count = 5;
+		magazine = "UGL_FlareRed_F";
+	};
+	class _xx_ACE_40mm_Flare_ir
+	{
+		count = 5;
+		magazine = "ACE_40mm_Flare_ir";
+	};
 };
 
 

vehicles/cgqc_vic_loadout_quadExt.cpp

@@ -15,6 +15,11 @@ class TransportItems
         count = 5;
         name = "FF_Painkiller";
     };
+    class _xx_ACE_bodyBag
+	{
+		count = 1;
+		name = "ACE_bodyBag";
+	};
     class _xx_ACRE_PRC152
     {
         count = 1;

vehicles/cgqc_vic_loadout_quadExt_mk6.cpp

@@ -15,6 +15,11 @@ class TransportItems
         count = 5;
         name = "FF_Painkiller";
     };
+    class _xx_ACE_bodyBag
+	{
+		count = 1;
+		name = "ACE_bodyBag";
+	};
     class _xx_ACRE_PRC152
     {
         count = 1;

vehicles/cgqc_vic_loadout_small.cpp

@@ -9,6 +9,11 @@ class TransportItems{
         count = 5;
         name = "FF_Painkiller";
     };
+    class _xx_ACE_bodyBag
+	{
+		count = 1;
+		name = "ACE_bodyBag";
+	};
     class _xx_ACRE_PRC152
     {
         count = 1;