diff --git a/addons/medical_circulation/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et b/addons/medical_circulation/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et new file mode 100644 index 000000000..b8ce2c8fc --- /dev/null +++ b/addons/medical_circulation/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et @@ -0,0 +1,33 @@ +GenericEntity : "{C95E11C60810F432}Prefabs/Items/Core/Item_Base.et" { + ID "508AB2013EEE1E00" + components { + ACE_Medical_MedicalKitInventoryStorageComponent "{5E4E8A7876A50FDC}" { + MultiSlots { + MultiSlotConfiguration "{66E83E2AB3E32CD4}" { + SlotTemplate InventoryStorageSlot AmmoniumCarbonate { + Prefab "{58CF3AB87C441295}Prefabs/Items/Medicine/AmmoniumCarbonatePackage/ACE_Medical_AmmoniumCarbonatePackage.et" + } + NumSlots 8 + } + MultiSlotConfiguration "{66E83E2AD137C97B}" { + SlotTemplate InventoryStorageSlot Naloxone { + Prefab "{02DD34077F51F65E}Prefabs/Items/Medicine/NaloxoneInjection/ACE_Medical_NaloxoneInjection.et" + } + NumSlots 8 + } + MultiSlotConfiguration "{66E83E2AC236DEDE}" { + SlotTemplate InventoryStorageSlot Phenylephrine { + Prefab "{9BBA766CD869002C}Prefabs/Items/Medicine/PhenylephrineInjection/ACE_Medical_PhenylephrineInjection.et" + } + NumSlots 8 + } + MultiSlotConfiguration "{66E83E2AE241C25A}" { + SlotTemplate InventoryStorageSlot Metoprolol { + Prefab "{D0434D5215B54181}Prefabs/Items/Medicine/MetoprololInjection/ACE_Medical_MetoprololInjection.et" + } + NumSlots 8 + } + } + } + } +} \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Characters/Factions/BLUFOR/US_Army/Character_US_Medic.et.meta b/addons/medical_circulation/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et.meta similarity index 77% rename from addons/medical_core/Prefabs/Characters/Factions/BLUFOR/US_Army/Character_US_Medic.et.meta rename to addons/medical_circulation/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et.meta index 100fae7cb..36ef13582 100644 --- a/addons/medical_core/Prefabs/Characters/Factions/BLUFOR/US_Army/Character_US_Medic.et.meta +++ b/addons/medical_circulation/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et.meta @@ -1,5 +1,5 @@ MetaFileClass { - Name "{C9E4FEAF5AAC8D8C}Prefabs/Characters/Factions/BLUFOR/US_Army/Character_US_Medic.et" + Name "{46FD263F0F368A92}Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et" Configurations { EntityTemplateResourceClass PC { } @@ -9,9 +9,9 @@ MetaFileClass { } EntityTemplateResourceClass PS4 : PC { } - EntityTemplateResourceClass HEADLESS : PC { - } EntityTemplateResourceClass PS5 : PC { } + EntityTemplateResourceClass HEADLESS : PC { + } } } \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Characters/Factions/BLUFOR/US_Army/Character_US_Medic.et b/addons/medical_core/Prefabs/Characters/Factions/BLUFOR/US_Army/Character_US_Medic.et deleted file mode 100644 index 21aef1890..000000000 --- a/addons/medical_core/Prefabs/Characters/Factions/BLUFOR/US_Army/Character_US_Medic.et +++ /dev/null @@ -1,14 +0,0 @@ -SCR_ChimeraCharacter : "{284E735C6C70DAD2}Prefabs/Characters/Factions/BLUFOR/US_Army/Character_US_BaseLoadout.et" { - ID "51FA8A5F10E81780" - components { - SCR_InventoryStorageManagerComponent "{520EA1D2DB118DE5}" { - InitialInventoryItems { - ItemsInitConfigurationItem "{5538C29CBE93E810}" { - PrefabsToSpawn + { - "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Characters/Factions/BLUFOR/US_Army/GreenBerets/Character_US_SF_Medic.et b/addons/medical_core/Prefabs/Characters/Factions/BLUFOR/US_Army/GreenBerets/Character_US_SF_Medic.et deleted file mode 100644 index 7528e4360..000000000 --- a/addons/medical_core/Prefabs/Characters/Factions/BLUFOR/US_Army/GreenBerets/Character_US_SF_Medic.et +++ /dev/null @@ -1,14 +0,0 @@ -SCR_ChimeraCharacter : "{894628A45793E7A0}Prefabs/Characters/Factions/BLUFOR/US_Army/GreenBerets/Character_US_SF_BaseLoadout.et" { - ID "520EC961A090B1EE" - components { - SCR_InventoryStorageManagerComponent "{520EA1D2DB118DE5}" { - InitialInventoryItems { - ItemsInitConfigurationItem "{60DAD6A4B334A247}" { - PrefabsToSpawn + { - "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Characters/Factions/BLUFOR/US_Army/GreenBerets/Character_US_SF_Medic.et.meta b/addons/medical_core/Prefabs/Characters/Factions/BLUFOR/US_Army/GreenBerets/Character_US_SF_Medic.et.meta deleted file mode 100644 index 4656c2368..000000000 --- a/addons/medical_core/Prefabs/Characters/Factions/BLUFOR/US_Army/GreenBerets/Character_US_SF_Medic.et.meta +++ /dev/null @@ -1,17 +0,0 @@ -MetaFileClass { - Name "{9A234C5857D92187}Prefabs/Characters/Factions/BLUFOR/US_Army/GreenBerets/Character_US_SF_Medic.et" - Configurations { - EntityTemplateResourceClass PC { - } - EntityTemplateResourceClass XBOX_ONE : PC { - } - EntityTemplateResourceClass XBOX_SERIES : PC { - } - EntityTemplateResourceClass PS4 : PC { - } - EntityTemplateResourceClass PS5 : PC { - } - EntityTemplateResourceClass HEADLESS : PC { - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_AC_Medic.et b/addons/medical_core/Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_AC_Medic.et deleted file mode 100644 index 88cc60621..000000000 --- a/addons/medical_core/Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_AC_Medic.et +++ /dev/null @@ -1,14 +0,0 @@ -SCR_ChimeraCharacter : "{DE3786C0C6C978D4}Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_BaseLoadout.et" { - ID "520EC961A090B1EE" - components { - SCR_InventoryStorageManagerComponent "{520EA1D2DB118DE5}" { - InitialInventoryItems { - ItemsInitConfigurationItem "{5DF8B4EAF98C1278}" { - PrefabsToSpawn + { - "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_Medic.et b/addons/medical_core/Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_Medic.et deleted file mode 100644 index 79c5b2255..000000000 --- a/addons/medical_core/Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_Medic.et +++ /dev/null @@ -1,14 +0,0 @@ -SCR_ChimeraCharacter : "{DE3786C0C6C978D4}Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_BaseLoadout.et" { - ID "520EC961A090B1EE" - components { - SCR_InventoryStorageManagerComponent "{520EA1D2DB118DE5}" { - InitialInventoryItems { - ItemsInitConfigurationItem "{5570901746070FD4}" { - PrefabsToSpawn + { - "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Characters/Factions/OPFOR/USSR_Army/Character_USSR_Medic.et b/addons/medical_core/Prefabs/Characters/Factions/OPFOR/USSR_Army/Character_USSR_Medic.et deleted file mode 100644 index 3f5b7598f..000000000 --- a/addons/medical_core/Prefabs/Characters/Factions/OPFOR/USSR_Army/Character_USSR_Medic.et +++ /dev/null @@ -1,14 +0,0 @@ -SCR_ChimeraCharacter : "{3ECA3A935BC069B9}Prefabs/Characters/Factions/OPFOR/USSR_Army/Character_USSR_BaseLoadout.et" { - ID "51FAD317FC20EC1B" - components { - SCR_InventoryStorageManagerComponent "{520EA1D2DB118DE5}" { - InitialInventoryItems { - ItemsInitConfigurationItem "{5A5CCAB6745FD597}" { - PrefabsToSpawn + { - "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Characters/Factions/OPFOR/USSR_Army/Character_USSR_Medic.et.meta b/addons/medical_core/Prefabs/Characters/Factions/OPFOR/USSR_Army/Character_USSR_Medic.et.meta deleted file mode 100644 index f67dcac67..000000000 --- a/addons/medical_core/Prefabs/Characters/Factions/OPFOR/USSR_Army/Character_USSR_Medic.et.meta +++ /dev/null @@ -1,17 +0,0 @@ -MetaFileClass { - Name "{AB9726163EC1BD81}Prefabs/Characters/Factions/OPFOR/USSR_Army/Character_USSR_Medic.et" - Configurations { - EntityTemplateResourceClass PC { - } - EntityTemplateResourceClass XBOX_ONE : PC { - } - EntityTemplateResourceClass XBOX_SERIES : PC { - } - EntityTemplateResourceClass PS4 : PC { - } - EntityTemplateResourceClass HEADLESS : PC { - } - EntityTemplateResourceClass PS5 : PC { - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Characters/Factions/OPFOR/USSR_Army/Spetsnaz/Character_USSR_SF_Medic.et b/addons/medical_core/Prefabs/Characters/Factions/OPFOR/USSR_Army/Spetsnaz/Character_USSR_SF_Medic.et deleted file mode 100644 index 6e4718a20..000000000 --- a/addons/medical_core/Prefabs/Characters/Factions/OPFOR/USSR_Army/Spetsnaz/Character_USSR_SF_Medic.et +++ /dev/null @@ -1,14 +0,0 @@ -SCR_ChimeraCharacter : "{B6F05D4557B61C4E}Prefabs/Characters/Factions/OPFOR/USSR_Army/Spetsnaz/Character_USSR_SF_BaseLoadout.et" { - ID "520EC961A090B1EE" - components { - SCR_InventoryStorageManagerComponent "{520EA1D2DB118DE5}" { - InitialInventoryItems { - ItemsInitConfigurationItem "{60DADDE870A5053F}" { - PrefabsToSpawn + { - "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Characters/Factions/OPFOR/USSR_Army/Spetsnaz/Character_USSR_SF_Medic.et.meta b/addons/medical_core/Prefabs/Characters/Factions/OPFOR/USSR_Army/Spetsnaz/Character_USSR_SF_Medic.et.meta deleted file mode 100644 index c1bd134af..000000000 --- a/addons/medical_core/Prefabs/Characters/Factions/OPFOR/USSR_Army/Spetsnaz/Character_USSR_SF_Medic.et.meta +++ /dev/null @@ -1,17 +0,0 @@ -MetaFileClass { - Name "{8CA70597606992EC}Prefabs/Characters/Factions/OPFOR/USSR_Army/Spetsnaz/Character_USSR_SF_Medic.et" - Configurations { - EntityTemplateResourceClass PC { - } - EntityTemplateResourceClass XBOX_ONE : PC { - } - EntityTemplateResourceClass XBOX_SERIES : PC { - } - EntityTemplateResourceClass PS4 : PC { - } - EntityTemplateResourceClass PS5 : PC { - } - EntityTemplateResourceClass HEADLESS : PC { - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_US.et b/addons/medical_core/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_US.et new file mode 100644 index 000000000..a1f663dca --- /dev/null +++ b/addons/medical_core/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_US.et @@ -0,0 +1,19 @@ +GenericEntity : "{46FD263F0F368A92}Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et" { + ID "508AB2013EEE1E00" + components { + ACE_Medical_MedicalKitInventoryStorageComponent "{5E4E8A7876A50FDC}" { + MultiSlots { + MultiSlotConfiguration "{66E81CB9F5B0F5B5}" { + SlotTemplate LoadoutSlotInfo Bandage { + Prefab "{A81F501D3EF6F38E}Prefabs/Items/Medicine/FieldDressing_01/FieldDressing_US_01.et" + } + } + MultiSlotConfiguration "{66E81CBA65FAD3C2}" { + SlotTemplate InventoryStorageSlot Saline { + Prefab "{00E36F41CA310E2A}Prefabs/Items/Medicine/SalineBag_01/SalineBag_US_01.et" + } + } + } + } + } +} \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_Medic.et.meta b/addons/medical_core/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_US.et.meta similarity index 78% rename from addons/medical_core/Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_Medic.et.meta rename to addons/medical_core/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_US.et.meta index cf80eff79..29f7c5ee4 100644 --- a/addons/medical_core/Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_Medic.et.meta +++ b/addons/medical_core/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_US.et.meta @@ -1,5 +1,5 @@ MetaFileClass { - Name "{45A02CA25CBA9443}Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_Medic.et" + Name "{AE578EEA4244D41F}Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_US.et" Configurations { EntityTemplateResourceClass PC { } @@ -9,9 +9,9 @@ MetaFileClass { } EntityTemplateResourceClass PS4 : PC { } - EntityTemplateResourceClass HEADLESS : PC { - } EntityTemplateResourceClass PS5 : PC { } + EntityTemplateResourceClass HEADLESS : PC { + } } } \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et b/addons/medical_core/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et new file mode 100644 index 000000000..82841d86d --- /dev/null +++ b/addons/medical_core/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et @@ -0,0 +1,36 @@ +GenericEntity : "{C95E11C60810F432}Prefabs/Items/Core/Item_Base.et" { + ID "508AB2013EEE1E00" + components { + ACE_Medical_MedicalKitInventoryStorageComponent "{5E4E8A7876A50FDC}" { + MaxCumulativeVolume 2999 + MaxItemSize 10 10 10 + MultiSlots { + MultiSlotConfiguration "{66E81CB8294EABB5}" { + SlotTemplate InventoryStorageSlot Morphine { + Prefab "{0D9A5DCF89AE7AA9}Prefabs/Items/Medicine/MorphineInjection_01/MorphineInjection_01.et" + } + NumSlots 8 + } + MultiSlotConfiguration "{66E81CB9ACED528B}" { + SlotTemplate LoadoutSlotInfo Epinephrine { + Prefab "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" + } + NumSlots 8 + } + MultiSlotConfiguration "{66E81CB9F5B0F5B5}" { + SlotTemplate LoadoutSlotInfo Bandage { + Prefab "{C3F1FA1E2EC2B345}Prefabs/Items/Medicine/FieldDressing_01/FieldDressing_USSR_01.et" + } + NumSlots 8 + } + MultiSlotConfiguration "{66E81CBA65FAD3C2}" { + SlotTemplate InventoryStorageSlot Saline { + Prefab "{527D7C5D2E476BDC}Prefabs/Items/Medicine/SalineBag_01/SalineBag_USSR_01.et" + } + NumSlots 3 + } + } + m_fMaxWeight 10 + } + } +} \ No newline at end of file diff --git a/addons/medical_core/Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_AC_Medic.et.meta b/addons/medical_core/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et.meta similarity index 77% rename from addons/medical_core/Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_AC_Medic.et.meta rename to addons/medical_core/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et.meta index 7bc0f9152..36ef13582 100644 --- a/addons/medical_core/Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_AC_Medic.et.meta +++ b/addons/medical_core/Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et.meta @@ -1,5 +1,5 @@ MetaFileClass { - Name "{4E29194BA809DF32}Prefabs/Characters/Factions/INDFOR/FIA/Character_FIA_AC_Medic.et" + Name "{46FD263F0F368A92}Prefabs/Items/Equipment/Kits/MedicalKit_01/MedicalKit_01_base.et" Configurations { EntityTemplateResourceClass PC { } diff --git a/addons/medical_core/scripts/Game/ACE_Medical_MedicalKit/Inventory/ACE_Medical_MedicalKitInventoryStorageComponent.c b/addons/medical_core/scripts/Game/ACE_Medical_MedicalKit/Inventory/ACE_Medical_MedicalKitInventoryStorageComponent.c new file mode 100644 index 000000000..759b9a554 --- /dev/null +++ b/addons/medical_core/scripts/Game/ACE_Medical_MedicalKit/Inventory/ACE_Medical_MedicalKitInventoryStorageComponent.c @@ -0,0 +1,18 @@ +//------------------------------------------------------------------------------------------------ +class ACE_Medical_MedicalKitInventoryStorageComponentClass : SCR_UniversalInventoryStorageComponentClass +{ +} + +//------------------------------------------------------------------------------------------------ +class ACE_Medical_MedicalKitInventoryStorageComponent : SCR_UniversalInventoryStorageComponent +{ + //------------------------------------------------------------------------------------------------ + //! Only allow medical items + override bool CanStoreItem(IEntity item, int slotID) + { + if (!super.CanStoreItem(item, slotID)) + return false; + + return item.FindComponent(SCR_ConsumableItemComponent); + } +}