CombatExtended-Continued · AzzkiyOne · Jul 9, 2024 · Jul 9, 2024 · Jul 9, 2024 · Jul 9, 2024
diff --git a/.github/workflows/backports.yml b/.github/workflows/backports.yml
@@ -46,7 +46,7 @@ jobs:
     - name: package
       run: |
         mkdir CombatExtended
-        cp -r Source/ Assemblies/ AssembliesCompat/ AssembliesCore/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Sounds/ Textures/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+        cp -r Source/ Assemblies/ AssembliesCompat/ AssembliesCore/ About/ Defs/ Languages/ Patches/ DLC/ Sounds/ Textures/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
         zip -9 -r build.zip CombatExtended
     - name: Upload to DO
       run: |

@@ -33,7 +33,7 @@ jobs:
     - name: package
       run: |
         mkdir CombatExtended
-        cp -r Source/ Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+        cp -r Source/ Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ DLC/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
         zip -9 -r build.zip CombatExtended
     - name: Upload to DO
       run: |

@@ -32,7 +32,7 @@ jobs:
     - name: package
       run: |
         mkdir CombatExtended
-        cp -r Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+        cp -r Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ DLC/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
         zip -9 -r CombatExtended.zip CombatExtended
     - name: Upload Package
       id: upload-package

@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AncientRustedCar" or defName="AncientWarwalkerLeg" or defName="AncientWarwalkerShell" or defName="AncientPodCar"]/fillPercent</xpath>
-		<value>
-			<fillPercent>0.65</fillPercent>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AncientRustedTruck" or defName="AncientJetEngine" or defName="AncientDropshipEngine"]/fillPercent</xpath>
-		<value>
-			<fillPercent>0.7</fillPercent>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AncientRustedJeep" or defName="AncientMiniWarwalkerRemains" or defName="AncientTank" or defName="AncientAPC"]/fillPercent</xpath>
-		<value>
-			<fillPercent>0.75</fillPercent>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AncientRustedCarFrame"]/fillPercent</xpath>
-		<value>
-			<fillPercent>0.25</fillPercent>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="AncientWarwalkerTorso" or defName="AncientRustedDropship" or defName="AncientWarspiderRemains"]/fillPercent</xpath>
-		<value>
-			<fillPercent>0.85</fillPercent>
-		</value>
-	</Operation>
-
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AncientRustedCar" or defName="AncientWarwalkerLeg" or defName="AncientWarwalkerShell" or defName="AncientPodCar"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.65</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AncientRustedTruck" or defName="AncientJetEngine" or defName="AncientDropshipEngine"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.7</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AncientRustedJeep" or defName="AncientMiniWarwalkerRemains" or defName="AncientTank" or defName="AncientAPC"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.75</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AncientRustedCarFrame"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.25</fillPercent>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AncientWarwalkerTorso" or defName="AncientRustedDropship" or defName="AncientWarspiderRemains"]/fillPercent</xpath>
+		<value>
+			<fillPercent>0.85</fillPercent>
+		</value>
+	</Operation>
+
 </Patch>
@@ -1,124 +1,124 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-
-	<ThingCategoryDef>
-		<defName>Ammo152x169mm</defName>
-		<label>15.2x169mm</label>
-		<parent>AmmoHighCaliber</parent>
-		<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
-	</ThingCategoryDef>
-
-	<!-- ==================== AmmoSet ========================== -->
-
-	<CombatExtended.AmmoSetDef>
-		<defName>AmmoSet_152x169mm</defName>
-		<label>15.2x169mm</label>
-		<ammoTypes>
-			<Ammo_152x169mm_Sabot>Bullet_152x169mm_Sabot</Ammo_152x169mm_Sabot>
-		</ammoTypes>
-		<similarTo>AmmoSet_AntiMateriel</similarTo>
-	</CombatExtended.AmmoSetDef>
-
-	<!-- ==================== Ammo ========================== -->
-
-	<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo152x169mmBase" ParentName="MediumAmmoBase" Abstract="True">
-		<description>Prototype smoothbore cartridge designed for anti-material use.</description>
-		<statBases>
-			<Mass>0.15</Mass>
-			<Bulk>0.33</Bulk>
-		</statBases>
-		<tradeTags>
-			<li>CE_AutoEnableTrade</li>
-			<li>CE_AutoEnableCrafting</li>
-		</tradeTags>
-		<thingCategories>
-			<li>Ammo152x169mm</li>
-		</thingCategories>
-		<stackLimit>2000</stackLimit>
-	</ThingDef>
-
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo152x169mmBase">
-		<defName>Ammo_152x169mm_Sabot</defName>
-		<label>15.2x169mm (Sabot)</label>
-		<graphicData>
-			<texPath>Things/Ammo/HighCaliber/Sabot</texPath>
-			<graphicClass>Graphic_StackCount</graphicClass>
-		</graphicData>
-		<statBases>
-			<MarketValue>0.64</MarketValue>
-			<Mass>0.107</Mass>
-		</statBases>
-		<ammoClass>Sabot</ammoClass>
-		<cookOffProjectile>Bullet_152x169mm_Sabot</cookOffProjectile>
-	</ThingDef>
-
-	<!-- ================== Projectile ================== -->
-
-	<ThingDef Name="Base152x169mmBullet" ParentName="BaseBulletCE" Abstract="true">
-		<graphicData>
-			<texPath>Things/Projectile/Bullet_Big</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-		</graphicData>
-		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<damageDef>Bullet</damageDef>
-		</projectile>
-	</ThingDef>
-
-	<ThingDef ParentName="Base152x169mmBullet">
-		<defName>Bullet_152x169mm_Sabot</defName>
-		<label>15.2x169mm bullet (Sabot)</label>
-		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<speed>235</speed>
-			<damageAmountBase>26</damageAmountBase>
-			<armorPenetrationSharp>60</armorPenetrationSharp>
-			<armorPenetrationBlunt>420.5</armorPenetrationBlunt>
-		</projectile>
-	</ThingDef>
-
-	<!-- ==================== Recipes ========================== -->
-
-	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
-		<defName>MakeAmmo_152x169mm_Sabot</defName>
-		<label>make 15.2x169mm (Sabot) cartridge x200</label>
-		<description>Craft 200 15.2x169mm (Sabot) cartridges.</description>
-		<jobString>Making 15.2x169mm (Sabot) cartridges.</jobString>
-		<ingredients>
-			<li>
-				<filter>
-					<thingDefs>
-						<li>Steel</li>
-					</thingDefs>
-				</filter>
-				<count>46</count>
-			</li>
-			<li>
-				<filter>
-					<thingDefs>
-						<li>Uranium</li>
-					</thingDefs>
-				</filter>
-				<count>4</count>
-			</li>
-			<li>
-				<filter>
-					<thingDefs>
-						<li>Chemfuel</li>
-					</thingDefs>
-				</filter>
-				<count>4</count>
-			</li>
-		</ingredients>
-		<fixedIngredientFilter>
-			<thingDefs>
-				<li>Chemfuel</li>
-				<li>Steel</li>
-				<li>Uranium</li>
-			</thingDefs>
-		</fixedIngredientFilter>
-		<products>
-			<Ammo_152x169mm_Sabot>200</Ammo_152x169mm_Sabot>
-		</products>
-		<workAmount>7000</workAmount>
-	</RecipeDef>
-
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo152x169mm</defName>
+		<label>15.2x169mm</label>
+		<parent>AmmoHighCaliber</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberHighCaliber</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_152x169mm</defName>
+		<label>15.2x169mm</label>
+		<ammoTypes>
+			<Ammo_152x169mm_Sabot>Bullet_152x169mm_Sabot</Ammo_152x169mm_Sabot>
+		</ammoTypes>
+		<similarTo>AmmoSet_AntiMateriel</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo152x169mmBase" ParentName="MediumAmmoBase" Abstract="True">
+		<description>Prototype smoothbore cartridge designed for anti-material use.</description>
+		<statBases>
+			<Mass>0.15</Mass>
+			<Bulk>0.33</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting</li>
+		</tradeTags>
+		<thingCategories>
+			<li>Ammo152x169mm</li>
+		</thingCategories>
+		<stackLimit>2000</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo152x169mmBase">
+		<defName>Ammo_152x169mm_Sabot</defName>
+		<label>15.2x169mm (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>0.64</MarketValue>
+			<Mass>0.107</Mass>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_152x169mm_Sabot</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectile ================== -->
+
+	<ThingDef Name="Base152x169mmBullet" ParentName="BaseBulletCE" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base152x169mmBullet">
+		<defName>Bullet_152x169mm_Sabot</defName>
+		<label>15.2x169mm bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>235</speed>
+			<damageAmountBase>26</damageAmountBase>
+			<armorPenetrationSharp>60</armorPenetrationSharp>
+			<armorPenetrationBlunt>420.5</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+		<defName>MakeAmmo_152x169mm_Sabot</defName>
+		<label>make 15.2x169mm (Sabot) cartridge x200</label>
+		<description>Craft 200 15.2x169mm (Sabot) cartridges.</description>
+		<jobString>Making 15.2x169mm (Sabot) cartridges.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>46</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Chemfuel</li>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_152x169mm_Sabot>200</Ammo_152x169mm_Sabot>
+		</products>
+		<workAmount>7000</workAmount>
+	</RecipeDef>
+
 </Defs>