From 198043df52637d4d167461a6fcf259915cd66ec0 Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Mon, 29 Jul 2024 00:00:26 +0800
Subject: [PATCH 1/4] Update AC_Patches.xml

---
 .../AC_Patches.xml                            | 120 ++++++++++++++++++
 1 file changed, 120 insertions(+)

diff --git a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml
index fc8685aae5..12c588f16c 100644
--- a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml	
+++ b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml	
@@ -785,6 +785,126 @@
 		</weaponTags>
 	</Operation>
 
+	<!-- === Charge Incursionar === -->
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>AC_Gun_ChargeIncursionar</defName>
+		<statBases>
+			<WorkToMake>55000</WorkToMake>
+			<Mass>6</Mass>
+			<Bulk>11.50</Bulk>
+			<SwayFactor>1.25</SwayFactor>
+			<ShotSpread>0.10</ShotSpread>
+			<SightsEfficiency>1.15</SightsEfficiency>
+			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
+		</statBases>
+		<costList>
+			<Steel>20</Steel>
+			<Chemfuel>10</Chemfuel>
+			<ComponentIndustrial>2</ComponentIndustrial>
+			<Plasteel>70</Plasteel>
+			<ComponentSpacer>3</ComponentSpacer>
+		</costList>
+		<Properties>
+			<recoilAmount>1.46</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
+			<warmupTime>1.0</warmupTime>
+			<range>55</range>
+			<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
+			<burstShotCount>6</burstShotCount>
+			<soundCast>Shot_ChargeRifle</soundCast>
+			<soundCastTail>GunTail_Medium</soundCastTail>
+			<muzzleFlashScale>9</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+			<aiUseBurstMode>TRUE</aiUseBurstMode>
+			<aiAimMode>AimedShot</aiAimMode>
+		</FireModes>
+		<weaponTags>
+			<li>CE_AI_AR</li>
+			<li>AdvancedGun</li>
+		</weaponTags>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AC_Gun_ChargeIncursionar"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<propsUnderBarrel>
+					<magazineSize>4</magazineSize>
+					<reloadOneAtATime>true</reloadOneAtATime>
+					<reloadTime>0.85</reloadTime>
+					<ammoSet>AmmoSet_12GaugeCharged</ammoSet>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_12GaugeCharged</defaultProjectile>
+					<warmupTime>0.6</warmupTime>
+					<burstShotCount>1</burstShotCount>
+					<range>20</range>
+					<recoilAmount>2.75</recoilAmount>
+					<soundCast>AC_Shot_ChargeShotgun</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>Snapshot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="AC_Gun_ChargeIncursionar"]/comps/li[Class="MVCF.Comps.CompProperties_VerbProps"]</xpath>
+	</Operation>
+
+	<li Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName = "AC_Gun_ChargeIncursionar"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>2.02</cooldownTime>
+					<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.55</cooldownTime>
+					<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</li>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AC_Gun_Autorevolver"]/tools</xpath>
 		<value>

From f5c097a0892ba583e45626cfc15ad01237e6ed8a Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Mon, 29 Jul 2024 00:18:30 +0800
Subject: [PATCH 2/4] Update AC_Patches.xml

---
 .../Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml
index 12c588f16c..50cd6ebc97 100644
--- a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml	
+++ b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml	
@@ -866,7 +866,7 @@
 		<xpath>Defs/ThingDef[defName="AC_Gun_ChargeIncursionar"]/comps/li[Class="MVCF.Comps.CompProperties_VerbProps"]</xpath>
 	</Operation>
 
-	<li Class="PatchOperationReplace">
+	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName = "AC_Gun_ChargeIncursionar"]/tools</xpath>
 		<value>
 			<tools>
@@ -903,7 +903,7 @@
 				</li>
 			</tools>
 		</value>
-	</li>
+	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="AC_Gun_Autorevolver"]/tools</xpath>

From da7a903a56d224bf1739f399711c490603987210 Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Mon, 29 Jul 2024 00:22:50 +0800
Subject: [PATCH 3/4] Update AC_Patches.xml

---
 .../Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml
index 50cd6ebc97..0edf0b8158 100644
--- a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml	
+++ b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml	
@@ -863,7 +863,7 @@
 	</Operation>
 
 	<Operation Class="PatchOperationRemove">
-		<xpath>Defs/ThingDef[defName="AC_Gun_ChargeIncursionar"]/comps/li[Class="MVCF.Comps.CompProperties_VerbProps"]</xpath>
+		<xpath>Defs/ThingDef[defName="AC_Gun_ChargeIncursionar"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbProps"]</xpath>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">

From 956eba0d512431e7dfff71829f47cb6ea47cb0d8 Mon Sep 17 00:00:00 2001
From: n7huntsman <halo_1100@hotmail.com>
Date: Sun, 28 Jul 2024 17:48:54 -0400
Subject: [PATCH 4/4] Add underbarrel labels

---
 .../Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml
index 0edf0b8158..5acef322b3 100644
--- a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml	
+++ b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Patches.xml	
@@ -837,6 +837,8 @@
 		<xpath>Defs/ThingDef[defName="AC_Gun_ChargeIncursionar"]/comps</xpath>
 		<value>
 			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to rifle mode</standardLabel>
+				<underBarrelLabel>switch to shotgun mode</underBarrelLabel>
 				<propsUnderBarrel>
 					<magazineSize>4</magazineSize>
 					<reloadOneAtATime>true</reloadOneAtATime>