Merge pull request #3271 from SaltyKarl/JDS-EFT

Fix JDS EFT base apparel won't load
CombatExtended-Continued · Jul 16, 2024 · c1c20c1 · c1c20c1
2 parents e227afa + 2145000
commit c1c20c1
Show file tree

Hide file tree

Showing 2 changed files with 99 additions and 98 deletions.
diff --git a/ModPatches/JDS EFT Apparel/Defs/JDS EFT Apparel/Apparel_Base.xml b/ModPatches/JDS EFT Apparel/Defs/JDS EFT Apparel/Apparel_Base.xml
diff --git a/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml b/ModPatches/JDS EFT Apparel/Patches/JDS EFT Apparel/Apparel_Armor.xml
@@ -1,5 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
+	<!-- === For Some Reason the Defs won't load, but to move to patch works === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs</xpath>
+		<value>
+			<!-- === Helmets - Face Shield / Eye Shield Base === -->
+
+			<ThingDef Name="EFTHeadgearShield" ParentName="JDSFrontierHeadgearBase" Abstract="True">
+				<apparel Inherit="False">
+					<bodyPartGroups>
+						<li>FullHead</li>
+					</bodyPartGroups>
+					<layers>
+						<li>Overhead</li>
+					</layers>
+					<tags>
+						<li>MilitaryHeadgear</li>
+					</tags>
+					<defaultOutfitTags>
+						<li>Soldier</li>
+					</defaultOutfitTags>
+					<useDeflectMetalEffect>true</useDeflectMetalEffect>
+				</apparel>
+			</ThingDef>
+
+			<ThingDef Name="EFTHeadgearEyeShield" ParentName="JDSFrontierHeadgearBase" Abstract="True">
+				<apparel Inherit="False">
+					<bodyPartGroups>
+						<li>UpperHead</li>
+						<li>Eyes</li>
+					</bodyPartGroups>
+					<layers>
+						<li>Overhead</li>
+					</layers>
+					<tags>
+						<li>MilitaryHeadgear</li>
+					</tags>
+					<defaultOutfitTags>
+						<li>Soldier</li>
+					</defaultOutfitTags>
+					<useDeflectMetalEffect>true</useDeflectMetalEffect>
+				</apparel>
+			</ThingDef>
+
+			<!-- === Caps / Ushanka / Beanie === -->
+
+			<ThingDef Name="EFTHeadgearCaps" ParentName="JDSFrontierFaceMaskBase" Abstract="True">
+				<apparel Inherit="False">
+					<bodyPartGroups>
+						<li>UpperHead</li>
+					</bodyPartGroups>
+					<layers>
+						<li>Overhead</li>
+					</layers>
+					<tags>
+						<li>MilitaryHeadgear</li>
+					</tags>
+					<defaultOutfitTags>
+						<li>Soldier</li>
+					</defaultOutfitTags>
+				</apparel>
+			</ThingDef>
+
+			<ThingDef Name="EFTHeadgearBeanie" ParentName="JDSFrontierFaceMaskBase" Abstract="True">
+				<apparel Inherit="False">
+					<bodyPartGroups>
+						<li>UpperHead</li>
+					</bodyPartGroups>
+					<layers>
+						<li>OnHead</li>
+					</layers>
+					<tags>
+						<li>MilitaryHeadgear</li>
+					</tags>
+					<defaultOutfitTags>
+						<li>Soldier</li>
+					</defaultOutfitTags>
+				</apparel>
+			</ThingDef>
+
+			<!-- === Webbing === -->
+
+			<ThingDef Name="EFTWebbingBase" ParentName="JDSFrontierChestRigBase" Abstract="True">
+				<apparel Inherit="False">
+					<bodyPartGroups>
+						<li>Shoulders</li>
+					</bodyPartGroups>
+					<layers>
+						<li>Webbing</li>
+					</layers>
+					<tags>
+						<li>MilitaryArmor</li>
+					</tags>
+					<defaultOutfitTags>
+						<li>Soldier</li>
+					</defaultOutfitTags>
+				</apparel>
+			</ThingDef>
+		</value>
+	</Operation>
 
 	<!-- === Class 2 === -->