diff --git a/addons/captives/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf b/addons/captives/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf new file mode 100644 index 000000000..1186cc782 --- /dev/null +++ b/addons/captives/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf @@ -0,0 +1,14 @@ +ACE_EntityCatalogMultiListEntry { + m_aEntities { + SCR_EntityCatalogInventoryItem "{64FC20C065CA64F5}" { + m_sEntityPrefab "{CBF9B9942E07B6B8}Prefabs/Items/Equipment/Accessories/ZipCuffs/ACE_Captives_ZipCuffs.et" + m_aEntityDataList { + SCR_ArsenalItem "{64FC20C19D482C89}" { + m_eItemType EQUIPMENT + m_eItemMode CONSUMABLE + m_iSupplyCost 0 + } + } + } + } +} \ No newline at end of file diff --git a/addons/tactical_periscope/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta b/addons/captives/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf.meta similarity index 77% rename from addons/tactical_periscope/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta rename to addons/captives/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf.meta index ca1cb77ce..28b784c60 100644 --- a/addons/tactical_periscope/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta +++ b/addons/captives/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf.meta @@ -1,5 +1,5 @@ MetaFileClass { - Name "{E908001749419691}Configs/EntityCatalog/FIA/FIA_InventoryItems.conf" + Name "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItemsBase.conf" Configurations { CONFResourceClass PC { } diff --git a/addons/captives/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf b/addons/captives/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf deleted file mode 100644 index ac6929e87..000000000 --- a/addons/captives/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf +++ /dev/null @@ -1,18 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C630E453BCB39DC}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{64FC20C065CA64F5}" { - m_sEntityPrefab "{CBF9B9942E07B6B8}Prefabs/Items/Equipment/Accessories/ZipCuffs/ACE_Captives_ZipCuffs.et" - m_aEntityDataList { - SCR_ArsenalItem "{64FC20C19D482C89}" { - m_eItemType EQUIPMENT - m_eItemMode CONSUMABLE - m_iSupplyCost 0 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/captives/Configs/EntityCatalog/US/US_InventoryItems.conf b/addons/captives/Configs/EntityCatalog/US/US_InventoryItems.conf deleted file mode 100644 index 18144b2d1..000000000 --- a/addons/captives/Configs/EntityCatalog/US/US_InventoryItems.conf +++ /dev/null @@ -1,18 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C68AD59F0753ABE}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{64FC20C065CA64F5}" { - m_sEntityPrefab "{CBF9B9942E07B6B8}Prefabs/Items/Equipment/Accessories/ZipCuffs/ACE_Captives_ZipCuffs.et" - m_aEntityDataList { - SCR_ArsenalItem "{64FC20C19D482C89}" { - m_eItemType EQUIPMENT - m_eItemMode CONSUMABLE - m_iSupplyCost 0 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/captives/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf b/addons/captives/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf deleted file mode 100644 index bcb41f324..000000000 --- a/addons/captives/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf +++ /dev/null @@ -1,18 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C68AD5F7414CA4A}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{64FC20C065CA64F5}" { - m_sEntityPrefab "{CBF9B9942E07B6B8}Prefabs/Items/Equipment/Accessories/ZipCuffs/ACE_Captives_ZipCuffs.et" - m_aEntityDataList { - SCR_ArsenalItem "{64FC20C19D482C89}" { - m_eItemType EQUIPMENT - m_eItemMode CONSUMABLE - m_iSupplyCost 0 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/core/Configs/Commanding/Commands.conf b/addons/core/Configs/Commanding/Commands.conf deleted file mode 100644 index 9af8b8e52..000000000 --- a/addons/core/Configs/Commanding/Commands.conf +++ /dev/null @@ -1,13 +0,0 @@ -SCR_PlayerCommandsConfig { - m_aCommands { - SCR_EmoteBaseCommand "{5E5EB494504D3446}" { - m_sCommandDisplayName "#ACE-Emotes_Emote_Salute_Name" - } - SCR_ContinuousLoiterCommand "{5F18D844144238E7}" { - m_sCommandDisplayName "#ACE-Emotes_Emote_SitOnFloor_Name" - } - SCR_ContinuousLoiterCommand "{5F2681433CC03793}" { - m_sCommandDisplayName "#ACE-Emotes_Emote_Pushups_Name" - } - } -} \ No newline at end of file diff --git a/addons/core/Configs/Commanding/EmoteMenu.conf b/addons/core/Configs/Commanding/EmoteMenu.conf deleted file mode 100644 index c81a25f22..000000000 --- a/addons/core/Configs/Commanding/EmoteMenu.conf +++ /dev/null @@ -1,12 +0,0 @@ -SCR_PlayerCommandingMenuConfig { - m_RootCategory SCR_PlayerCommandingMenuCategoryElement "{610AD5372D760250}" { - m_aElements { - SCR_PlayerCommandingMenuCommand "{6477157941CAEDF8}" { - m_sCommandName "sitLoiterEmote" - } - SCR_PlayerCommandingMenuCommand "{6477157962A9312B}" { - m_sCommandName "pushupsLoiterEmote" - } - } - } -} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf b/addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf new file mode 100644 index 000000000..bdc38f217 --- /dev/null +++ b/addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf @@ -0,0 +1,24 @@ +ACE_EntityCatalogMultiListEntry { + m_sIdentifier "ACE Equipment" + m_aEntities { + SCR_EntityCatalogInventoryItem "{60FD565F7DFBE6A4}" { + m_sEntityPrefab "{181B4ADA65725D59}Prefabs/Items/Core/ACE_Banana.et" + m_aEntityDataList { + SCR_ArsenalItem "{60FD565F75061ED6}" { + m_eItemType NON_LETHAL_THROWABLE + m_iSupplyCost 0 + } + } + } + SCR_EntityCatalogInventoryItem "{60FD565F20A453B3}" { + m_sEntityPrefab "{9310D03C4A62286F}Prefabs/Weapons/Grenades/ACE_FragBanana.et" + m_aEntityDataList { + SCR_ArsenalItem "{60FD565F5B120DC6}" { + m_eItemType LETHAL_THROWABLE + m_iSupplyCost 3 + } + } + } + } + m_iACE_Priority -25 +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta b/addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf.meta similarity index 77% rename from addons/core/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta rename to addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf.meta index ca1cb77ce..28b784c60 100644 --- a/addons/core/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta +++ b/addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf.meta @@ -1,5 +1,5 @@ MetaFileClass { - Name "{E908001749419691}Configs/EntityCatalog/FIA/FIA_InventoryItems.conf" + Name "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItemsBase.conf" Configurations { CONFResourceClass PC { } diff --git a/addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf b/addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf new file mode 100644 index 000000000..a0b3ea597 --- /dev/null +++ b/addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf @@ -0,0 +1,4 @@ +ACE_EntityCatalogMultiListEntry { + m_sIdentifier "ACE Medical" + m_iACE_Priority -35 +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf.meta b/addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf.meta new file mode 100644 index 000000000..a7d63222d --- /dev/null +++ b/addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{A5E3827C546B8210}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf b/addons/core/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf deleted file mode 100644 index d631a6652..000000000 --- a/addons/core/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf +++ /dev/null @@ -1,26 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C68AD58703CABF4}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{60FD565F7DFBE6A4}" { - m_sEntityPrefab "{181B4ADA65725D59}Prefabs/Items/Core/ACE_Banana.et" - m_aEntityDataList { - SCR_ArsenalItem "{60FD565F75061ED6}" { - m_eItemType NON_LETHAL_THROWABLE - m_iSupplyCost 0 - } - } - } - SCR_EntityCatalogInventoryItem "{60FD565F20A453B3}" { - m_sEntityPrefab "{9310D03C4A62286F}Prefabs/Weapons/Grenades/ACE_FragBanana.et" - m_aEntityDataList { - SCR_ArsenalItem "{60FD565F5B120DC6}" { - m_eItemType LETHAL_THROWABLE - m_iSupplyCost 3 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf b/addons/core/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf new file mode 100644 index 000000000..2d3098ef3 --- /dev/null +++ b/addons/core/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf @@ -0,0 +1,29 @@ +SCR_EntityCatalogMultiList { + m_aMultiLists { + SCR_EntityCatalogMultiListEntry "{5C630E453CE20F8F}" { + m_iACE_Priority -70 + } + SCR_EntityCatalogMultiListEntry "{5C630E4538D3163D}" { + m_iACE_Priority -60 + } + SCR_EntityCatalogMultiListEntry "{5C630E453CA0B981}" { + m_iACE_Priority -50 + } + SCR_EntityCatalogMultiListEntry "{5C68AD58703CABF4}" { + m_iACE_Priority -40 + } + SCR_EntityCatalogMultiListEntry "{5C630E453BCB39DC}" { + m_iACE_Priority -30 + } + SCR_EntityCatalogMultiListEntry "{5C630E453B60C320}" { + m_iACE_Priority -20 + } + SCR_EntityCatalogMultiListEntry "{5C630E453B27FB86}" { + m_iACE_Priority -10 + } + ACE_EntityCatalogMultiListEntry "{69D210804C2BFE9E}" : "{A5E3827C546B8210}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf" { + } + ACE_EntityCatalogMultiListEntry "{69D102AC05BFC4DC}" : "{382ACD2D23811DDE}Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf" { + } + } +} \ No newline at end of file diff --git a/addons/captives/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta b/addons/core/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf.meta similarity index 100% rename from addons/captives/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta rename to addons/core/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf.meta diff --git a/addons/core/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf b/addons/core/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf new file mode 100644 index 000000000..c41933b32 --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf @@ -0,0 +1,2 @@ +ACE_EntityCatalogMultiListEntry : "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf" { +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/US/US_InventoryItems.conf.meta b/addons/core/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf.meta similarity index 77% rename from addons/core/Configs/EntityCatalog/US/US_InventoryItems.conf.meta rename to addons/core/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf.meta index f496e754c..59be24be2 100644 --- a/addons/core/Configs/EntityCatalog/US/US_InventoryItems.conf.meta +++ b/addons/core/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf.meta @@ -1,5 +1,5 @@ MetaFileClass { - Name "{5F7EC52FC40A03E2}Configs/EntityCatalog/US/US_InventoryItems.conf" + Name "{E7D9069BE26B7A4C}Configs/EntityCatalog/ACE_UK_InventoryItems.conf" Configurations { CONFResourceClass PC { } diff --git a/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Ammunition_All.conf b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Ammunition_All.conf new file mode 100644 index 000000000..043707a49 --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Ammunition_All.conf @@ -0,0 +1,3 @@ +SCR_EntityCatalogMultiListEntry { + m_iACE_Priority -60 +} \ No newline at end of file diff --git a/addons/medical_core/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Ammunition_All.conf.meta similarity index 74% rename from addons/medical_core/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta rename to addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Ammunition_All.conf.meta index e60da21c0..765355db8 100644 --- a/addons/medical_core/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Ammunition_All.conf.meta @@ -1,5 +1,5 @@ MetaFileClass { - Name "{5F7EC52FC40A03E2}Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf" + Name "{9B8732534F2FCDAE}Configs/EntityCatalog/UK/Arsenal Lists/UK_Ammunition_All.conf" Configurations { CONFResourceClass PC { } @@ -9,9 +9,9 @@ MetaFileClass { } CONFResourceClass PS4 : PC { } - CONFResourceClass HEADLESS : PC { - } CONFResourceClass PS5 : PC { } + CONFResourceClass HEADLESS : PC { + } } } \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_BackpacksVests_All.conf b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_BackpacksVests_All.conf new file mode 100644 index 000000000..b0d41ef9e --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_BackpacksVests_All.conf @@ -0,0 +1,3 @@ +SCR_EntityCatalogMultiListEntry { + m_iACE_Priority -20 +} \ No newline at end of file diff --git a/addons/medical_core/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf.meta b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_BackpacksVests_All.conf.meta similarity index 73% rename from addons/medical_core/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf.meta rename to addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_BackpacksVests_All.conf.meta index 49381bb91..636707ef3 100644 --- a/addons/medical_core/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf.meta +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_BackpacksVests_All.conf.meta @@ -1,5 +1,5 @@ MetaFileClass { - Name "{E908001749419691}Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf" + Name "{89C89802F8B15EF0}Configs/EntityCatalog/UK/Arsenal Lists/UK_BackpacksVests_All.conf" Configurations { CONFResourceClass PC { } @@ -9,9 +9,9 @@ MetaFileClass { } CONFResourceClass PS4 : PC { } - CONFResourceClass HEADLESS : PC { - } CONFResourceClass PS5 : PC { } + CONFResourceClass HEADLESS : PC { + } } } \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Clothing_All.conf b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Clothing_All.conf new file mode 100644 index 000000000..d13f2664e --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Clothing_All.conf @@ -0,0 +1,3 @@ +SCR_EntityCatalogMultiListEntry { + m_iACE_Priority -10 +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Clothing_All.conf.meta b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Clothing_All.conf.meta new file mode 100644 index 000000000..dd8741a2d --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Clothing_All.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{2A937B904F3FA670}Configs/EntityCatalog/UK/Arsenal Lists/UK_Clothing_All.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Equipment_All.conf b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Equipment_All.conf new file mode 100644 index 000000000..9f5d327ac --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Equipment_All.conf @@ -0,0 +1,3 @@ +SCR_EntityCatalogMultiListEntry { + m_iACE_Priority -30 +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Equipment_All.conf.meta b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Equipment_All.conf.meta new file mode 100644 index 000000000..faf27f22f --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Equipment_All.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{92B601BD2DC5A55F}Configs/EntityCatalog/UK/Arsenal Lists/UK_Equipment_All.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Explosives_All.conf b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Explosives_All.conf new file mode 100644 index 000000000..e001fab76 --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Explosives_All.conf @@ -0,0 +1,3 @@ +SCR_EntityCatalogMultiListEntry { + m_iACE_Priority -40 +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Explosives_All.conf.meta b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Explosives_All.conf.meta new file mode 100644 index 000000000..ab28dc1c8 --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Explosives_All.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{0F0D0C941E412EE7}Configs/EntityCatalog/UK/Arsenal Lists/UK_Explosives_All.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_WeaponAttachments_All.conf b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_WeaponAttachments_All.conf new file mode 100644 index 000000000..854beddfc --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_WeaponAttachments_All.conf @@ -0,0 +1,3 @@ +SCR_EntityCatalogMultiListEntry { + m_iACE_Priority -50 +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_WeaponAttachments_All.conf.meta b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_WeaponAttachments_All.conf.meta new file mode 100644 index 000000000..21650723d --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_WeaponAttachments_All.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{37FBA7E7466F4CB9}Configs/EntityCatalog/UK/Arsenal Lists/UK_WeaponAttachments_All.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Weapons_All.conf b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Weapons_All.conf new file mode 100644 index 000000000..23d083d1d --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Weapons_All.conf @@ -0,0 +1,3 @@ +SCR_EntityCatalogMultiListEntry { + m_iACE_Priority -70 +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Weapons_All.conf.meta b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Weapons_All.conf.meta new file mode 100644 index 000000000..083d66647 --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Weapons_All.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{C2EE8603146E36CB}Configs/EntityCatalog/UK/Arsenal Lists/UK_Weapons_All.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/UK/UK_InventoryItems.conf b/addons/core/Configs/EntityCatalog/UK/UK_InventoryItems.conf new file mode 100644 index 000000000..e315d7a65 --- /dev/null +++ b/addons/core/Configs/EntityCatalog/UK/UK_InventoryItems.conf @@ -0,0 +1,8 @@ +SCR_EntityCatalogMultiList { + m_aMultiLists { + ACE_EntityCatalogMultiListEntry "{69D247D5F3DF316A}" : "{A5E3827C546B8210}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf" { + } + ACE_EntityCatalogMultiListEntry "{69D247D5F0D5014E}" : "{E7D9069BE26B7A4C}Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf" { + } + } +} \ No newline at end of file diff --git a/addons/facepaint/Configs/EntityCatalog/UK/UK_InventoryItems.conf.meta b/addons/core/Configs/EntityCatalog/UK/UK_InventoryItems.conf.meta similarity index 100% rename from addons/facepaint/Configs/EntityCatalog/UK/UK_InventoryItems.conf.meta rename to addons/core/Configs/EntityCatalog/UK/UK_InventoryItems.conf.meta diff --git a/addons/core/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf b/addons/core/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf new file mode 100644 index 000000000..c41933b32 --- /dev/null +++ b/addons/core/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf @@ -0,0 +1,2 @@ +ACE_EntityCatalogMultiListEntry : "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf" { +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf.meta b/addons/core/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf.meta similarity index 81% rename from addons/core/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf.meta rename to addons/core/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf.meta index e300bbe36..9ff7b4525 100644 --- a/addons/core/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf.meta +++ b/addons/core/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf.meta @@ -1,5 +1,5 @@ MetaFileClass { - Name "{C53421647C3D0D2E}Configs/EntityCatalog/USSR/USSR_InventoryItems.conf" + Name "{12790B4E7D42F952}Configs/EntityCatalog/US/ACE_US_InventoryItems.conf" Configurations { CONFResourceClass PC { } diff --git a/addons/core/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf b/addons/core/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf new file mode 100644 index 000000000..30be64e2e --- /dev/null +++ b/addons/core/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf @@ -0,0 +1,29 @@ +SCR_EntityCatalogMultiList { + m_aMultiLists { + SCR_EntityCatalogMultiListEntry "{5C68AD59AB9FBDDC}" { + m_iACE_Priority -70 + } + SCR_EntityCatalogMultiListEntry "{5C68AD59AA6FA1B8}" { + m_iACE_Priority -60 + } + SCR_EntityCatalogMultiListEntry "{5C68AD59AA315A22}" { + m_iACE_Priority -50 + } + SCR_EntityCatalogMultiListEntry "{5CA0A9E60B892D2A}" { + m_iACE_Priority -40 + } + SCR_EntityCatalogMultiListEntry "{5C68AD59F0753ABE}" { + m_iACE_Priority -30 + } + SCR_EntityCatalogMultiListEntry "{5C68AD59AA2B2FF4}" { + m_iACE_Priority -20 + } + SCR_EntityCatalogMultiListEntry "{5C68AD59AA1A6D59}" { + m_iACE_Priority -10 + } + ACE_EntityCatalogMultiListEntry "{69D102AC212B4389}" : "{A5E3827C546B8210}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf" { + } + ACE_EntityCatalogMultiListEntry "{69D2108069E4B053}" : "{12790B4E7D42F952}Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf" { + } + } +} \ No newline at end of file diff --git a/addons/captives/Configs/EntityCatalog/US/US_InventoryItems.conf.meta b/addons/core/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta similarity index 100% rename from addons/captives/Configs/EntityCatalog/US/US_InventoryItems.conf.meta rename to addons/core/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta diff --git a/addons/core/Configs/EntityCatalog/US/US_InventoryItems.conf b/addons/core/Configs/EntityCatalog/US/US_InventoryItems.conf deleted file mode 100644 index 8435bbfce..000000000 --- a/addons/core/Configs/EntityCatalog/US/US_InventoryItems.conf +++ /dev/null @@ -1,26 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5CA0A9E60B892D2A}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{60FD565F7DFBE6A4}" { - m_sEntityPrefab "{181B4ADA65725D59}Prefabs/Items/Core/ACE_Banana.et" - m_aEntityDataList { - SCR_ArsenalItem "{60FD565F75061ED6}" { - m_eItemType NON_LETHAL_THROWABLE - m_iSupplyCost 0 - } - } - } - SCR_EntityCatalogInventoryItem "{60FD565F20A453B3}" { - m_sEntityPrefab "{9310D03C4A62286F}Prefabs/Weapons/Grenades/ACE_FragBanana.et" - m_aEntityDataList { - SCR_ArsenalItem "{60FD565F5B120DC6}" { - m_eItemType LETHAL_THROWABLE - m_iSupplyCost 3 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf b/addons/core/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf new file mode 100644 index 000000000..c41933b32 --- /dev/null +++ b/addons/core/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf @@ -0,0 +1,2 @@ +ACE_EntityCatalogMultiListEntry : "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf" { +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf.meta b/addons/core/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf.meta new file mode 100644 index 000000000..3fba1bccb --- /dev/null +++ b/addons/core/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{382ACD2D23811DDE}Configs/EntityCatalog/USSR/ACE_USSR_InventoryItems.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/core/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf b/addons/core/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf new file mode 100644 index 000000000..e67b1973b --- /dev/null +++ b/addons/core/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf @@ -0,0 +1,29 @@ +SCR_EntityCatalogMultiList { + m_aMultiLists { + SCR_EntityCatalogMultiListEntry "{5C68AD5F14BDB1A7}" { + m_iACE_Priority -70 + } + SCR_EntityCatalogMultiListEntry "{5C68AD5F148714C4}" { + m_iACE_Priority -60 + } + SCR_EntityCatalogMultiListEntry "{5C68AD5F137C9AFF}" { + m_iACE_Priority -50 + } + SCR_EntityCatalogMultiListEntry "{5C68AD5F1351A624}" { + m_iACE_Priority -40 + } + SCR_EntityCatalogMultiListEntry "{5C68AD5F7414CA4A}" { + m_iACE_Priority -30 + } + SCR_EntityCatalogMultiListEntry "{5C68AD5F13464B23}" { + m_iACE_Priority -20 + } + SCR_EntityCatalogMultiListEntry "{5C68AD5F13240031}" { + m_iACE_Priority -10 + } + ACE_EntityCatalogMultiListEntry "{69D102AC4014161D}" : "{A5E3827C546B8210}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf" { + } + ACE_EntityCatalogMultiListEntry "{69D2108063218CBD}" : "{382ACD2D23811DDE}Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf" { + } + } +} \ No newline at end of file diff --git a/addons/captives/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf.meta b/addons/core/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf.meta similarity index 100% rename from addons/captives/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf.meta rename to addons/core/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf.meta diff --git a/addons/core/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf b/addons/core/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf deleted file mode 100644 index 820562a90..000000000 --- a/addons/core/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf +++ /dev/null @@ -1,26 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C68AD5F1351A624}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{60FD565F7DFBE6A4}" { - m_sEntityPrefab "{181B4ADA65725D59}Prefabs/Items/Core/ACE_Banana.et" - m_aEntityDataList { - SCR_ArsenalItem "{60FD565F75061ED6}" { - m_eItemType NON_LETHAL_THROWABLE - m_iSupplyCost 0 - } - } - } - SCR_EntityCatalogInventoryItem "{60FD565F20A453B3}" { - m_sEntityPrefab "{9310D03C4A62286F}Prefabs/Weapons/Grenades/ACE_FragBanana.et" - m_aEntityDataList { - SCR_ArsenalItem "{60FD565F5B120DC6}" { - m_eItemType LETHAL_THROWABLE - m_iSupplyCost 3 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/core/Language/ACE_localization.cs_cz.conf b/addons/core/Language/ACE_localization.cs_cz.conf index 2dc44d8b1..f592c7462 100755 --- a/addons/core/Language/ACE_localization.cs_cz.conf +++ b/addons/core/Language/ACE_localization.cs_cz.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "Push-ups" - "Salute" - "Sit on the floor" "Zdravá dávka draslíku!" "Banán" "Nést" diff --git a/addons/core/Language/ACE_localization.de_de.conf b/addons/core/Language/ACE_localization.de_de.conf index 08c0c9480..ea0da0b49 100755 --- a/addons/core/Language/ACE_localization.de_de.conf +++ b/addons/core/Language/ACE_localization.de_de.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "Liegestützen" - "Salutieren" - "Auf den Boden sitzen" "Gesundes Kalium!" "Banane" "Tragen" diff --git a/addons/core/Language/ACE_localization.en_us.conf b/addons/core/Language/ACE_localization.en_us.conf index 90d322075..5ae1a4986 100755 --- a/addons/core/Language/ACE_localization.en_us.conf +++ b/addons/core/Language/ACE_localization.en_us.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "Push-ups" - "Salute" - "Sit on the floor" "Healthy potassium!" "Banana" "Carry" diff --git a/addons/core/Language/ACE_localization.es_es.conf b/addons/core/Language/ACE_localization.es_es.conf index ca03d5681..df87e9e9f 100755 --- a/addons/core/Language/ACE_localization.es_es.conf +++ b/addons/core/Language/ACE_localization.es_es.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "Lagartijas" - "Saludo militar" - "Sentarse en el suelo" "¡Potasio saludable!" "Plátano" "Llevar" diff --git a/addons/core/Language/ACE_localization.fr_fr.conf b/addons/core/Language/ACE_localization.fr_fr.conf index f0849141d..4ef6a44bf 100755 --- a/addons/core/Language/ACE_localization.fr_fr.conf +++ b/addons/core/Language/ACE_localization.fr_fr.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "Faire des pompes" - "Salut militaire" - "Asseyez-vous par terre" "Potassium bon pour la santé !" "Banane" "Porter" diff --git a/addons/core/Language/ACE_localization.it_it.conf b/addons/core/Language/ACE_localization.it_it.conf index 76048b834..220223e63 100755 --- a/addons/core/Language/ACE_localization.it_it.conf +++ b/addons/core/Language/ACE_localization.it_it.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "Flessioni" - "Saluto militare" - "Sedersi per terra" "Potassio sano!" "Banana" "Trasporta" diff --git a/addons/core/Language/ACE_localization.ja_jp.conf b/addons/core/Language/ACE_localization.ja_jp.conf index b6c6d4489..b383cd773 100755 --- a/addons/core/Language/ACE_localization.ja_jp.conf +++ b/addons/core/Language/ACE_localization.ja_jp.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "腕立て伏せ" - "敬礼" - "地面に座る" "健康に良いカリウム！" "バナナ" "持ちあげて運ぶ" diff --git a/addons/core/Language/ACE_localization.ko_kr.conf b/addons/core/Language/ACE_localization.ko_kr.conf index e2a1bb76c..1de394886 100755 --- a/addons/core/Language/ACE_localization.ko_kr.conf +++ b/addons/core/Language/ACE_localization.ko_kr.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "팔굽혀펴기" - "경례" - "바닥에 앉기" "건강한 칼륨덩어리입니다!" "바나나" "업기" diff --git a/addons/core/Language/ACE_localization.pl_pl.conf b/addons/core/Language/ACE_localization.pl_pl.conf index f25e5bc26..41c581831 100755 --- a/addons/core/Language/ACE_localization.pl_pl.conf +++ b/addons/core/Language/ACE_localization.pl_pl.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "Push-ups" - "Salute" - "Sit on the floor" "Healthy potassium!" "Banana" "Nieś" diff --git a/addons/core/Language/ACE_localization.pt_br.conf b/addons/core/Language/ACE_localization.pt_br.conf index 0efaf0423..2110eca16 100755 --- a/addons/core/Language/ACE_localization.pt_br.conf +++ b/addons/core/Language/ACE_localization.pt_br.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "Flexões" - "Comprimeto militar" - "Sentar no chão" "Potássio saudável!" "Banana" "Carregar" diff --git a/addons/core/Language/ACE_localization.ru_ru.conf b/addons/core/Language/ACE_localization.ru_ru.conf index 53e0a6d48..9d4c74d55 100755 --- a/addons/core/Language/ACE_localization.ru_ru.conf +++ b/addons/core/Language/ACE_localization.ru_ru.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "Push-ups" - "Salute" - "Sit on the floor" "Здоровый калий!" "Банан" "Перенести" diff --git a/addons/core/Language/ACE_localization.st b/addons/core/Language/ACE_localization.st index 4d9b15834..849b4cc59 100644 --- a/addons/core/Language/ACE_localization.st +++ b/addons/core/Language/ACE_localization.st @@ -20,51 +20,6 @@ StringTable { Author "kexanone" LastChanged "kexanone" } - CustomStringTableItem "{64771570B1AFAB10}" { - Id "ACE-Emotes_Emote_Pushups_Name" - Target_en_us "Push-ups" - Target_fr_fr "Faire des pompes" - Target_it_it "Flessioni" - Target_de_de "Liegestützen" - Target_es_es "Lagartijas" - Target_ja_jp "腕立て伏せ" - Target_ko_kr "팔굽혀펴기" - Target_pt_br "Flexões" - Target_zh_cn "伏地挺身" - Modified 1750690968 - Author "Kex" - LastChanged "michy_REV19" - } - CustomStringTableItem "{64771570304E885F}" { - Id "ACE-Emotes_Emote_Salute_Name" - Target_en_us "Salute" - Target_fr_fr "Salut militaire" - Target_it_it "Saluto militare" - Target_de_de "Salutieren" - Target_es_es "Saludo militar" - Target_ja_jp "敬礼" - Target_ko_kr "경례" - Target_pt_br "Comprimeto militar" - Target_zh_cn "敬禮" - Modified 1750691025 - Author "Kex" - LastChanged "michy_REV19" - } - CustomStringTableItem "{64771570B4AF7606}" { - Id "ACE-Emotes_Emote_SitOnFloor_Name" - Target_en_us "Sit on the floor" - Target_fr_fr "Asseyez-vous par terre" - Target_it_it "Sedersi per terra" - Target_de_de "Auf den Boden sitzen" - Target_es_es "Sentarse en el suelo" - Target_ja_jp "地面に座る" - Target_ko_kr "바닥에 앉기" - Target_pt_br "Sentar no chão" - Target_zh_cn "席地而坐" - Modified 1750691043 - Author "Kex" - LastChanged "michy_REV19" - } CustomStringTableItem "{60FD565E5C4D775C}" { Id "ACE-Item_Banana_Description" Target_en_us "Healthy potassium!" diff --git a/addons/core/Language/ACE_localization.uk_ua.conf b/addons/core/Language/ACE_localization.uk_ua.conf index aebafbce8..79fb69476 100755 --- a/addons/core/Language/ACE_localization.uk_ua.conf +++ b/addons/core/Language/ACE_localization.uk_ua.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "Push-ups" - "Salute" - "Sit on the floor" "Здоровий калій!" "Банан" "Перенести" diff --git a/addons/core/Language/ACE_localization.zh_cn.conf b/addons/core/Language/ACE_localization.zh_cn.conf index b3390c589..b7eed88a4 100755 --- a/addons/core/Language/ACE_localization.zh_cn.conf +++ b/addons/core/Language/ACE_localization.zh_cn.conf @@ -1,9 +1,6 @@ StringTableRuntime { Ids { "ACE-Acronym" - "ACE-Emotes_Emote_Pushups_Name" - "ACE-Emotes_Emote_Salute_Name" - "ACE-Emotes_Emote_SitOnFloor_Name" "ACE-Item_Banana_Description" "ACE-Item_Banana_Name" "ACE-UserAction_Carry" @@ -16,9 +13,6 @@ StringTableRuntime { } Texts { "ACE" - "伏地挺身" - "敬禮" - "席地而坐" "香蕉含鉀量高，腎功能不良者應諮詢醫生後食用" "香蕉" "背負" diff --git a/addons/core/scripts/Game/ACE_Core/Commanding/Commands/SCR_ContinuousLoiterCommand.c b/addons/core/scripts/Game/ACE_Core/Commanding/Commands/SCR_ContinuousLoiterCommand.c index 1acd37ef8..4243b084b 100644 --- a/addons/core/scripts/Game/ACE_Core/Commanding/Commands/SCR_ContinuousLoiterCommand.c +++ b/addons/core/scripts/Game/ACE_Core/Commanding/Commands/SCR_ContinuousLoiterCommand.c @@ -25,4 +25,23 @@ modded class SCR_ContinuousLoiterCommand : SCR_BaseRadialCommand return true; } + + //------------------------------------------------------------------------------------------------ + //! Fix missing assignment of m_pScrInputContext in vanilla implementation + override bool Execute(IEntity cursorTarget, IEntity groupEnt, vector targetPosition, int playerID, bool isClient) + { + if (SCR_PlayerController.GetLocalPlayerId() != playerID) + return true; + + IEntity playerControlledEntity = GetGame().GetPlayerController().GetControlledEntity(); + if (!playerControlledEntity) + return false; + + SCR_CharacterControllerComponent characterController = SCR_CharacterControllerComponent.Cast(playerControlledEntity.FindComponent(SCR_CharacterControllerComponent)); + if (!characterController) + return false; + + m_pScrInputContext = characterController.GetScrInputContext(); + return super.Execute(cursorTarget, groupEnt, targetPosition, playerID, isClient); + } } diff --git a/addons/core/scripts/Game/ACE_Core/EntityCatalog/ACE_EntityCatalogMultiListEntry.c b/addons/core/scripts/Game/ACE_Core/EntityCatalog/ACE_EntityCatalogMultiListEntry.c new file mode 100644 index 000000000..98d6e0bf3 --- /dev/null +++ b/addons/core/scripts/Game/ACE_Core/EntityCatalog/ACE_EntityCatalogMultiListEntry.c @@ -0,0 +1,6 @@ +//---------------------------------------------------------------------------- +//! Same as vanilla, but can be a standalone conf file +[BaseContainerProps(configRoot: true), SCR_BaseContainerCustomEntityCatalogMultiListEntry("m_sIdentifier", "m_aEntities")] +class ACE_EntityCatalogMultiListEntry : SCR_EntityCatalogMultiListEntry +{ +} diff --git a/addons/core/scripts/Game/ACE_Core/EntityCatalog/EntityCatalogEntry/ACE_OptionalEntityCatalogInventoryItem.c b/addons/core/scripts/Game/ACE_Core/EntityCatalog/EntityCatalogEntry/ACE_OptionalEntityCatalogInventoryItem.c new file mode 100644 index 000000000..fd618a782 --- /dev/null +++ b/addons/core/scripts/Game/ACE_Core/EntityCatalog/EntityCatalogEntry/ACE_OptionalEntityCatalogInventoryItem.c @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------------------------ +//! Same as vanilla, but additional addon GUIDs can be provided for checks +[BaseContainerProps(), SCR_BaseContainerCustomInventoryCatalogEntry("m_sEntityPrefab", "m_aEntityDataList", "m_bEnabled")] +class ACE_OptionalEntityCatalogInventoryItem : SCR_EntityCatalogInventoryItem +{ + [Attribute(desc: "Addon GUID required for this entry to be enabled. Used for checking optional dependencies.")] + protected string m_sRequiredAddonGUID; + + [Attribute(desc: "Addon GUID which disables this entry. Used for checking optional dependencies.")] + protected string m_sDisallowedAddonGUID; + + //------------------------------------------------------------------------------------------------ + override bool IsEnabled() + { + if (!super.IsEnabled()) + return false; + + array loadedAddonGUIDs = {}; + GameProject.GetLoadedAddons(loadedAddonGUIDs); + + if (!m_sDisallowedAddonGUID.IsEmpty() && loadedAddonGUIDs.Contains(m_sDisallowedAddonGUID)) + return false; + + return (m_sRequiredAddonGUID.IsEmpty() || loadedAddonGUIDs.Contains(m_sRequiredAddonGUID)); + } +} diff --git a/addons/core/scripts/Game/ACE_Core/EntityCatalog/SCR_EntityCatalogMultiList.c b/addons/core/scripts/Game/ACE_Core/EntityCatalog/SCR_EntityCatalogMultiList.c new file mode 100644 index 000000000..991550c20 --- /dev/null +++ b/addons/core/scripts/Game/ACE_Core/EntityCatalog/SCR_EntityCatalogMultiList.c @@ -0,0 +1,11 @@ +//------------------------------------------------------------------------------------------------ +[BaseContainerProps(configRoot: true), SCR_BaseContainerCustomEntityCatalogCatalog(EEntityCatalogType, "m_eEntityCatalogType", "m_aEntityEntryList", "m_aMultiLists")] +modded class SCR_EntityCatalogMultiList: SCR_EntityCatalog +{ + //------------------------------------------------------------------------------------------------ + protected override void InitCatalog() + { + ACE_Sorting, ACE_CompateEntityCatalogMultiListEntryPriority>.InsertionSort(m_aMultiLists); + super.InitCatalog(); + } +} diff --git a/addons/core/scripts/Game/ACE_Core/EntityCatalog/SCR_EntityCatalogMultiListEntry.c b/addons/core/scripts/Game/ACE_Core/EntityCatalog/SCR_EntityCatalogMultiListEntry.c new file mode 100644 index 000000000..de89fb368 --- /dev/null +++ b/addons/core/scripts/Game/ACE_Core/EntityCatalog/SCR_EntityCatalogMultiListEntry.c @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------------------------ +[BaseContainerProps(), SCR_BaseContainerCustomEntityCatalogMultiListEntry("m_sIdentifier", "m_aEntities")] +modded class SCR_EntityCatalogMultiListEntry +{ + [SortAttribute(), Attribute(desc: "Sort priority of the entry. Lower value means higher priority.")] + int m_iACE_Priority; +} + +//------------------------------------------------------------------------------------------------ +class ACE_CompateEntityCatalogMultiListEntryPriority : SCR_SortCompare +{ + //------------------------------------------------------------------------------------------------ + override static int Compare(SCR_EntityCatalogMultiListEntry left, SCR_EntityCatalogMultiListEntry right) + { + return left.m_iACE_Priority < right.m_iACE_Priority; + } +} diff --git a/addons/core/scripts/Game/ACE_Core/Global/Sorting/ACE_Sorting.c b/addons/core/scripts/Game/ACE_Core/Global/Sorting/ACE_Sorting.c new file mode 100644 index 000000000..94defbf65 --- /dev/null +++ b/addons/core/scripts/Game/ACE_Core/Global/Sorting/ACE_Sorting.c @@ -0,0 +1,31 @@ +//--------------------------------------------------------------------------------------------------- +class ACE_Sorting +{ + //--------------------------------------------------------------------------------------------------- + //! Sorts container inplace with insertion sort, a stable and adpative sorting algorithm + //! \param[in] a Container to sort + //! \param[in] inverse Sort in ascending order when false + static void InsertionSort(TContainer a, bool inverse = false) + { + for (int i = 1, count = a.Count(); i < count; i++) + { + T tmp = a[i]; + + for (int j = i; j > 0; j--) + { + if (!inverse) + { + if (!TCompare.Compare(tmp, a[j - 1])) + break; + } + else + { + if (!TCompare.Compare(a[j - 1], tmp)) + break; + } + + a.SwapItems(j - 1, j); + } + } + } +} diff --git a/addons/core/scripts/Game/ACE_Core/UserActions/SCR_GetInUserAction.c b/addons/core/scripts/Game/ACE_Core/UserActions/SCR_GetInUserAction.c index 6f4eaa59f..f2e6eb5ae 100644 --- a/addons/core/scripts/Game/ACE_Core/UserActions/SCR_GetInUserAction.c +++ b/addons/core/scripts/Game/ACE_Core/UserActions/SCR_GetInUserAction.c @@ -17,8 +17,26 @@ modded class SCR_GetInUserAction : SCR_CompartmentUserAction { SetCannotPerformReason("#ACE-UserAction_Carrying"); return false; - }; + } return super.CanBePerformedScript(user); - } + } + + //------------------------------------------------------------------------------------------------ + //! Hide action when character is performing an loitering emote + override bool CanBeShownScript(IEntity user) + { + if (!super.CanBeShownScript(user)) + return false; + + SCR_ChimeraCharacter userChar = SCR_ChimeraCharacter.Cast(user); + if (!userChar) + return false; + + SCR_CharacterControllerComponent userCharController = SCR_CharacterControllerComponent.Cast(userChar.GetCharacterController()); + if (!userCharController || userCharController.IsLoitering()) + return false; + + return true; + } } diff --git a/addons/facepaint/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf b/addons/facepaint/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf deleted file mode 100644 index b919c388e..000000000 --- a/addons/facepaint/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf +++ /dev/null @@ -1,17 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C630E453BCB39DC}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{65270736038395D9}" { - m_sEntityPrefab "{28FA34E692783ACB}Prefabs/Items/ACE_Facepaint_01_USSR.et" - m_aEntityDataList { - SCR_ArsenalItem "{62F30440549B386D}" { - m_eItemType EQUIPMENT - m_iSupplyCost 0 - } - } - } - } - } - } -} diff --git a/addons/facepaint/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf.meta b/addons/facepaint/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf.meta deleted file mode 100644 index 7d8f7d436..000000000 --- a/addons/facepaint/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf.meta +++ /dev/null @@ -1,19 +0,0 @@ -MetaFileClass { - Name "{E908001749419691}Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf" - Configurations { - CONFResourceClass PC { - } - CONFResourceClass XBOX_ONE : PC { - } - CONFResourceClass XBOX_SERIES : PC { - } - CONFResourceClass PS4 : PC { - } - CONFResourceClass PS5 : PC { - } - CONFResourceClass HEADLESS : PC { - } - CONFResourceClass Xbox : PC { - } - } -} \ No newline at end of file diff --git a/addons/facepaint/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf b/addons/facepaint/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf new file mode 100644 index 000000000..fb372e95f --- /dev/null +++ b/addons/facepaint/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf @@ -0,0 +1,13 @@ +ACE_EntityCatalogMultiListEntry : "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf" { + m_aEntities { + SCR_EntityCatalogInventoryItem "{68EB10F5497121E7}" { + m_sEntityPrefab "{1642314A5C9B5C13}Prefabs/Items/ACE_Facepaint_01_UK.et" + m_aEntityDataList { + SCR_ArsenalItem "{62F30440549B386D}" { + m_eItemType EQUIPMENT + m_iSupplyCost 0 + } + } + } + } +} \ No newline at end of file diff --git a/addons/tactical_ladder/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf.meta b/addons/facepaint/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf.meta similarity index 81% rename from addons/tactical_ladder/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf.meta rename to addons/facepaint/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf.meta index e300bbe36..26fdded58 100644 --- a/addons/tactical_ladder/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf.meta +++ b/addons/facepaint/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf.meta @@ -1,5 +1,5 @@ MetaFileClass { - Name "{C53421647C3D0D2E}Configs/EntityCatalog/USSR/USSR_InventoryItems.conf" + Name "{E7D9069BE26B7A4C}Configs/EntityCatalog/UK/ACE_UK_InventoryItems.conf" Configurations { CONFResourceClass PC { } diff --git a/addons/facepaint/Configs/EntityCatalog/UK/UK_InventoryItems.conf b/addons/facepaint/Configs/EntityCatalog/UK/UK_InventoryItems.conf deleted file mode 100644 index 25783af62..000000000 --- a/addons/facepaint/Configs/EntityCatalog/UK/UK_InventoryItems.conf +++ /dev/null @@ -1,17 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{62DD3B2896AEA994}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{68EB10F5497121E7}" { - m_sEntityPrefab "{1642314A5C9B5C13}Prefabs/Items/ACE_Facepaint_01_UK.et" - m_aEntityDataList { - SCR_ArsenalItem "{62F30440549B386D}" { - m_eItemType EQUIPMENT - m_iSupplyCost 0 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/facepaint/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf b/addons/facepaint/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf new file mode 100644 index 000000000..5cadcecdf --- /dev/null +++ b/addons/facepaint/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf @@ -0,0 +1,13 @@ +ACE_EntityCatalogMultiListEntry : "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf" { + m_aEntities { + SCR_EntityCatalogInventoryItem "{65270736F5B33C47}" { + m_sEntityPrefab "{B3F2B47340817ED6}Prefabs/Items/ACE_Facepaint_01_US.et" + m_aEntityDataList { + SCR_ArsenalItem "{62F30440549B386D}" { + m_eItemType EQUIPMENT + m_iSupplyCost 0 + } + } + } + } +} \ No newline at end of file diff --git a/addons/facepaint/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf.meta b/addons/facepaint/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf.meta new file mode 100644 index 000000000..9ff7b4525 --- /dev/null +++ b/addons/facepaint/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{12790B4E7D42F952}Configs/EntityCatalog/US/ACE_US_InventoryItems.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/facepaint/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf b/addons/facepaint/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf deleted file mode 100644 index 03b82074f..000000000 --- a/addons/facepaint/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf +++ /dev/null @@ -1,17 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C68AD59F0753ABE}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{65270736F5B33C47}" { - m_sEntityPrefab "{B3F2B47340817ED6}Prefabs/Items/ACE_Facepaint_01_US.et" - m_aEntityDataList { - SCR_ArsenalItem "{62F30440549B386D}" { - m_eItemType EQUIPMENT - m_iSupplyCost 0 - } - } - } - } - } - } -} diff --git a/addons/facepaint/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta b/addons/facepaint/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta deleted file mode 100644 index 7c752023a..000000000 --- a/addons/facepaint/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta +++ /dev/null @@ -1,19 +0,0 @@ -MetaFileClass { - Name "{5F7EC52FC40A03E2}Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf" - Configurations { - CONFResourceClass PC { - } - CONFResourceClass XBOX_ONE : PC { - } - CONFResourceClass XBOX_SERIES : PC { - } - CONFResourceClass PS4 : PC { - } - CONFResourceClass PS5 : PC { - } - CONFResourceClass HEADLESS : PC { - } - CONFResourceClass Xbox : PC { - } - } -} \ No newline at end of file diff --git a/addons/facepaint/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf b/addons/facepaint/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf new file mode 100644 index 000000000..37f2d931c --- /dev/null +++ b/addons/facepaint/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf @@ -0,0 +1,13 @@ +ACE_EntityCatalogMultiListEntry : "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf" { + m_aEntities { + SCR_EntityCatalogInventoryItem "{65270736CC1B1935}" { + m_sEntityPrefab "{28FA34E692783ACB}Prefabs/Items/ACE_Facepaint_01_USSR.et" + m_aEntityDataList { + SCR_ArsenalItem "{62F30440549B386D}" { + m_eItemType EQUIPMENT + m_iSupplyCost 0 + } + } + } + } +} \ No newline at end of file diff --git a/addons/facepaint/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf.meta b/addons/facepaint/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf.meta new file mode 100644 index 000000000..3fba1bccb --- /dev/null +++ b/addons/facepaint/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{382ACD2D23811DDE}Configs/EntityCatalog/USSR/ACE_USSR_InventoryItems.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/facepaint/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf b/addons/facepaint/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf deleted file mode 100644 index a75392eb4..000000000 --- a/addons/facepaint/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf +++ /dev/null @@ -1,17 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C68AD5F7414CA4A}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{65270736CC1B1935}" { - m_sEntityPrefab "{28FA34E692783ACB}Prefabs/Items/ACE_Facepaint_01_USSR.et" - m_aEntityDataList { - SCR_ArsenalItem "{62F30440549B386D}" { - m_eItemType EQUIPMENT - m_iSupplyCost 0 - } - } - } - } - } - } -} diff --git a/addons/facepaint/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf.meta b/addons/facepaint/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf.meta deleted file mode 100644 index b243b658d..000000000 --- a/addons/facepaint/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf.meta +++ /dev/null @@ -1,19 +0,0 @@ -MetaFileClass { - Name "{C53421647C3D0D2E}Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf" - Configurations { - CONFResourceClass PC { - } - CONFResourceClass XBOX_ONE : PC { - } - CONFResourceClass XBOX_SERIES : PC { - } - CONFResourceClass PS4 : PC { - } - CONFResourceClass PS5 : PC { - } - CONFResourceClass HEADLESS : PC { - } - CONFResourceClass Xbox : PC { - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf b/addons/medical_core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf new file mode 100644 index 000000000..538bb80ab --- /dev/null +++ b/addons/medical_core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf @@ -0,0 +1,14 @@ +ACE_EntityCatalogMultiListEntry { + m_aEntities { + SCR_EntityCatalogInventoryItem "{5E110E1DDFEFF41F}" { + m_sEntityPrefab "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" + m_aEntityDataList { + SCR_ArsenalItem "{5E110E1D8B6C3689}" { + m_eItemType HEAL + m_eItemMode CONSUMABLE + m_iSupplyCost 3 + } + } + } + } +} \ No newline at end of file diff --git a/addons/medical_core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf.meta b/addons/medical_core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf.meta new file mode 100644 index 000000000..a7d63222d --- /dev/null +++ b/addons/medical_core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{A5E3827C546B8210}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/medical_core/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf b/addons/medical_core/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf deleted file mode 100644 index 0e417e519..000000000 --- a/addons/medical_core/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf +++ /dev/null @@ -1,18 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C630E453BCB39DC}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{5E110E1E69A89740}" { - m_sEntityPrefab "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" - m_aEntityDataList { - SCR_ArsenalItem "{5E110E1D8B6C3689}" { - m_eItemType HEAL - m_eItemMode CONSUMABLE - m_iSupplyCost 3 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf b/addons/medical_core/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf deleted file mode 100644 index 47ab0fd2a..000000000 --- a/addons/medical_core/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf +++ /dev/null @@ -1,18 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C68AD59F0753ABE}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{5E110E1DC68C3537}" { - m_sEntityPrefab "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" - m_aEntityDataList { - SCR_ArsenalItem "{5E110E1D8B6C3689}" { - m_eItemType HEAL - m_eItemMode CONSUMABLE - m_iSupplyCost 3 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf b/addons/medical_core/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf deleted file mode 100644 index 6d5868fcc..000000000 --- a/addons/medical_core/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf +++ /dev/null @@ -1,18 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C68AD5F7414CA4A}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{5E110E1DDFEFF41F}" { - m_sEntityPrefab "{5B2FD067D70C1E8F}Prefabs/Items/Medicine/EpinephrineInjection/ACE_Medical_EpinephrineInjection.et" - m_aEntityDataList { - SCR_ArsenalItem "{5E110E1D8B6C3689}" { - m_eItemType HEAL - m_eItemMode CONSUMABLE - m_iSupplyCost 3 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/medical_core/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf.meta b/addons/medical_core/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf.meta deleted file mode 100644 index ec038fee9..000000000 --- a/addons/medical_core/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf.meta +++ /dev/null @@ -1,17 +0,0 @@ -MetaFileClass { - Name "{C53421647C3D0D2E}Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf" - Configurations { - CONFResourceClass PC { - } - CONFResourceClass XBOX_ONE : PC { - } - CONFResourceClass XBOX_SERIES : PC { - } - CONFResourceClass PS4 : PC { - } - CONFResourceClass HEADLESS : PC { - } - CONFResourceClass PS5 : PC { - } - } -} \ No newline at end of file diff --git a/addons/tactical_ladder/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf b/addons/tactical_ladder/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf new file mode 100644 index 000000000..f3b8d6f39 --- /dev/null +++ b/addons/tactical_ladder/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf @@ -0,0 +1,13 @@ +ACE_EntityCatalogMultiListEntry { + m_aEntities { + SCR_EntityCatalogInventoryItem "{62F93B32BC86C49C}" { + m_sEntityPrefab "{62F304402A707F68}Prefabs/Items/Equipment/TacticalLadder/ACE_TacticalLadder.et" + m_aEntityDataList { + SCR_ArsenalItem "{62F30440549B386D}" { + m_eItemType EQUIPMENT + m_iSupplyCost 30 + } + } + } + } +} \ No newline at end of file diff --git a/addons/tactical_ladder/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta b/addons/tactical_ladder/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf.meta similarity index 77% rename from addons/tactical_ladder/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta rename to addons/tactical_ladder/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf.meta index ca1cb77ce..28b784c60 100644 --- a/addons/tactical_ladder/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta +++ b/addons/tactical_ladder/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf.meta @@ -1,5 +1,5 @@ MetaFileClass { - Name "{E908001749419691}Configs/EntityCatalog/FIA/FIA_InventoryItems.conf" + Name "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItemsBase.conf" Configurations { CONFResourceClass PC { } diff --git a/addons/tactical_ladder/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf b/addons/tactical_ladder/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf deleted file mode 100644 index e780f238a..000000000 --- a/addons/tactical_ladder/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf +++ /dev/null @@ -1,17 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C630E453BCB39DC}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{62F93B316FA2BAD0}" { - m_sEntityPrefab "{62F304402A707F68}Prefabs/Items/Equipment/TacticalLadder/ACE_TacticalLadder.et" - m_aEntityDataList { - SCR_ArsenalItem "{62F30440549B386D}" { - m_eItemType EQUIPMENT - m_iSupplyCost 30 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/tactical_ladder/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf b/addons/tactical_ladder/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf deleted file mode 100644 index c1ba01f3d..000000000 --- a/addons/tactical_ladder/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf +++ /dev/null @@ -1,17 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C68AD59F0753ABE}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{62F304402A707F68}" { - m_sEntityPrefab "{62F304402A707F68}Prefabs/Items/Equipment/TacticalLadder/ACE_TacticalLadder.et" - m_aEntityDataList { - SCR_ArsenalItem "{62F30440549B386D}" { - m_eItemType EQUIPMENT - m_iSupplyCost 30 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/tactical_ladder/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta b/addons/tactical_ladder/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta deleted file mode 100644 index 185e41b20..000000000 --- a/addons/tactical_ladder/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta +++ /dev/null @@ -1,17 +0,0 @@ -MetaFileClass { - Name "{5F7EC52FC40A03E2}Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf" - Configurations { - CONFResourceClass PC { - } - CONFResourceClass XBOX_ONE : PC { - } - CONFResourceClass XBOX_SERIES : PC { - } - CONFResourceClass PS4 : PC { - } - CONFResourceClass PS5 : PC { - } - CONFResourceClass HEADLESS : PC { - } - } -} \ No newline at end of file diff --git a/addons/tactical_ladder/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf b/addons/tactical_ladder/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf deleted file mode 100644 index 01388cc24..000000000 --- a/addons/tactical_ladder/Configs/EntityCatalog/USSR/USSR_InventoryItems.conf +++ /dev/null @@ -1,17 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C68AD5F7414CA4A}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{62F93B32BC86C49C}" { - m_sEntityPrefab "{62F304402A707F68}Prefabs/Items/Equipment/TacticalLadder/ACE_TacticalLadder.et" - m_aEntityDataList { - SCR_ArsenalItem "{62F30440549B386D}" { - m_eItemType EQUIPMENT - m_iSupplyCost 30 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/tactical_periscope/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf b/addons/tactical_periscope/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf new file mode 100644 index 000000000..61b093fcd --- /dev/null +++ b/addons/tactical_periscope/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf @@ -0,0 +1,13 @@ +ACE_EntityCatalogMultiListEntry { + m_aEntities { + SCR_EntityCatalogInventoryItem "{64A4F8C560780ED7}" { + m_sEntityPrefab "{452112928EC197AD}Prefabs/Items/Equipment/Periscope/ACE_TacticalPeriscope.et" + m_aEntityDataList { + SCR_ArsenalItem "{64A4F8C50A157DCF}" { + m_eItemType EQUIPMENT + m_iSupplyCost 15 + } + } + } + } +} \ No newline at end of file diff --git a/addons/tactical_periscope/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf.meta b/addons/tactical_periscope/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf.meta new file mode 100644 index 000000000..28b784c60 --- /dev/null +++ b/addons/tactical_periscope/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItemsBase.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/tactical_periscope/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf b/addons/tactical_periscope/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf deleted file mode 100644 index 11dab6311..000000000 --- a/addons/tactical_periscope/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf +++ /dev/null @@ -1,17 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C630E453BCB39DC}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{64A4F8C577C079CA}" { - m_sEntityPrefab "{452112928EC197AD}Prefabs/Items/Equipment/Periscope/ACE_TacticalPeriscope.et" - m_aEntityDataList { - SCR_ArsenalItem "{64A4F8C50A157DCF}" { - m_eItemType EQUIPMENT - m_iSupplyCost 15 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/tactical_periscope/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf b/addons/tactical_periscope/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf deleted file mode 100644 index 01523e1f4..000000000 --- a/addons/tactical_periscope/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf +++ /dev/null @@ -1,17 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C68AD59F0753ABE}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{64A4F8C5108615E4}" { - m_sEntityPrefab "{452112928EC197AD}Prefabs/Items/Equipment/Periscope/ACE_TacticalPeriscope.et" - m_aEntityDataList { - SCR_ArsenalItem "{64A4F8C50A157DCF}" { - m_eItemType EQUIPMENT - m_iSupplyCost 15 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/tactical_periscope/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta b/addons/tactical_periscope/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta deleted file mode 100644 index 185e41b20..000000000 --- a/addons/tactical_periscope/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta +++ /dev/null @@ -1,17 +0,0 @@ -MetaFileClass { - Name "{5F7EC52FC40A03E2}Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf" - Configurations { - CONFResourceClass PC { - } - CONFResourceClass XBOX_ONE : PC { - } - CONFResourceClass XBOX_SERIES : PC { - } - CONFResourceClass PS4 : PC { - } - CONFResourceClass PS5 : PC { - } - CONFResourceClass HEADLESS : PC { - } - } -} \ No newline at end of file diff --git a/addons/tactical_periscope/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf b/addons/tactical_periscope/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf deleted file mode 100644 index bcdb0a0a7..000000000 --- a/addons/tactical_periscope/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf +++ /dev/null @@ -1,17 +0,0 @@ -SCR_EntityCatalogMultiList { - m_aMultiLists { - SCR_EntityCatalogMultiListEntry "{5C68AD5F7414CA4A}" { - m_aEntities { - SCR_EntityCatalogInventoryItem "{64A4F8C560780ED7}" { - m_sEntityPrefab "{452112928EC197AD}Prefabs/Items/Equipment/Periscope/ACE_TacticalPeriscope.et" - m_aEntityDataList { - SCR_ArsenalItem "{64A4F8C50A157DCF}" { - m_eItemType EQUIPMENT - m_iSupplyCost 15 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/addons/tactical_periscope/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf.meta b/addons/tactical_periscope/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf.meta deleted file mode 100644 index 44514319b..000000000 --- a/addons/tactical_periscope/Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf.meta +++ /dev/null @@ -1,17 +0,0 @@ -MetaFileClass { - Name "{C53421647C3D0D2E}Configs/EntityCatalog/USSR/InventoryItems_EntityCatalog_USSR.conf" - Configurations { - CONFResourceClass PC { - } - CONFResourceClass XBOX_ONE : PC { - } - CONFResourceClass XBOX_SERIES : PC { - } - CONFResourceClass PS4 : PC { - } - CONFResourceClass PS5 : PC { - } - CONFResourceClass HEADLESS : PC { - } - } -} \ No newline at end of file diff --git a/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandBagContainer_Decal.emat b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandBagContainer_Decal.emat new file mode 100644 index 000000000..ffc0ac1b9 --- /dev/null +++ b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandBagContainer_Decal.emat @@ -0,0 +1,3 @@ +MatPBRDecal : "{4CE86D5258F2222C}Assets/Props/Military/SupplyBox/SupplyPortableContainers/Data/PortableSupplyContainer_01_Decal.emat" { + OpacityMap "{984D45C05C44EFD4}Assets/Props/Military/SupplyBox/SupplyPortableContainers/Data/SandbagContainer_Decal.edds" +} \ No newline at end of file diff --git a/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandBagContainer_Decal.emat.meta b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandBagContainer_Decal.emat.meta new file mode 100644 index 000000000..73f791a63 --- /dev/null +++ b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandBagContainer_Decal.emat.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{FEF6EB25A3DC7ED9}Assets/Props/Military/SupplyBox/SupplyPortableContainers/Data/SandBagContainer_Decal.emat" + Configurations { + EMATResourceClass PC { + } + EMATResourceClass XBOX_ONE : PC { + } + EMATResourceClass XBOX_SERIES : PC { + } + EMATResourceClass PS4 : PC { + } + EMATResourceClass PS5 : PC { + } + EMATResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer.emat b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer.emat new file mode 100644 index 000000000..5ed032b7d --- /dev/null +++ b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer.emat @@ -0,0 +1,4 @@ +MatPBRMulti : "{AC71C5F96ED4E1BF}Assets/Props/Military/SupplyBox/SupplyPortableContainers/Data/PortableSupplyContainer_Large.emat" { + Specular 1 0.814 0.485 1 + SpecularMul 5 +} \ No newline at end of file diff --git a/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer.emat.meta b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer.emat.meta new file mode 100644 index 000000000..801f3299f --- /dev/null +++ b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer.emat.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{89271C433A7FA78B}Assets/Props/Military/SupplyBox/SupplyPortableContainers/Data/SandbagContainer.emat" + Configurations { + EMATResourceClass PC { + } + EMATResourceClass XBOX_ONE : PC { + } + EMATResourceClass XBOX_SERIES : PC { + } + EMATResourceClass PS4 : PC { + } + EMATResourceClass PS5 : PC { + } + EMATResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer_Decal.edds b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer_Decal.edds new file mode 100644 index 000000000..c5f4dbb5d Binary files /dev/null and b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer_Decal.edds differ diff --git a/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer_Decal.edds.meta b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer_Decal.edds.meta new file mode 100644 index 000000000..47306c936 --- /dev/null +++ b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer_Decal.edds.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{984D45C05C44EFD4}Assets/Props/Military/SupplyBox/SupplyPortableContainers/Data/SandbagContainer_Decal.edds" + Configurations { + PNGResourceClass PC : "{DC555BD399D92412}Configs/System/ResourceTypes/PC/TextureUnspecified.conf" { + } + PNGResourceClass XBOX_ONE : "{8F13AE697AE60784}Configs/System/ResourceTypes/XBOX_ONE/TextureUnspecified.conf" { + } + PNGResourceClass XBOX_SERIES : "{D28E01700D90F52C}Configs/System/ResourceTypes/XBOX_SERIES/TextureUnspecified.conf" { + } + PNGResourceClass PS4 : "{C6CD3D8752652D2A}Configs/System/ResourceTypes/PS4/TextureUnspecified.conf" { + } + PNGResourceClass PS5 : "{6248F71B9D7C1E93}Configs/System/ResourceTypes/PS5/TextureUnspecified.conf" { + } + PNGResourceClass HEADLESS : "{699C82A6807668A7}Configs/System/ResourceTypes/HEADLESS/TextureUnspecified.conf" { + } + } +} \ No newline at end of file diff --git a/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer_Decal.png b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer_Decal.png new file mode 100644 index 000000000..9f91bc73a Binary files /dev/null and b/addons/trenches/Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer_Decal.png differ diff --git a/addons/trenches/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf b/addons/trenches/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf new file mode 100644 index 000000000..a24f612f5 --- /dev/null +++ b/addons/trenches/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf @@ -0,0 +1,13 @@ +ACE_EntityCatalogMultiListEntry : "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf" { + m_aEntities { + SCR_EntityCatalogInventoryItem "{69FF5E57814D29DA}" { + m_sEntityPrefab "{25C084725870741B}Prefabs/Items/Misc/ACE_SandbagContainer_US.et" + m_aEntityDataList { + SCR_ArsenalItem "{69FF5E57BB4D8538}" { + m_eItemType EQUIPMENT + m_iSupplyCost 0 + } + } + } + } +} \ No newline at end of file diff --git a/addons/trenches/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf.meta b/addons/trenches/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf.meta new file mode 100644 index 000000000..26fdded58 --- /dev/null +++ b/addons/trenches/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{E7D9069BE26B7A4C}Configs/EntityCatalog/UK/ACE_UK_InventoryItems.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/trenches/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf b/addons/trenches/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf new file mode 100644 index 000000000..adf9cbb8c --- /dev/null +++ b/addons/trenches/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf @@ -0,0 +1,13 @@ +ACE_EntityCatalogMultiListEntry : "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf" { + m_aEntities { + SCR_EntityCatalogInventoryItem "{69FF5E5624E5F9AC}" { + m_sEntityPrefab "{25C084725870741B}Prefabs/Items/Misc/ACE_SandbagContainer_US.et" + m_aEntityDataList { + SCR_ArsenalItem "{69FF5E565874F4AB}" { + m_eItemType EQUIPMENT + m_iSupplyCost 0 + } + } + } + } +} \ No newline at end of file diff --git a/addons/trenches/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf.meta b/addons/trenches/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf.meta new file mode 100644 index 000000000..9ff7b4525 --- /dev/null +++ b/addons/trenches/Configs/EntityCatalog/US/ACE_InventoryItems_EntityCatalog_Equipment_US.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{12790B4E7D42F952}Configs/EntityCatalog/US/ACE_US_InventoryItems.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/trenches/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf b/addons/trenches/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf new file mode 100644 index 000000000..c65c205e1 --- /dev/null +++ b/addons/trenches/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf @@ -0,0 +1,13 @@ +ACE_EntityCatalogMultiListEntry : "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf" { + m_aEntities { + SCR_EntityCatalogInventoryItem "{69FF5E56428E3286}" { + m_sEntityPrefab "{BD319DE81806E4A0}Prefabs/Items/Misc/ACE_SandbagContainer_USSR.et" + m_aEntityDataList { + SCR_ArsenalItem "{69FF5E564170D45B}" { + m_eItemType EQUIPMENT + m_iSupplyCost 0 + } + } + } + } +} \ No newline at end of file diff --git a/addons/trenches/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf.meta b/addons/trenches/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf.meta new file mode 100644 index 000000000..3fba1bccb --- /dev/null +++ b/addons/trenches/Configs/EntityCatalog/USSR/ACE_InventoryItems_EntityCatalog_Equipment_USSR.conf.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{382ACD2D23811DDE}Configs/EntityCatalog/USSR/ACE_USSR_InventoryItems.conf" + Configurations { + CONFResourceClass PC { + } + CONFResourceClass XBOX_ONE : PC { + } + CONFResourceClass XBOX_SERIES : PC { + } + CONFResourceClass PS4 : PC { + } + CONFResourceClass PS5 : PC { + } + CONFResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.cs_cz.conf b/addons/trenches/Language/ACE_Trenches_localization.cs_cz.conf index a98d84b3a..d1cc731d6 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.cs_cz.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.cs_cz.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Personal Trench (Big)" @@ -12,5 +14,7 @@ StringTableRuntime { "Personal Trench (Small)" "Trench Segment (Short)" "Vehicle Trench" + "Storage container for transporting empty sandbags." + "Sandbag Container" } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.de_de.conf b/addons/trenches/Language/ACE_Trenches_localization.de_de.conf index 9c379179f..e0f1500be 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.de_de.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.de_de.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Schützengraben (Groß)" @@ -12,5 +14,7 @@ StringTableRuntime { "Schützengraben (Klein)" "Grabensegment (Kurz)" "Fahrzeug Schützengraben" + "Behälter zum Transportieren von leeren Sandsäcken." + "Sandsackbehälter" } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.en_us.conf b/addons/trenches/Language/ACE_Trenches_localization.en_us.conf index a98d84b3a..d1cc731d6 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.en_us.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.en_us.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Personal Trench (Big)" @@ -12,5 +14,7 @@ StringTableRuntime { "Personal Trench (Small)" "Trench Segment (Short)" "Vehicle Trench" + "Storage container for transporting empty sandbags." + "Sandbag Container" } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.es_es.conf b/addons/trenches/Language/ACE_Trenches_localization.es_es.conf index a98d84b3a..d1cc731d6 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.es_es.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.es_es.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Personal Trench (Big)" @@ -12,5 +14,7 @@ StringTableRuntime { "Personal Trench (Small)" "Trench Segment (Short)" "Vehicle Trench" + "Storage container for transporting empty sandbags." + "Sandbag Container" } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.fr_fr.conf b/addons/trenches/Language/ACE_Trenches_localization.fr_fr.conf index a98d84b3a..d1cc731d6 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.fr_fr.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.fr_fr.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Personal Trench (Big)" @@ -12,5 +14,7 @@ StringTableRuntime { "Personal Trench (Small)" "Trench Segment (Short)" "Vehicle Trench" + "Storage container for transporting empty sandbags." + "Sandbag Container" } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.it_it.conf b/addons/trenches/Language/ACE_Trenches_localization.it_it.conf index a98d84b3a..d1cc731d6 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.it_it.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.it_it.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Personal Trench (Big)" @@ -12,5 +14,7 @@ StringTableRuntime { "Personal Trench (Small)" "Trench Segment (Short)" "Vehicle Trench" + "Storage container for transporting empty sandbags." + "Sandbag Container" } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.ja_jp.conf b/addons/trenches/Language/ACE_Trenches_localization.ja_jp.conf index a98d84b3a..d1cc731d6 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.ja_jp.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.ja_jp.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Personal Trench (Big)" @@ -12,5 +14,7 @@ StringTableRuntime { "Personal Trench (Small)" "Trench Segment (Short)" "Vehicle Trench" + "Storage container for transporting empty sandbags." + "Sandbag Container" } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.ko_kr.conf b/addons/trenches/Language/ACE_Trenches_localization.ko_kr.conf index a98d84b3a..d1cc731d6 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.ko_kr.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.ko_kr.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Personal Trench (Big)" @@ -12,5 +14,7 @@ StringTableRuntime { "Personal Trench (Small)" "Trench Segment (Short)" "Vehicle Trench" + "Storage container for transporting empty sandbags." + "Sandbag Container" } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.pl_pl.conf b/addons/trenches/Language/ACE_Trenches_localization.pl_pl.conf index a98d84b3a..d1cc731d6 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.pl_pl.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.pl_pl.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Personal Trench (Big)" @@ -12,5 +14,7 @@ StringTableRuntime { "Personal Trench (Small)" "Trench Segment (Short)" "Vehicle Trench" + "Storage container for transporting empty sandbags." + "Sandbag Container" } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.pt_br.conf b/addons/trenches/Language/ACE_Trenches_localization.pt_br.conf index a98d84b3a..d1cc731d6 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.pt_br.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.pt_br.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Personal Trench (Big)" @@ -12,5 +14,7 @@ StringTableRuntime { "Personal Trench (Small)" "Trench Segment (Short)" "Vehicle Trench" + "Storage container for transporting empty sandbags." + "Sandbag Container" } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.ru_ru.conf b/addons/trenches/Language/ACE_Trenches_localization.ru_ru.conf index a98d84b3a..d1cc731d6 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.ru_ru.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.ru_ru.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Personal Trench (Big)" @@ -12,5 +14,7 @@ StringTableRuntime { "Personal Trench (Small)" "Trench Segment (Short)" "Vehicle Trench" + "Storage container for transporting empty sandbags." + "Sandbag Container" } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.st b/addons/trenches/Language/ACE_Trenches_localization.st index 40d088b3c..f58d29785 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.st +++ b/addons/trenches/Language/ACE_Trenches_localization.st @@ -41,5 +41,21 @@ StringTable { Author "Kexanone" LastChanged "Kexanone" } + CustomStringTableItem "{69FF5E55F8D175DB}" { + Id "ACE_Trenches-Item_SandbagContainer_Description" + Target_en_us "Storage container for transporting empty sandbags." + Target_de_de "Behälter zum Transportieren von leeren Sandsäcken." + Modified 1778349492 + Author "Kex" + LastChanged "Kex" + } + CustomStringTableItem "{69FF5E55FEC70DF4}" { + Id "ACE_Trenches-Item_SandbagContainer_Name" + Target_en_us "Sandbag Container" + Target_de_de "Sandsackbehälter" + Modified 1778345374 + Author "Kex" + LastChanged "Kex" + } } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.uk_ua.conf b/addons/trenches/Language/ACE_Trenches_localization.uk_ua.conf index a98d84b3a..d1cc731d6 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.uk_ua.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.uk_ua.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Personal Trench (Big)" @@ -12,5 +14,7 @@ StringTableRuntime { "Personal Trench (Small)" "Trench Segment (Short)" "Vehicle Trench" + "Storage container for transporting empty sandbags." + "Sandbag Container" } } \ No newline at end of file diff --git a/addons/trenches/Language/ACE_Trenches_localization.zh_cn.conf b/addons/trenches/Language/ACE_Trenches_localization.zh_cn.conf index a98d84b3a..d1cc731d6 100644 --- a/addons/trenches/Language/ACE_Trenches_localization.zh_cn.conf +++ b/addons/trenches/Language/ACE_Trenches_localization.zh_cn.conf @@ -5,6 +5,8 @@ StringTableRuntime { "ACE_Trenches-EditableEntity_PersonalTrench_01_small_Name" "ACE_Trenches-EditableEntity_TrenchSegment_01_short_Name" "ACE_Trenches-EditableEntity_VehicleTrench_01_Name" + "ACE_Trenches-Item_SandbagContainer_Description" + "ACE_Trenches-Item_SandbagContainer_Name" } Texts { "Personal Trench (Big)" @@ -12,5 +14,7 @@ StringTableRuntime { "Personal Trench (Small)" "Trench Segment (Short)" "Vehicle Trench" + "Storage container for transporting empty sandbags." + "Sandbag Container" } } \ No newline at end of file diff --git a/addons/trenches/Prefabs/Items/Misc/ACE_SandbagContainer_US.et b/addons/trenches/Prefabs/Items/Misc/ACE_SandbagContainer_US.et new file mode 100644 index 000000000..7841536b0 --- /dev/null +++ b/addons/trenches/Prefabs/Items/Misc/ACE_SandbagContainer_US.et @@ -0,0 +1,111 @@ +GenericEntity : "{C95E11C60810F432}Prefabs/Items/Core/Item_Base.et" { + ID "508AB2013EEE1E00" + components { + ACE_Trenches_ContainerInventoryStorageComponent "{5222EB4D0C73006B}" { + Attributes SCR_ItemAttributeCollection "{5222EB4D0A2B466B}" { + ItemDisplayName UIInfo "{5222EB4D07D865FA}" { + Name "#ACE_Trenches-Item_SandbagContainer_Name" + Description "#ACE_Trenches-Item_SandbagContainer_Description" + } + ItemPhysAttributes ItemPhysicalAttributes "{69FF233489BF8200}" { + Weight 1 + SizeSetupStrategy Manual + ItemDimensions 15 15 15 + ItemVolume 1950 + } + ItemAnimationAttributes ItemAnimationAttributes "{69FF74DDACE2A42F}" { + AnimationAttachments { + AnimationAttachmentInfo "{69FF74DDC4E7833C}" { + AnimGraph "{44A1E0130301E5F5}Assets/Items/Equipment/workspaces/MedicalKit_supplies.agr" + AnimInstance "{A9CBB5C81F08B71B}Assets/Items/Equipment/workspaces/MedicalKit_supplies.asi" + BindingName "Gadget" + } + } + HandAdditiveRotation 0 90 -90 + HandAdditiveTranslation 0 0.05 -0.1 + } + CustomAttributes { + PreviewRenderAttributes "{69FF3EC9953163B8}" { + CameraPreset Top + CameraDistanceToItem 0.45 + } + CharacterModifierAttributes "{69FF7C52759AA0E0}" { + StanceLimits 0.025 1 + SpeedLimit 1.7 + ADSSpeedLimit 1.7 + SpeedLimitItemPrimaryAction 0 + SpeedLimitHighready 1.7 + CanBeEquippedInVehicle 0 + AllowJumping 0 + } + } + m_Size SLOT_2x2 + } + UseCapacityCoefficient 0 + MaxCumulativeVolume 1951 + MaxItemSize 15 15 15 + MultiSlots { + MultiSlotConfiguration "{69FF23343CC188D2}" { + SlotTemplate InventoryStorageSlot s1 { + Prefab "{1742632597955A55}Prefabs/Items/Misc/Sandbags/Part_Sandbag_Plastic.et" + } + NumSlots 15 + } + } + m_fMaxWeight 2.701 + } + MeshObject "{69FF2337F2122562}" { + Object "{4D84BA9E2DB4A692}Assets/Props/Military/SupplyBox/SupplyPortableContainers/SupplyPortableContainer_01_large_packaged.xob" + Materials { + MaterialAssignClass "{69FF5E56B927E5EB}" { + SourceMaterial "PortableSupplyContainer_01_Decal" + AssignedMaterial "{FEF6EB25A3DC7ED9}Assets/Items/Misc/ACE_SandbagContainer/Data/SandBagContainer_Decal.emat" + } + MaterialAssignClass "{69FF5E56B927E5C3}" { + SourceMaterial "PortableSupplyContainer_Large" + AssignedMaterial "{89271C433A7FA78B}Assets/Items/Misc/ACE_SandbagContainer/Data/SandbagContainer.emat" + } + } + } + RigidBody "{69FF2337E5478DD7}" { + ModelGeometry 1 + } + SCR_GadgetComponent "{69FF74DDB296D8FB}" { + m_eAnimVariable ADRIANOV + } + SCR_SoundDataComponent "{5B18D20ED0099A17}" { + m_aAudioSourceConfiguration { + SCR_AudioSourceConfiguration "{5B18D209080A5D15}" { + m_sSoundProject "{FEFAE53BD7C6D7CC}Sounds/Items/_SharedData/PickUp/Items_PickUp_Supply_Portable_Container_Medium.acp" + } + SCR_AudioSourceConfiguration "{5B18D2091B885AE6}" { + m_sSoundProject "{FEFAE53BD7C6D7CC}Sounds/Items/_SharedData/PickUp/Items_PickUp_Supply_Portable_Container_Medium.acp" + } + SCR_AudioSourceConfiguration "{5B18D20930D9E274}" { + m_sSoundProject "{DD4620A1A4BAEBED}Sounds/Items/_SharedData/Drop/Items_Drop_Supply_Portable_Container_Medium.acp" + } + SCR_AudioSourceConfiguration "{69FF74DF66CE9A79}" { + m_sSoundProject "{A73D28179B395F19}Sounds/Props/Military/AmmoBoxes/AmmoBox_Big_Wooden/Props_AmmoBox_Big_Wooden.acp" + m_sSoundEventName "SOUND_CONTAINER_OPEN" + } + SCR_AudioSourceConfiguration "{69FF74DC83C672A3}" { + m_sSoundProject "{A73D28179B395F19}Sounds/Props/Military/AmmoBoxes/AmmoBox_Big_Wooden/Props_AmmoBox_Big_Wooden.acp" + m_sSoundEventName "SOUND_CONTAINER_CLOSE" + } + } + } + ActionsManagerComponent "{508AB5952B584B2E}" { + additionalActions { + SCR_OpenStorageAction "{69FF74DE62707203}" { + ParentContextList { + "default" + } + UIInfo SCR_ActionUIInfo "{69FF74DE64CC2CC6}" { + Name "#AR-Inventory_OpenStorage" + } + "Sort Priority" 1 + } + } + } + } +} \ No newline at end of file diff --git a/addons/trenches/Prefabs/Items/Misc/ACE_SandbagContainer_US.et.meta b/addons/trenches/Prefabs/Items/Misc/ACE_SandbagContainer_US.et.meta new file mode 100644 index 000000000..2bae4775c --- /dev/null +++ b/addons/trenches/Prefabs/Items/Misc/ACE_SandbagContainer_US.et.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{25C084725870741B}Prefabs/Items/Core/ACE_SandbagsStack.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/trenches/Prefabs/Items/Misc/ACE_SandbagContainer_USSR.et b/addons/trenches/Prefabs/Items/Misc/ACE_SandbagContainer_USSR.et new file mode 100644 index 000000000..ae8451f8d --- /dev/null +++ b/addons/trenches/Prefabs/Items/Misc/ACE_SandbagContainer_USSR.et @@ -0,0 +1,14 @@ +GenericEntity : "{25C084725870741B}Prefabs/Items/Misc/ACE_SandbagContainer_US.et" { + ID "508AB2013EEE1E00" + components { + ACE_Trenches_ContainerInventoryStorageComponent "{5222EB4D0C73006B}" { + MultiSlots { + MultiSlotConfiguration "{69FF23343CC188D2}" { + SlotTemplate InventoryStorageSlot d2 { + Prefab "{07BC23F8D9223863}Prefabs/Items/Misc/Sandbags/Part_Sandbag_Burlap.et" + } + } + } + } + } +} \ No newline at end of file diff --git a/addons/trenches/Prefabs/Items/Misc/ACE_SandbagContainer_USSR.et.meta b/addons/trenches/Prefabs/Items/Misc/ACE_SandbagContainer_USSR.et.meta new file mode 100644 index 000000000..f51cebb16 --- /dev/null +++ b/addons/trenches/Prefabs/Items/Misc/ACE_SandbagContainer_USSR.et.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{BD319DE81806E4A0}Prefabs/Items/Misc/ACE_SandbagsStack_USSR.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/trenches/scripts/Game/ACE_Trenches/Components/SCR_MultiPartDeployableItemComponent.c b/addons/trenches/scripts/Game/ACE_Trenches/Components/SCR_MultiPartDeployableItemComponent.c new file mode 100644 index 000000000..d53a1d001 --- /dev/null +++ b/addons/trenches/scripts/Game/ACE_Trenches/Components/SCR_MultiPartDeployableItemComponent.c @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------------------------ +modded class SCR_MultiPartDeployableItemComponent : SCR_BaseDeployableInventoryItemComponent +{ + //------------------------------------------------------------------------------------------------ + //! Consider items in nearby containers + override protected bool EvaluateFoundEntity(IEntity ent) + { + if (!super.EvaluateFoundEntity(ent)) + return false; + + if (ent.GetParent() || ChimeraCharacter.Cast(ent)) + return true; + + BaseUniversalInventoryStorageComponent storageComponent = BaseUniversalInventoryStorageComponent.Cast(ent.FindComponent(BaseUniversalInventoryStorageComponent)); + if (!storageComponent) + return true; + + float distToEnt = vector.DistanceSq(GetOwner().GetOrigin(), ent.GetOrigin()); + + array items = {}; + storageComponent.GetAll(items); + + if (m_aIgnoredItems) + { + foreach (IEntity ignoredItem : m_aIgnoredItems) + { + items.RemoveItem(ignoredItem); + } + } + + BaseContainer foundPrefab; + foreach (IEntity item : items) + { + foundPrefab = item.GetPrefabData().GetPrefab(); + foreach (SCR_RequiredDeployablePart partReq : m_aFoundElements) + { + if (partReq.EvaluateFoundEntity(ent.GetOrigin(), distToEnt, foundPrefab, item)) + break; // skip further evaluation as it already matches one of the requirements + } + } + + return true; + } +} diff --git a/addons/trenches/scripts/Game/ACE_Trenches/Inventory/ACE_Trenches_ContainerInventoryStorageComponent.c b/addons/trenches/scripts/Game/ACE_Trenches/Inventory/ACE_Trenches_ContainerInventoryStorageComponent.c new file mode 100644 index 000000000..60177aeb2 --- /dev/null +++ b/addons/trenches/scripts/Game/ACE_Trenches/Inventory/ACE_Trenches_ContainerInventoryStorageComponent.c @@ -0,0 +1,18 @@ +//------------------------------------------------------------------------------------------------ +class ACE_Trenches_ContainerInventoryStorageComponentClass : SCR_UniversalInventoryStorageComponentClass +{ +} + +//------------------------------------------------------------------------------------------------ +class ACE_Trenches_ContainerInventoryStorageComponent : SCR_UniversalInventoryStorageComponent +{ + //------------------------------------------------------------------------------------------------ + //! Only allow storing multipart deployable items + override bool CanStoreItem(IEntity item, int slotID) + { + if (!super.CanStoreItem(item, slotID)) + return false; + + return item.FindComponent(SCR_MultiPartDeployableItemComponent); + } +}