From 3771d05f940a743f9886aef0dcdc22f34d3e2c47 Mon Sep 17 00:00:00 2001
From: SamaelGray <56392968+SamaelGray@users.noreply.github.com>
Date: Fri, 21 Jun 2024 21:35:00 +0330
Subject: [PATCH] Nerve Spiker and Bioferries bolts tweaks and fixes

---
 Anomaly/Defs/Ammo/NerveSpikerBolt.xml         |  27 +++++++++---------
 .../ThingDefs_Misc/Weapons_RangedHoraxian.xml |  12 +++++---
 .../Bolt}/Bioferrite/Bioferrite_a.png         | Bin
 .../Bolt}/Bioferrite/Bioferrite_b.png         | Bin
 .../Bolt}/Bioferrite/Bioferrite_c.png         | Bin
 .../Bolt_Bioferrite.png}                      | Bin
 6 files changed, 22 insertions(+), 17 deletions(-)
 rename Textures/Things/Ammo/{Neolithic/Arrow => Medieval/Bolt}/Bioferrite/Bioferrite_a.png (100%)
 rename Textures/Things/Ammo/{Neolithic/Arrow => Medieval/Bolt}/Bioferrite/Bioferrite_b.png (100%)
 rename Textures/Things/Ammo/{Neolithic/Arrow => Medieval/Bolt}/Bioferrite/Bioferrite_c.png (100%)
 rename Textures/Things/Projectile/{Arrows/Arrow_Bioferrite.png => Bolts/Bolt_Bioferrite.png} (100%)

diff --git a/Anomaly/Defs/Ammo/NerveSpikerBolt.xml b/Anomaly/Defs/Ammo/NerveSpikerBolt.xml
index 6f6c0bd36a..f4d1bfd9fe 100644
--- a/Anomaly/Defs/Ammo/NerveSpikerBolt.xml
+++ b/Anomaly/Defs/Ammo/NerveSpikerBolt.xml
@@ -23,23 +23,24 @@
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoCrossbowBoltBase">
 		<defName>Ammo_NerveSpikerBolt</defName>
 		<label>nerve spiker bolt</label>
-		<description>A heavy bioferrite bolt, tipped with biotoxin and shaped to be fired from a nerve spiker.\n\nThough simple to make, these bolts are brittle and tend to deform or break on impact, making them impossible to reuse.</description>		
+		<description>A heavy bioferrite bolt, tipped with biotoxin and shaped to be fired from a nerve spiker.\n\nThough simple to make, these bolts are brittle and tend to deform or break on impact, making them impossible to reuse.</description>
 		<graphicData>
-			<texPath>Things/Ammo/Neolithic/Arrow/Bioferrite</texPath>
+			<texPath>Things/Ammo/Medieval/Bolt/Bioferrite</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
 			<Mass>0.098</Mass>
-			<Bulk>0.29</Bulk>
-			<Flammability>0</Flammability>
-			<MarketValue>0.78</MarketValue> <!-- The value of 1 bioferrite + value of work [(workAmount / 1200) / product quantity] -->
+			<Bulk>0.34</Bulk>
+			<Flammability>0.75</Flammability>
+			<MarketValue>0.92</MarketValue> <!-- The value of 1 bioferrite input into the ammo spreadsheet instead of plasteel, 10 bioferrite per batch for 200 work per material -->
 		</statBases>
 		<thingCategories>
 			<li>AmmoNerveSpiker</li>
-		</thingCategories>		
+		</thingCategories>
+		<stackLimit>2000</stackLimit>
 		<tradeTags inherit="false">
 			<li>CE_PreIndustrialAmmo</li>
-		</tradeTags>		
+		</tradeTags>
 		<ammoClass>Nerve</ammoClass>
 	</ThingDef>
 
@@ -49,16 +50,16 @@
 		<defName>Projectile_NerveSpikerBolt</defName>
 		<label>nerve spiker bolt</label>
 		<graphicData>
-			<texPath>Things/Projectile/Arrows/Arrow_Bioferrite</texPath>
+			<texPath>Things/Projectile/Bolts/Bolt_Bioferrite</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Nerve</damageDef>
-			<speed>34</speed>			
-			<damageAmountBase>12</damageAmountBase>
-			<armorPenetrationBlunt>7.08</armorPenetrationBlunt>
+			<speed>34</speed>
+			<damageAmountBase>11</damageAmountBase>
+			<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
 			<armorPenetrationSharp>5</armorPenetrationSharp>
-			<preExplosionSpawnChance>0.25</preExplosionSpawnChance>
+			<preExplosionSpawnChance>0.5</preExplosionSpawnChance> <!-- Slightly worse than plasteel bolts.-->
 			<preExplosionSpawnThingDef>Bioferrite</preExplosionSpawnThingDef> <!-- The bolts crack/bend on impact and can't immediately be reused.-->
 		</projectile>
 	</ThingDef>
@@ -88,7 +89,7 @@
 		<products>
 			<Ammo_NerveSpikerBolt>10</Ammo_NerveSpikerBolt>
 		</products>
-		<workAmount>400</workAmount>
+		<workAmount>2000</workAmount>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Anomaly/Patches/ThingDefs_Misc/Weapons_RangedHoraxian.xml b/Anomaly/Patches/ThingDefs_Misc/Weapons_RangedHoraxian.xml
index 86509e7860..27d6cc870a 100644
--- a/Anomaly/Patches/ThingDefs_Misc/Weapons_RangedHoraxian.xml
+++ b/Anomaly/Patches/ThingDefs_Misc/Weapons_RangedHoraxian.xml
@@ -2,6 +2,7 @@
 <Patch>
 
 	<!-- === Tools === -->
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="NerveSpiker"]/tools</xpath>
 		<value>
@@ -23,9 +24,10 @@
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>NerveSpiker</defName>
 		<statBases>
+			<Mass>3.5</Mass>
 			<Bulk>6</Bulk>
 			<SwayFactor>1.2</SwayFactor>
-			<ShotSpread>0.7</ShotSpread>
+			<ShotSpread>0.5</ShotSpread>
 			<SightsEfficiency>1</SightsEfficiency>
 			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
 		</statBases>
@@ -37,13 +39,15 @@
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>True</hasStandardCommand>
 			<defaultProjectile>Projectile_NerveSpikerBolt</defaultProjectile>
-			<warmupTime>1</warmupTime>
+			<warmupTime>1.0</warmupTime>
 			<range>28</range>
-			<soundCast>Bow_Large</soundCast>
+			<soundCast>Shot_CE_Crossbow</soundCast>
+			<soundCastTail>GunTail_Light</soundCastTail>
 		</Properties>
 		<AmmoUser>
 			<magazineSize>1</magazineSize>
-			<reloadTime>7</reloadTime>
+			<AmmoGenPerMagOverride>2</AmmoGenPerMagOverride>
+			<reloadTime>4</reloadTime>
 			<ammoSet>AmmoSet_NerveSpikerBolt</ammoSet>
 		</AmmoUser>
 		<FireModes>
diff --git a/Textures/Things/Ammo/Neolithic/Arrow/Bioferrite/Bioferrite_a.png b/Textures/Things/Ammo/Medieval/Bolt/Bioferrite/Bioferrite_a.png
similarity index 100%
rename from Textures/Things/Ammo/Neolithic/Arrow/Bioferrite/Bioferrite_a.png
rename to Textures/Things/Ammo/Medieval/Bolt/Bioferrite/Bioferrite_a.png
diff --git a/Textures/Things/Ammo/Neolithic/Arrow/Bioferrite/Bioferrite_b.png b/Textures/Things/Ammo/Medieval/Bolt/Bioferrite/Bioferrite_b.png
similarity index 100%
rename from Textures/Things/Ammo/Neolithic/Arrow/Bioferrite/Bioferrite_b.png
rename to Textures/Things/Ammo/Medieval/Bolt/Bioferrite/Bioferrite_b.png
diff --git a/Textures/Things/Ammo/Neolithic/Arrow/Bioferrite/Bioferrite_c.png b/Textures/Things/Ammo/Medieval/Bolt/Bioferrite/Bioferrite_c.png
similarity index 100%
rename from Textures/Things/Ammo/Neolithic/Arrow/Bioferrite/Bioferrite_c.png
rename to Textures/Things/Ammo/Medieval/Bolt/Bioferrite/Bioferrite_c.png
diff --git a/Textures/Things/Projectile/Arrows/Arrow_Bioferrite.png b/Textures/Things/Projectile/Bolts/Bolt_Bioferrite.png
similarity index 100%
rename from Textures/Things/Projectile/Arrows/Arrow_Bioferrite.png
rename to Textures/Things/Projectile/Bolts/Bolt_Bioferrite.png