From e8244854cfbf513a941140b4c22fa3e7c59af87f Mon Sep 17 00:00:00 2001
From: Apricot <50947830+Apricot-ale@users.noreply.github.com>
Date: Thu, 21 Dec 2023 16:40:49 +0900
Subject: [PATCH] Breathing - Add BVM and O2Tank to Supply Crates (#450)

**When merged this pull request will:**
- _Add BVM and oxygenTank to KAM General Items / ACE Advanced Medical
Supply Crate_
- _Add missing scopeCurator & scopeArsenal config to BVM and oxygenTank_

### IMPORTANT

- [Development Guidelines](https://ace3.acemod.org/wiki/development/)
are read, understood and applied.
- Title of this PR uses our standard template `Component -
Add|Fix|Improve|Change|Make|Remove {changes}`.
---
 addons/breathing/CfgMagazines.hpp |  4 ++++
 addons/breathing/CfgVehicles.hpp  | 12 ++++++++++++
 addons/breathing/CfgWeapons.hpp   | 12 ++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/addons/breathing/CfgMagazines.hpp b/addons/breathing/CfgMagazines.hpp
index b5efbad5f..89b7192bc 100644
--- a/addons/breathing/CfgMagazines.hpp
+++ b/addons/breathing/CfgMagazines.hpp
@@ -3,6 +3,8 @@ class CfgMagazines {
     
     class kat_oxygenTank_300: CA_Magazine {
         scope = 2;
+        scopeCurator = 2;
+        scopeArsenal = 2;
         author = "Blue";
         displayName = CSTRING(PortableOxygenTank_300_Display);
         descriptionShort = CSTRING(PortableOxygenTank_300_Desc_Short);
@@ -17,6 +19,8 @@ class CfgMagazines {
     };
     class kat_oxygenTank_150: CA_Magazine {
         scope = 2;
+        scopeCurator = 2;
+        scopeArsenal = 2;
         author = "Blue";
         displayName = CSTRING(PortableOxygenTank_150_Display);
         descriptionShort = CSTRING(PortableOxygenTank_150_Desc_Short);
diff --git a/addons/breathing/CfgVehicles.hpp b/addons/breathing/CfgVehicles.hpp
index d8dd0f40a..1062c86e5 100644
--- a/addons/breathing/CfgVehicles.hpp
+++ b/addons/breathing/CfgVehicles.hpp
@@ -34,6 +34,12 @@ class CfgVehicles {
             MACRO_ADDITEM(kat_chestSeal,25);
             MACRO_ADDITEM(kat_aatKit,10);
             MACRO_ADDITEM(kat_stethoscope,5);
+            MACRO_ADDITEM(kat_BVM,5);
+            MACRO_ADDITEM(kat_pocketBVM,5);
+        };
+        class TransportMagazines: TransportMagazines {
+            MACRO_ADDMAGAZINE(kat_oxygenTank_150,2);
+            MACRO_ADDMAGAZINE(kat_oxygenTank_300,2);
         };
     };
     class kat_basicSupplyCrate: ACE_medicalSupplyCrate {
@@ -55,6 +61,12 @@ class CfgVehicles {
             MACRO_ADDITEM(KAT_Empty_bloodIV_500,7);
             MACRO_ADDITEM(kat_AED,2);
             MACRO_ADDITEM(kat_X_AED,2);
+            MACRO_ADDITEM(kat_BVM,5);
+            MACRO_ADDITEM(kat_pocketBVM,5);
+        };
+        class TransportMagazines: TransportMagazines {
+            MACRO_ADDMAGAZINE(kat_oxygenTank_150,2);
+            MACRO_ADDMAGAZINE(kat_oxygenTank_300,2);
         };
     };
 
diff --git a/addons/breathing/CfgWeapons.hpp b/addons/breathing/CfgWeapons.hpp
index d1e550656..418e4b941 100644
--- a/addons/breathing/CfgWeapons.hpp
+++ b/addons/breathing/CfgWeapons.hpp
@@ -71,6 +71,8 @@ class CfgWeapons {
 
     class kat_BVM: ACE_ItemCore {
         scope = 2;
+        scopeCurator = 2;
+        scopeArsenal = 2;
         author = "Blue";
         displayName = CSTRING(BVM_Display);
         descriptionShort = CSTRING(BVM_Desc_Short);
@@ -82,6 +84,8 @@ class CfgWeapons {
     };
     class kat_pocketBVM: ACE_ItemCore {
         scope = 2;
+        scopeCurator = 2;
+        scopeArsenal = 2;
         author = "Blue";
         displayName = CSTRING(PocketBVM_Display);
         descriptionShort = CSTRING(PocketBVM_Desc_Short);
@@ -93,6 +97,8 @@ class CfgWeapons {
     };
     class kat_oxygenTank_150_Item: ACE_ItemCore {
         scope = 2;
+        scopeCurator = 2;
+        scopeArsenal = 2;
         author = "Blue";
         displayName = CSTRING(PortableOxygenTank_150_Display);
         descriptionShort = CSTRING(PortableOxygenTank_150_Desc_Short);
@@ -104,6 +110,8 @@ class CfgWeapons {
     };
     class kat_oxygenTank_300_Item: ACE_ItemCore {
         scope = 2;
+        scopeCurator = 2;
+        scopeArsenal = 2;
         author = "Blue";
         displayName = CSTRING(PortableOxygenTank_300_Display);
         descriptionShort = CSTRING(PortableOxygenTank_300_Desc_Short);
@@ -115,6 +123,8 @@ class CfgWeapons {
     };
     class kat_oxygenTank_150_Empty: ACE_ItemCore {
         scope = 2;
+        scopeCurator = 2;
+        scopeArsenal = 2;
         author = "Blue";
         displayName = CSTRING(PortableOxygenTank_150_Empty_Display);
         descriptionShort = CSTRING(PortableOxygenTank_Empty_Desc_Short);
@@ -126,6 +136,8 @@ class CfgWeapons {
     };
     class kat_oxygenTank_300_Empty: ACE_ItemCore {
         scope = 2;
+        scopeCurator = 2;
+        scopeArsenal = 2;
         author = "Blue";
         displayName = CSTRING(PortableOxygenTank_300_Empty_Display);
         descriptionShort = CSTRING(PortableOxygenTank_Empty_Desc_Short);