Update Outland Core patch

LoadFolders.xml

@@ -358,7 +358,6 @@
 		<li IfModActive="neronix17.fr.content.dni">ModPatches/O21 Dragons Not Included</li>
 		<li IfModActive="neronix17.fr.compilation">ModPatches/O21 Forgotten Realms</li>
 		<li IfModActive="neronix17.mechadroids">ModPatches/O21 Mechadroids</li>
-		<li IfModActive="Neronix17.Outland.Core">ModPatches/O21 Outland - Core</li>
 		<li IfModActive="Neronix17.Outland.EastbornEmpire">ModPatches/O21 Outland - Eastborn</li>
 		<li IfModActive="Neronix17.Outland.MotzCoalition">ModPatches/O21 Outland - Motz Coalition</li>
 		<li IfModActive="Odz.WWII.Stalingrad.Uniforms">ModPatches/ODZ Stalingrad - Uniforms</li>

ModPatches/Outland - Core/Patches/Outland - Core/Apparel_Outland.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Cloak -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_ShoulderCloak"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Heavy Tribalwear & Padding -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_HeavyTribalPadding" or defName="Outland_HeavyTribalwear"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>6</StuffEffectMultiplierArmor>
+			<Bulk>3.5</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- Tribal Hood -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_TribalHood"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Tribal Robe -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Outland_TribalRobe"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>2</WornBulk>
+			<StuffEffectMultiplierArmor>4.75</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- War Mask and War Veil -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="OutlandTribalMask"]/equippedStatOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="OutlandTribalMask"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+			<StuffEffectMultiplierArmor>10</StuffEffectMultiplierArmor>
+		</value>
+	</Operation>
+
+	<!-- Tribal Backpack & Heavy Backpack -->
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/TabulaRasa.ExtendedApparelDef[defName="Outland_Backpack" or defName="Outland_BackpackHeavy"]/carryCapBuff</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TabulaRasa.ExtendedApparelDef[defName="Outland_Backpack"]/statBases</xpath>
+		<value>
+			<Bulk>3</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TabulaRasa.ExtendedApparelDef[defName="Outland_Backpack"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>15</CarryBulk>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<!-- Equivalent to a modern backpack, but twice the weight and bulk. -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TabulaRasa.ExtendedApparelDef[defName="Outland_BackpackHeavy"]/statBases</xpath>
+		<value>
+			<Bulk>6</Bulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/TabulaRasa.ExtendedApparelDef[defName="Outland_BackpackHeavy"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<CarryBulk>30</CarryBulk> 
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>

ModPatches/Outland - Core/Patches/Outland - Core/Buildings_Security.xml

@@ -1,39 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
-	<!-- Pact Catapult -->
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Outland_PactCatapult"]/thingClass</xpath>
+		<xpath>Defs/ThingDef[defName="Outland_Ballista" or defName="Outland_Mangonel"]/thingClass</xpath>
 		<value>
 			<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Outland_PactCatapult"]/fillPercent</xpath>
+		<xpath>Defs/ThingDef[defName="Outland_Ballista" or defName="Outland_Mangonel"]/fillPercent</xpath>
 		<value>
 			<fillPercent>0.85</fillPercent>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationRemove">
-		<xpath>Defs/ThingDef[defName="Outland_Gun_PactCatapult"]/building</xpath>
+		<xpath>Defs/ThingDef[defName="Outland_Gun_Mangonel" or defName="Outland_Gun_BallistaTurret"]/building</xpath>
 	</Operation>
 
 	<Operation Class="PatchOperationRemove">
-		<xpath>Defs/ThingDef[defName="Outland_Gun_PactCatapult"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
+		<xpath>Defs/ThingDef[defName="Outland_Gun_Mangonel" or defName="Outland_Gun_BallistaTurret"]/comps/li[@Class="CompProperties_ChangeableProjectile"]</xpath>
 	</Operation>
 
-	<!-- Pact Catapult - Weapon -->
+	<!-- ========== Ballista - Weapon ========== -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>Outland_Gun_BallistaTurret</defName>
+		<statBases>
+			<SightsEfficiency>1</SightsEfficiency>
+			<ShotSpread>1</ShotSpread>
+			<SwayFactor>1</SwayFactor>
+			<Bulk>4.00</Bulk>
+			<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Pilum_Fired</defaultProjectile>
+			<warmupTime>1.4</warmupTime>
+			<range>44</range>
+			<soundCast>Bow_Large</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<recoilPattern>Mounted</recoilPattern>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>1</magazineSize>
+			<reloadTime>8</reloadTime>
+			<ammoSet>AmmoSet_Javelins</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<noSnapshot>true</noSnapshot>
+			<noSingleShot>false</noSingleShot>
+		</FireModes>
+		<weaponTags>
+			<li>TurretGun</li>
+		</weaponTags>
+	</Operation>
+
+	<!-- ========== Mangonel - Weapon ========== -->
+
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="Outland_Gun_PactCatapult"]/statBases</xpath>
+		<xpath>Defs/ThingDef[defName="Outland_Gun_Mangonel"]/statBases</xpath>
 		<value>
 			<SightsEfficiency>0.5</SightsEfficiency>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName = "Outland_Gun_PactCatapult"]/comps</xpath>
+		<xpath>Defs/ThingDef[defName="Outland_Gun_Mangonel"]/comps</xpath>
 		<value>
 			<li Class="CombatExtended.CompProperties_Charges">
 				<chargeSpeeds>
@@ -53,7 +88,7 @@
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName = "Outland_Gun_PactCatapult"]/verbs</xpath>
+		<xpath>Defs/ThingDef[defName="Outland_Gun_Mangonel"]/verbs</xpath>
 		<value>
 			<verbs>
 				<li Class="CombatExtended.VerbPropertiesCE">
@@ -77,7 +112,7 @@
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName = "Outland_Gun_PactCatapult"]/weaponTags</xpath>
+		<xpath>Defs/ThingDef[defName="Outland_Gun_Mangonel"]/weaponTags</xpath>
 		<value>
 			<li>TurretGun</li>
 		</value>