Explosives - Add mine detector

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
+    }
+   }
+  }
+ }
+}

addons/tactical_periscope/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta → 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 {
   }

addons/captives/Prefabs/Helpers/ACE_Captives_SurrenderHelperCompartment.et

@@ -1,6 +1,14 @@
 ACE_Captives_SurrenderHelperCompartment : "{0D226790BE615DC7}Prefabs/Helpers/ACE_AnimationHelperCompartment.et" {
  ID "4B42E71698F5739C"
  components {
+  SCR_BaseCompartmentManagerComponent "{2CD4A765A7D52986}" {
+   CompartmentSlots {
+    CargoCompartmentSlot Performer {
+     GetOutAction SCR_GetOutAction "{69AD265674DA6E68}" {
+     }
+    }
+   }
+  }
   VehicleAnimationComponent "{50B812962B17E60B}" {
    AnimInstance "{EF71DF39A69DC55A}Assets/Helpers/Workspace/ACE_Captives_Surrender.asi"
    AnimInjection AnimationAttachmentInfo "{50B812961A339FD2}" {

addons/captives/Prefabs/Helpers/ACE_Captives_TiedHelperCompartment.et

@@ -12,7 +12,7 @@ ACE_Captives_TiedHelperCompartment : "{0D226790BE615DC7}Prefabs/Helpers/ACE_Anim
   SCR_BaseCompartmentManagerComponent "{2CD4A765A7D52986}" {
    CompartmentSlots {
     CargoCompartmentSlot Performer {
-     GetOutAction CompartmentUserAction "{64771541B779685D}" {
+     GetOutAction CompartmentUserAction "{69AD26567CC01AEE}" {
      }
     }
    }

addons/captives/scripts/Game/ACE_Captives/UserActions/SCR_RemoveCasualtyUserAction.c

@@ -25,10 +25,6 @@ modded class SCR_RemoveCasualtyUserAction : SCR_CompartmentUserAction
 		if (!captiveChar)
 			return;
 
-		SCR_CompartmentAccessComponent captiveCompartmentAccess = SCR_CompartmentAccessComponent.Cast(captiveChar.GetCompartmentAccessComponent());
-		if (captiveCompartmentAccess)
-			captiveCompartmentAccess.KickFromVehicle(GetRelevantDoorIndex(pUserEntity));
-
 		ACE_AnimationHelperCompartment helper = ACE_AnimationTools.AnimateWithHelperCompartment(ACE_EAnimationHelperID.TIED, captiveChar);
 		if (!helper)
 			return;
@@ -119,21 +115,21 @@ modded class SCR_RemoveCasualtyUserAction : SCR_CompartmentUserAction
 		if (!userChar)
 			return false;
 
-		// Cannot be performed when already carrying
-		SCR_CharacterControllerComponent userCharController = SCR_CharacterControllerComponent.Cast(userChar.GetCharacterController());
-		if (!userCharController || userCharController.ACE_IsCarrier())
-		{
-			SetCannotPerformReason("#ACE-UserAction_Carrying");
+		BaseCompartmentSlot compartment = GetCompartmentSlot();
+		if (!compartment)
 			return false;
-		}
 
-		SCR_CompartmentAccessComponent compartmentAccess = SCR_CompartmentAccessComponent.Cast(userChar.GetCompartmentAccessComponent());
-		if (!compartmentAccess)
+		SCR_ChimeraCharacter captiveChar = SCR_ChimeraCharacter.Cast(compartment.GetOccupant());
+		if (!captiveChar)
 			return false;
 
-		BaseCompartmentSlot compartment = GetCompartmentSlot();
-		if (!compartment)
+		string cannotPerformReason;
+		SCR_CharacterControllerComponent userCharController = SCR_CharacterControllerComponent.Cast(userChar.GetCharacterController());
+		if (!userCharController || !userCharController.ACE_CanCarry(captiveChar, cannotPerformReason))
+		{
+			SetCannotPerformReason(cannotPerformReason);
 			return false;
+		}
 
 		return true;
 	}

addons/carrying/Prefabs/Helpers/ACE_Carrying_BaseHelperCompartment.et

@@ -11,6 +11,8 @@ ACE_Carrying_HelperCompartment : "{0D226790BE615DC7}Prefabs/Helpers/ACE_Animatio
   SCR_BaseCompartmentManagerComponent "{2CD4A765A7D52986}" {
    CompartmentSlots {
     CargoCompartmentSlot Performer {
+     GetOutAction CompartmentUserAction "{69AD265654380459}" {
+     }
      OverrideEntryPositionInfo PointInfo "{670E0D3DB86D5304}" {
      }
      OverrideExitPositionInfo PointInfo "{670E0D3DB3C80C6C}" {

addons/carrying/Scripts/Game/ACE_Carrying/UserActions/SCR_RemoveCasualtyUserAction.c

@@ -5,9 +5,6 @@ modded class SCR_RemoveCasualtyUserAction : SCR_CompartmentUserAction
 	//! Initate carry when possible
 	override protected void PerformRemoveCasualtyAction(IEntity pOwnerEntity, IEntity pUserEntity)
 	{
-		// First call the base implementation, which ejects the character from the vehicle
-		super.PerformRemoveCasualtyAction(pOwnerEntity, pUserEntity);
-
 		BaseCompartmentSlot compartment = GetCompartmentSlot();
 		if (!compartment)
 			return;
@@ -24,12 +21,10 @@ modded class SCR_RemoveCasualtyUserAction : SCR_CompartmentUserAction
 		if (!userCharController)
 			return;
 
-		// We just eject AI for now. Trying to carrying them immediatly breaks their animation
-		if (!EntityUtils.IsPlayer(casualtyChar))
-			return;
-
 		string cannotPerformReason;
 		if (userCharController.ACE_Carrying_CanCarryCasualty(casualtyChar, cannotPerformReason))
 			userCharController.ACE_Carrying_CarryCasualty(casualtyChar);
+		else
+			super.PerformRemoveCasualtyAction(pOwnerEntity, pUserEntity); // Just eject them if not carriable
 	}
 }

addons/core/Configs/ACE/ACE_SurfaceLabels.conf

@@ -11,5 +11,11 @@ ACE_SurfaceLabelsConfig {
     "{B0F2C4F345C4894C}Common/Materials/Physics/soil.physmat"
    }
   }
+  ACE_SurfaceLabelConfigEntry "{69B3199FAE7CA3AF}" {
+   m_eLabel MAGNETIC
+   m_aPhysMatResNames {
+    "{439C1A3B5A3C7EE6}Common/Materials/Physics/metal.physmat"
+   }
+  }
  }
 }

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
+}

addons/tactical_ladder/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta → 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 {
   }

addons/core/Configs/EntityCatalog/ACE_InventoryItems_EntityCatalog_Medical.conf

@@ -0,0 +1,4 @@
+ACE_EntityCatalogMultiListEntry {
+ m_sIdentifier "ACE Medical"
+ m_iACE_Priority -35
+}

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 {
+  }
+ }
+}

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" {
+  }
+ }
+}

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" {
+}

addons/core/Configs/EntityCatalog/FIA/FIA_InventoryItems.conf.meta → addons/core/Configs/EntityCatalog/UK/ACE_InventoryItems_EntityCatalog_Equipment_UK.conf.meta

@@ -1,5 +1,5 @@
 MetaFileClass {
- Name "{E908001749419691}Configs/EntityCatalog/FIA/FIA_InventoryItems.conf"
+ Name "{E7D9069BE26B7A4C}Configs/EntityCatalog/ACE_UK_InventoryItems.conf"
  Configurations {
   CONFResourceClass PC {
   }

addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Ammunition_All.conf

@@ -0,0 +1,3 @@
+SCR_EntityCatalogMultiListEntry {
+ m_iACE_Priority -60
+}

addons/medical_core/Configs/EntityCatalog/US/InventoryItems_EntityCatalog_US.conf.meta → 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 {
+  }
  }
 }

addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_BackpacksVests_All.conf

@@ -0,0 +1,3 @@
+SCR_EntityCatalogMultiListEntry {
+ m_iACE_Priority -20
+}

addons/medical_core/Configs/EntityCatalog/FIA/InventoryItems_EntityCatalog_FIA.conf.meta → 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 {
+  }
  }
 }

addons/core/Configs/EntityCatalog/UK/Arsenal Lists/UK_Clothing_All.conf

@@ -0,0 +1,3 @@
+SCR_EntityCatalogMultiListEntry {
+ m_iACE_Priority -10
+}

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 {
+  }
+ }
+}