Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
ea0b2b3
Add get in action while loitering
Kexanone Jun 9, 2026
09a4023
Select better icons for gestures
Kexanone Jun 21, 2026
3772239
Assign proper imagesets
Kexanone Jun 21, 2026
2c88e30
Fix m_pScrInputContext being unassigned in vanille impl
Kexanone Jun 22, 2026
ab8c679
Add ACE catalog multi list entry
Kexanone Jul 8, 2026
0611076
Creat ACE items configs
Kexanone Jul 8, 2026
8ad2d96
Move arsenal item lists to ACE configs
Kexanone Jul 8, 2026
1151ede
Use USSR config for FIA
Kexanone Jul 8, 2026
ed65efb
Update to new naming convention
Kexanone Jul 8, 2026
4c441eb
Update to new naming convention
Kexanone Jul 8, 2026
015d052
Split equipment and medical configs
Kexanone Jul 9, 2026
83e4cb5
Add sorting priority to SCR_EntityCatalogMultiList
Kexanone Jul 9, 2026
3bc2a83
Set priorities
Kexanone Jul 9, 2026
bbff438
Adjust priorities
Kexanone Jul 9, 2026
1d65a26
Add prioirties to BF subconfigs
Kexanone Jul 9, 2026
51e1859
Use InsertSort for stable sorting
Kexanone Jul 9, 2026
2dddfe2
Add InsertSort
Kexanone Jul 9, 2026
dea1510
Rname sorting method and add doc comments
Kexanone Jul 9, 2026
8b73c00
Add class for optional inventory items
Kexanone Jul 9, 2026
287250b
Fix name of script file
Kexanone Jul 9, 2026
145a127
Add disallowed addon attribute to optional entry
Kexanone Jul 11, 2026
44e78ae
Remove old emotes
Kexanone Jul 29, 2026
7ee6b28
Merge branch 'core/fix-loiter-vme' into core/exp-fixes
Kexanone Jul 29, 2026
5ba44ea
Merge branch 'core/fix-loiter' into core/exp-fixes
Kexanone Jul 29, 2026
9c4ff92
Merge branch 'core/emote-icons' into core/exp-fixes
Kexanone Jul 29, 2026
251cd42
Update method signature
Kexanone Jul 29, 2026
67f9dd9
Remove unused localizations
Kexanone Jul 29, 2026
b8d0b22
Merge branch 'core/exp-fixes' into trenches/sandbag-container
Kexanone Jul 31, 2026
0d0d74c
Add sandbag container
Kexanone Jul 31, 2026
35421c6
Merge branch 'trenches/add-grad' into trenches/sandbag-container
Kexanone Jul 31, 2026
ec779a2
Add localizations
Kexanone Jul 31, 2026
f99e92b
Add container to arsenals
Kexanone Jul 31, 2026
cde158d
Limit items that can be stored
Kexanone Jul 31, 2026
64e5f44
Merge branch 'trenches/add-grad' into trenches/sandbag-container
Kexanone Jul 31, 2026
902b591
Remove supply cost
Kexanone Aug 1, 2026
cde8512
Update description localization
Kexanone Aug 1, 2026
5bac1b7
Make container a gadget
Kexanone Aug 1, 2026
8e811cb
Rename storage slot
Kexanone Aug 1, 2026
b668ce9
Add open storage action
Kexanone Aug 1, 2026
edf7448
Make multi part building consider items in nearby containers
Kexanone Aug 1, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MetaFileClass {
Name "{E908001749419691}Configs/EntityCatalog/FIA/FIA_InventoryItems.conf"
Name "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItemsBase.conf"
Configurations {
CONFResourceClass PC {
}
Expand Down
18 changes: 0 additions & 18 deletions addons/captives/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf

This file was deleted.

18 changes: 0 additions & 18 deletions addons/captives/Configs/EntityCatalog/US/US_InventoryItems.conf

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions addons/core/Configs/Commanding/Commands.conf

This file was deleted.

12 changes: 0 additions & 12 deletions addons/core/Configs/Commanding/EmoteMenu.conf

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MetaFileClass {
Name "{E908001749419691}Configs/EntityCatalog/FIA/FIA_InventoryItems.conf"
Name "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItemsBase.conf"
Configurations {
CONFResourceClass PC {
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ACE_EntityCatalogMultiListEntry {
m_sIdentifier "ACE Medical"
m_iACE_Priority -35
}
Original file line number Diff line number Diff line change
@@ -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 {
}
}
}
26 changes: 0 additions & 26 deletions addons/core/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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" {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ACE_EntityCatalogMultiListEntry : "{0AFC873567388CDE}Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Equipment.conf" {
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MetaFileClass {
Name "{5F7EC52FC40A03E2}Configs/EntityCatalog/US/US_InventoryItems.conf"
Name "{E7D9069BE26B7A4C}Configs/EntityCatalog/ACE_UK_InventoryItems.conf"
Configurations {
CONFResourceClass PC {
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SCR_EntityCatalogMultiListEntry {
m_iACE_Priority -60
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Expand All @@ -9,9 +9,9 @@ MetaFileClass {
}
CONFResourceClass PS4 : PC {
}
CONFResourceClass HEADLESS : PC {
}
CONFResourceClass PS5 : PC {
}
CONFResourceClass HEADLESS : PC {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SCR_EntityCatalogMultiListEntry {
m_iACE_Priority -20
}
Original file line number Diff line number Diff line change
@@ -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 {
}
Expand All @@ -9,9 +9,9 @@ MetaFileClass {
}
CONFResourceClass PS4 : PC {
}
CONFResourceClass HEADLESS : PC {
}
CONFResourceClass PS5 : PC {
}
CONFResourceClass HEADLESS : PC {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SCR_EntityCatalogMultiListEntry {
m_iACE_Priority -10
}
Original file line number Diff line number Diff line change
@@ -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 {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SCR_EntityCatalogMultiListEntry {
m_iACE_Priority -30
}
Original file line number Diff line number Diff line change
@@ -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 {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SCR_EntityCatalogMultiListEntry {
m_iACE_Priority -40
}
Original file line number Diff line number Diff line change
@@ -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 {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SCR_EntityCatalogMultiListEntry {
m_iACE_Priority -50
}
Original file line number Diff line number Diff line change
@@ -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 {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SCR_EntityCatalogMultiListEntry {
m_iACE_Priority -70
}
Loading