From 313835043f2dca2280912d04de7a931640b4cfe6 Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Sun, 11 Aug 2024 12:12:08 +0800
Subject: [PATCH 1/5] make Stunstick one handed

---
 .../Patches/Pulse Weaponry/RangedSpacer.xml    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
index 3a8aa23aac..7d6ec35845 100644
--- a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml	
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml	
@@ -65,6 +65,24 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]</xpath>
+			<value>
+				<weaponTags/>
+			</value>
+		</nomatch>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/weaponTags</xpath>
+		<value>
+			<li>CE_Sidearm_Melee</li>
+			<li>CE_OneHandedWeapon</li>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName = "DV_PulseSMG" or defName = "DV_PulseSuppressor"]/tools</xpath>
 		<value>

From 1bd1589dfecd8ec592f6fb6965534a4c3d6c0c79 Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Sun, 11 Aug 2024 12:20:38 +0800
Subject: [PATCH 2/5] Reduce cost

---
 .../Patches/Pulse Weaponry/RangedSpacer.xml          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
index 7d6ec35845..0d9a11d417 100644
--- a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml	
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml	
@@ -70,11 +70,11 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]</xpath>
 			<value>
-				<weaponTags/>
+				<weaponTags />
 			</value>
 		</nomatch>
 	</Operation>
-	
+
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/weaponTags</xpath>
 		<value>
@@ -82,6 +82,14 @@
 			<li>CE_OneHandedWeapon</li>
 		</value>
 	</Operation>
+	
+	<!-- === replace ComponentSpacer with ComponentIndustrial === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/costList/ComponentSpacer</xpath>
+		<value>
+			<ComponentIndustrial>1</ComponentIndustrial>
+		</value>
+	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName = "DV_PulseSMG" or defName = "DV_PulseSuppressor"]/tools</xpath>

From 43f29079c073f407d60408ae1e78e198cc0271e5 Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Mon, 12 Aug 2024 15:00:49 +0800
Subject: [PATCH 3/5] Revert "Reduce cost"

This reverts commit 1bd1589dfecd8ec592f6fb6965534a4c3d6c0c79.
---
 .../Patches/Pulse Weaponry/RangedSpacer.xml          | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
index 0d9a11d417..7d6ec35845 100644
--- a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml	
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml	
@@ -70,11 +70,11 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]</xpath>
 			<value>
-				<weaponTags />
+				<weaponTags/>
 			</value>
 		</nomatch>
 	</Operation>
-
+	
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/weaponTags</xpath>
 		<value>
@@ -82,14 +82,6 @@
 			<li>CE_OneHandedWeapon</li>
 		</value>
 	</Operation>
-	
-	<!-- === replace ComponentSpacer with ComponentIndustrial === -->
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/costList/ComponentSpacer</xpath>
-		<value>
-			<ComponentIndustrial>1</ComponentIndustrial>
-		</value>
-	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName = "DV_PulseSMG" or defName = "DV_PulseSuppressor"]/tools</xpath>

From 465670740a27032738af5de57b83e46f0521165d Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Mon, 12 Aug 2024 15:16:15 +0800
Subject: [PATCH 4/5] New Taser damage and buff

New Taser damage and add new damage to stick and buff stun chance
---
 .../Defs/Pulse Weaponry/Damage.xml              | 17 +++++++++++++++++
 .../Patches/Pulse Weaponry/RangedSpacer.xml     | 10 +++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml

diff --git a/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml b/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml
new file mode 100644
index 0000000000..ac5e515f87
--- /dev/null
+++ b/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	<DamageDef ParentName="Electrical">
+		<defName>PW_Taser</defName>
+		<label>taser</label>
+		<deathMessage>{0} has been tasered to death.</deathMessage>
+		<hediff>MuscleSpasms</hediff>
+		<hediffSkin>TaserStab</hediffSkin>
+		<hediffSolid>TaserStab</hediffSolid>
+		<defaultArmorPenetration>0.45</defaultArmorPenetration>
+		<modExtensions>
+			<li Class="CombatExtended.DamageDefExtensionCE">
+				<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
+			</li>
+		</modExtensions>
+	</DamageDef>
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
index 7d6ec35845..e51f739262 100644
--- a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml	
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml	
@@ -24,10 +24,14 @@
 					</capacities>
 					<power>5</power>
 					<extraMeleeDamages>
+						<li>
+							<def>PW_Taser</def>
+							<amount>10</amount>
+						</li>
 						<li>
 							<def>Stun</def>
 							<amount>32</amount>
-							<chance>0.20</chance>
+							<chance>0.40</chance>
 						</li>
 					</extraMeleeDamages>
 					<cooldownTime>1.68</cooldownTime>
@@ -70,11 +74,11 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]</xpath>
 			<value>
-				<weaponTags/>
+				<weaponTags />
 			</value>
 		</nomatch>
 	</Operation>
-	
+
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/weaponTags</xpath>
 		<value>

From 9e041155d6c7077bdf1ca7fab622703491e43284 Mon Sep 17 00:00:00 2001
From: n7huntsman <halo_1100@hotmail.com>
Date: Tue, 13 Aug 2024 04:07:55 -0400
Subject: [PATCH 5/5] Make the muscle spasms work

---
 .../Defs/Pulse Weaponry/Damage.xml            | 39 ++++++++++++++++---
 .../Patches/Pulse Weaponry/RangedSpacer.xml   |  6 +--
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml b/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml
index ac5e515f87..8c717589f0 100644
--- a/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml	
+++ b/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml	
@@ -1,17 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
+
+  <ManeuverDef>
+    <defName>StunstickSmash</defName>
+    <requiredCapacity>PW_Taser</requiredCapacity>
+	<verb>
+		<verbClass Class="CombatExtended.VerbPropertiesCE">CombatExtended.Verb_MeleeAttackCE</verbClass>
+		<meleeDamageDef>PW_Taser</meleeDamageDef>
+	</verb>
+    <logEntryDef>MeleeAttack</logEntryDef>
+    <combatLogRulesHit>Maneuver_Smash_MeleeHit</combatLogRulesHit>
+    <combatLogRulesDeflect>Maneuver_Smash_MeleeDeflect</combatLogRulesDeflect>
+    <combatLogRulesMiss>Maneuver_Smash_MeleeMiss</combatLogRulesMiss>
+    <combatLogRulesDodge>Maneuver_Smash_MeleeDodge</combatLogRulesDodge>
+  </ManeuverDef>
+
+	<ToolCapacityDef>
+		<defName>PW_Taser</defName>
+		<label>shock</label>
+	</ToolCapacityDef>
+
 	<DamageDef ParentName="Electrical">
 		<defName>PW_Taser</defName>
-		<label>taser</label>
-		<deathMessage>{0} has been tasered to death.</deathMessage>
-		<hediff>MuscleSpasms</hediff>
-		<hediffSkin>TaserStab</hediffSkin>
-		<hediffSolid>TaserStab</hediffSolid>
+		<label>shock</label>
+		<deathMessage>{0} has been shocked to death.</deathMessage>
+		<hediff>StunstickBurn</hediff>
 		<defaultArmorPenetration>0.45</defaultArmorPenetration>
+    	<causeStun>true</causeStun>		
 		<modExtensions>
 			<li Class="CombatExtended.DamageDefExtensionCE">
 				<harmOnlyOutsideLayers>true</harmOnlyOutsideLayers>
 			</li>
 		</modExtensions>
 	</DamageDef>
+
+	<HediffDef ParentName="ElectricalBurn">
+		<defName>StunstickBurn</defName>
+		<label>stunstick burn</label>
+		<labelNoun>a stunstick burn</labelNoun>
+		<comps>
+			<li Class="CombatExtended.HediffCompProperties_Beanbag" />
+		</comps>
+	</HediffDef>
+
 </Defs>
\ No newline at end of file
diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
index e51f739262..7fb687f49d 100644
--- a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml	
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml	
@@ -20,14 +20,10 @@
 				<li Class="CombatExtended.ToolCE">
 					<label>head</label>
 					<capacities>
-						<li>Poke</li>
+						<li>PW_Taser</li>
 					</capacities>
 					<power>5</power>
 					<extraMeleeDamages>
-						<li>
-							<def>PW_Taser</def>
-							<amount>10</amount>
-						</li>
 						<li>
 							<def>Stun</def>
 							<amount>32</amount>