From 3d3204aa84d26a69e6d83a667b1348861831131c Mon Sep 17 00:00:00 2001
From: SamaelGray <56392968+SamaelGray@users.noreply.github.com>
Date: Mon, 22 Jul 2024 10:54:14 +0330
Subject: [PATCH] Possessed Weapons patch fix

---
 .../Defs}/PossessedWeapons_Ammo.xml           |  32 -----
 .../Defs}/Projectiles_Possesed.xml            |   2 -
 .../Patches}/PossessedWeapons_MeleePatch.xml  |   0
 .../Patches}/PossessedWeapons_RangedPatch.xml | 126 +++++++++---------
 4 files changed, 63 insertions(+), 97 deletions(-)
 rename ModPatches/{Possesed Weapons/Patches/Possesed Weapons => Possessed Weapons/Defs}/PossessedWeapons_Ammo.xml (85%)
 rename ModPatches/{Possesed Weapons/Defs/Possesed Weapons => Possessed Weapons/Defs}/Projectiles_Possesed.xml (99%)
 rename ModPatches/{Possesed Weapons/Patches/Possesed Weapons => Possessed Weapons/Patches}/PossessedWeapons_MeleePatch.xml (100%)
 rename ModPatches/{Possesed Weapons/Patches/Possesed Weapons => Possessed Weapons/Patches}/PossessedWeapons_RangedPatch.xml (91%)

diff --git a/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_Ammo.xml b/ModPatches/Possessed Weapons/Defs/PossessedWeapons_Ammo.xml
similarity index 85%
rename from ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_Ammo.xml
rename to ModPatches/Possessed Weapons/Defs/PossessedWeapons_Ammo.xml
index d3c67583a9..71c09d5951 100644
--- a/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_Ammo.xml	
+++ b/ModPatches/Possessed Weapons/Defs/PossessedWeapons_Ammo.xml	
@@ -121,7 +121,6 @@
 		</projectile>
 	</ThingDef>
 
-
 	<!-- Ammo for Ghostly Flintlock -->
 
 	<!-- Ghostly Flintlock -->
@@ -150,35 +149,4 @@
 		</projectile>
 	</ThingDef>
 
-
-	<!-- Ammo for Ghostly Flintlock -->
-
-	<!-- Ghostly Flintlock -->
-	<CombatExtended.AmmoSetDef>
-		<defName>AmmoSet_GhostFlintlock_MusketBall</defName>
-		<label>musket ball</label>
-		<ammoTypes>
-			<Ammo_MusketBall>Projectile_GhostFlintlock_MusketBall</Ammo_MusketBall>
-		</ammoTypes>
-	</CombatExtended.AmmoSetDef>
-
-	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
-		<defName>Projectile_GhostFlintlock_MusketBall</defName>
-		<label>musket ball</label>
-		<graphicData>
-			<texPath>Things/Projectile/BotchJob_GhostBullet</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-		</graphicData>
-		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<damageDef>BotchJob_GhostBlast</damageDef>
-			<speed>30</speed>
-			<damageAmountBase>6</damageAmountBase>
-			<pelletCount>6</pelletCount>
-			<armorPenetrationSharp>3.5</armorPenetrationSharp>
-			<armorPenetrationBlunt>3.14</armorPenetrationBlunt>
-			<spreadMult>5</spreadMult>
-			<explosionRadius>1</explosionRadius>
-		</projectile>
-	</ThingDef>
-
 </Defs>
\ No newline at end of file
diff --git a/ModPatches/Possesed Weapons/Defs/Possesed Weapons/Projectiles_Possesed.xml b/ModPatches/Possessed Weapons/Defs/Projectiles_Possesed.xml
similarity index 99%
rename from ModPatches/Possesed Weapons/Defs/Possesed Weapons/Projectiles_Possesed.xml
rename to ModPatches/Possessed Weapons/Defs/Projectiles_Possesed.xml
index 5bef4b1963..913dbd1c0b 100644
--- a/ModPatches/Possesed Weapons/Defs/Possesed Weapons/Projectiles_Possesed.xml	
+++ b/ModPatches/Possessed Weapons/Defs/Projectiles_Possesed.xml	
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
-
-
 	<ThingDef ParentName="BaseStreamlinedArrowProjectile">
 		<defName>Projectile_EarthenGauntlet_RockBlast</defName>
 		<label>rock blast</label>
diff --git a/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_MeleePatch.xml b/ModPatches/Possessed Weapons/Patches/PossessedWeapons_MeleePatch.xml
similarity index 100%
rename from ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_MeleePatch.xml
rename to ModPatches/Possessed Weapons/Patches/PossessedWeapons_MeleePatch.xml
diff --git a/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml b/ModPatches/Possessed Weapons/Patches/PossessedWeapons_RangedPatch.xml
similarity index 91%
rename from ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml
rename to ModPatches/Possessed Weapons/Patches/PossessedWeapons_RangedPatch.xml
index 5abb17687b..e132df0ea6 100644
--- a/ModPatches/Possesed Weapons/Patches/Possesed Weapons/PossessedWeapons_RangedPatch.xml	
+++ b/ModPatches/Possessed Weapons/Patches/PossessedWeapons_RangedPatch.xml	
@@ -35,7 +35,7 @@
 		<AmmoUser>
 			<ammoSet>AmmoSet_DragonFireArrow</ammoSet>
 		</AmmoUser>
-		<FireModes/>
+		<FireModes />
 		<weaponTags>
 			<li>BotchJob_PossessedDragonfireGreatbow</li>
 		</weaponTags>
@@ -123,7 +123,7 @@
 			</tools>
 		</value>
 	</Operation>
-	
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="BotchJob_PossessedLightningJavelin"]/description</xpath>
 		<value>
@@ -291,7 +291,7 @@
 		<AmmoUser>
 			<ammoSet>AmmoSet_VerdantArrow</ammoSet>
 		</AmmoUser>
-		<FireModes/>
+		<FireModes />
 		<weaponTags>
 			<li>BotchJob_PossessedVerdantBow</li>
 		</weaponTags>
@@ -489,66 +489,66 @@
 		<match Class="PatchOperationSequence">
 			<operations>
 
-	<!--=============================== Possessed Acolyte Staff ================================-->
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/statBases</xpath>
-				<value>
-					<Bulk>10.00</Bulk>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/statBases/RangedWeapon_Cooldown</xpath>
-				<value>
-					<RangedWeapon_Cooldown>1.53</RangedWeapon_Cooldown>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/warmupTime</xpath>
-				<value>
-					<warmupTime>2.7</warmupTime>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/range</xpath>
-				<value>
-					<range>30</range>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/burstShotCount</xpath>
-				<value>
-					<burstShotCount>14</burstShotCount>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/ticksBetweenBurstShots</xpath>
-				<value>
-					<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
-				</value>
-			</li>
-
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>limb</label>
-							<capacities>
-								<li>Blunt</li>
-								<li>Poke</li>
-							</capacities>
-							<power>6</power>
-							<cooldownTime>1.2</cooldownTime>
-							<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
-			</li>
+				<!--=============================== Possessed Acolyte Staff ================================-->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/statBases</xpath>
+					<value>
+						<Bulk>10.00</Bulk>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/statBases/RangedWeapon_Cooldown</xpath>
+					<value>
+						<RangedWeapon_Cooldown>1.53</RangedWeapon_Cooldown>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/warmupTime</xpath>
+					<value>
+						<warmupTime>2.7</warmupTime>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/range</xpath>
+					<value>
+						<range>30</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/burstShotCount</xpath>
+					<value>
+						<burstShotCount>14</burstShotCount>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/ticksBetweenBurstShots</xpath>
+					<value>
+						<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>limb</label>
+								<capacities>
+									<li>Blunt</li>
+									<li>Poke</li>
+								</capacities>
+								<power>6</power>
+								<cooldownTime>1.2</cooldownTime>
+								<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
 
 			</operations>
 		</match>