From ba6cbe713f7b32d66bc89559e422d7b134872deb Mon Sep 17 00:00:00 2001
From: Tostov <57082718+Tostov@users.noreply.github.com>
Date: Sat, 24 Aug 2024 23:27:43 +1000
Subject: [PATCH] More Tweaks

Reload added for all non-static federation weapons. In general it's 3 full auto bursts, 5 for MG-ish weapons (heat projector, crucible cannon).
Overall adjustments to warm-up, cooldown and recoil to compensate.
Tool added for grenade and bomb.
Further partial armor tweaks.
Buffs to federator to match its whopping 1k of combat power and not make the raids before it is part of the raidgroups *harder* than afterwards.
Painshock removed from all federation mechs and bions. Damage reduction removed.
Added parentdef tag to headgear to hopefully prevent rendering bug.
---
 .../ThingDefs_Misc/Ammo_Fed.xml               |  29 ++-
 .../ThingDefs_Misc/Fed_Apparel.xml            |  21 +++
 .../ThingDefs_Misc/Fed_Explosives.xml         |  24 +++
 .../ThingDefs_Misc/Fed_MechWeapons.xml        |  26 ++-
 .../ThingDefs_Misc/Fed_MeleeWeapons.xml       |   4 +-
 .../ThingDefs_Misc/Fed_RangedWeapons.xml      | 165 ++++++++++++------
 .../ThingDefs_Races/Race_Bion.xml             |  42 +++--
 .../ThingDefs_Races/Race_FederatorMech.xml    |  43 +++--
 .../ThingDefs_Races/Race_Hulk.xml             |   5 +-
 .../ThingDefs_Races/Race_SeekerMech.xml       |   1 -
 10 files changed, 255 insertions(+), 105 deletions(-)

diff --git a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml
index 2a11b2295e..e855311e98 100644
--- a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml	
+++ b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml	
@@ -35,6 +35,7 @@
 		<graphicData>
 			<texPath>Things/Projectile/Plasma</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<suppressionFactor>6.0</suppressionFactor>
@@ -135,7 +136,7 @@
 			<gravityFactor>0.01</gravityFactor>
 			<dropsCasings>false</dropsCasings>
 			<damageAmountBase>30</damageAmountBase>
-			<explosionRadius>1.5</explosionRadius>
+			<explosionRadius>2.1</explosionRadius>
 		</projectile>
 	</ThingDef>
 
@@ -271,12 +272,34 @@
 		</projectile>
 	</ThingDef>
 
-	<!-- ==========  Plasma Caster Projectile =========== -->
+	<!-- ========== Plasma Caster Projectile =========== -->
 
 	<ThingDef ParentName="BasePlasmaBombCE">
 		<defName>Bullet_PlasmaCaster</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<label>plasma sphere</label>
+		<graphicData>
+			<texPath>Things/Projectile/Plasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Plasma</damageDef>
+			<speed>20</speed>
+			<gravityFactor>0.01</gravityFactor>
+			<dropsCasings>false</dropsCasings>
+			<damageAmountBase>25</damageAmountBase>
+			<explosionRadius>2.1</explosionRadius>
+			<pelletCount>4</pelletCount>
+			<spreadMult>4.45</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<!-- ========== Federation Plasma Caster Projectile =========== -->
+
+	<ThingDef ParentName="BasePlasmaBombCE">
+		<defName>Bullet_PlasmaCaster_Fed</defName>
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<label>plasma sphere</label>
 		<graphicData>
 			<texPath>Things/Projectile/Flux</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -287,7 +310,7 @@
 			<speed>8</speed>
 			<gravityFactor>0.01</gravityFactor>
 			<dropsCasings>false</dropsCasings>
-			<damageAmountBase>75</damageAmountBase>
+			<damageAmountBase>90</damageAmountBase>
 			<explosionRadius>3.5</explosionRadius>
 		</projectile>
 	</ThingDef>
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Apparel.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Apparel.xml
index 74e1db1329..1a7950fec6 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Apparel.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Apparel.xml	
@@ -180,6 +180,13 @@
 			<li>StrappedHead</li>
 		</value>
 	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]/apparel</xpath>
+		<value>
+			<parentTagDef>ApparelHead</parentTagDef>
+		</value>
+	</Operation>
 
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/ThingDef[defName="Apparel_JudicatorH"]</xpath>
@@ -369,6 +376,13 @@
 			<li>StrappedHead</li>
 		</value>
 	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_MarksmanGearH"]/apparel</xpath>
+		<value>
+			<parentTagDef>ApparelHead</parentTagDef>
+		</value>
+	</Operation>
 
 	<!-- ========== Unity Guard Armor =========== -->
 	<Operation Class="PatchOperationAdd">
@@ -478,6 +492,13 @@
 			<li>StrappedHead</li>
 		</value>
 	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_UGHelmet"]/apparel</xpath>
+		<value>
+			<parentTagDef>ApparelHead</parentTagDef>
+		</value>
+	</Operation>
 
 	<!-- ========== Unity Guard Cloak =========== -->
 
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Explosives.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Explosives.xml
index a095d2a798..3690bdda7a 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Explosives.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_Explosives.xml	
@@ -221,4 +221,28 @@
 			</ThingDef>
 		</value>
 	</Operation>
+	
+	<!-- ========== Tools + Tradetag ========== -->
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_FedPlasmaGrenades" or defName="AD_PBomb"]</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>Body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.75</cooldownTime>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
+				</li>
+			</tools>
+			<tradeTags Inherit="False">
+				<li>CE_MediumAmmo</li>
+			</tradeTags>
+			<allowedArchonexusCount>5</allowedArchonexusCount>
+		</value>
+	</Operation>
 </Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml
index 48046126ed..2716829a83 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml	
@@ -9,19 +9,26 @@
 			<SwayFactor>0.91</SwayFactor>
 			<Bulk>30</Bulk>
 			<Mass>25</Mass>
-			<RangedWeapon_Cooldown>5</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_PlasmaMechBombard</defaultProjectile>
-			<warmupTime>4</warmupTime>
-			<range>56</range>
+			<warmupTime>4.55</warmupTime>
+			<range>44</range>
 			<soundCast>RS_ShotHarmonizer</soundCast>
 			<muzzleFlashScale>17</muzzleFlashScale>
 			<soundCastTail>GunTail_Heavy</soundCastTail>
 			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
 		</Properties>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>10</reloadTime>
+		</AmmoUser>
 		<FireModes>
 			<aiAimMode>AimedShot</aiAimMode>
 		</FireModes>
@@ -36,19 +43,26 @@
 			<SwayFactor>1.21</SwayFactor>
 			<Bulk>28.00</Bulk>
 			<Mass>24.00</Mass>
-			<RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.18</recoilAmount>
+			<recoilAmount>0.54</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_CrucibleCannon_CE</defaultProjectile>
-			<warmupTime>2.6</warmupTime>
+			<warmupTime>1.7</warmupTime>
 			<burstShotCount>13</burstShotCount>
 			<ticksBetweenBurstShots>22</ticksBetweenBurstShots>
 			<range>75</range>
 			<soundCast>RS_ShotCR</soundCast>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
 		</Properties>
+		<AmmoUser>
+			<magazineSize>65</magazineSize>
+			<reloadTime>8</reloadTime>
+		</AmmoUser>
 		<FireModes>
 			<aimedBurstShotCount>5</aimedBurstShotCount>
 			<aiAimMode>AimedShot</aiAimMode>
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml
index 55577b4d6b..22339438f1 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MeleeWeapons.xml	
@@ -23,8 +23,8 @@
 						<li>Blunt</li>
 					</capacities>
 					<power>15</power>
-					<cooldownTime>0.63</cooldownTime>
-					<armorPenetrationBlunt>5.625</armorPenetrationBlunt>
+					<cooldownTime>0.95</cooldownTime>
+					<armorPenetrationBlunt>25.625</armorPenetrationBlunt>
 					<linkedBodyPartsGroup>Head</linkedBodyPartsGroup>
 				</li>
 			</tools>
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml
index c468c48b60..c28c9a1116 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml	
@@ -101,22 +101,29 @@
 			<SwayFactor>1.34</SwayFactor>
 			<Bulk>10.80</Bulk>
 			<Mass>5.60</Mass>
-			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.48</recoilAmount>
+			<recoilAmount>0.74</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_PlasmaRifle_Fed</defaultProjectile>
-			<warmupTime>1.1</warmupTime>
+			<warmupTime>1.35</warmupTime>
 			<range>55</range>
 			<soundCast>RS_ShotCR</soundCast>
 			<muzzleFlashScale>12</muzzleFlashScale>
 			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			</targetParams>
 		</Properties>
 		<FireModes>
 			<aiUseBurstMode>FALSE</aiUseBurstMode>
 		</FireModes>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>5</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<!-- ==========  Aux Pistol  =========== -->
@@ -131,11 +138,11 @@
 			<RangedWeapon_Cooldown>1.50</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>2</recoilAmount>
+			<recoilAmount>1</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_AuxiliaryPistol</defaultProjectile>
-			<warmupTime>0.55</warmupTime>
+			<warmupTime>0.8</warmupTime>
 			<burstShotCount>2</burstShotCount>
 			<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
 			<range>18</range>
@@ -145,6 +152,10 @@
 		<FireModes>
 			<aiUseBurstMode>FALSE</aiUseBurstMode>
 		</FireModes>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>3</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<!-- ==========  Makeshift Crucible Rifle  =========== -->
@@ -160,17 +171,21 @@
 			<RangedWeapon_Cooldown>1.15</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.56</recoilAmount>
+			<recoilAmount>0.78</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_MakeshiftCrucibleRifle</defaultProjectile>
-			<warmupTime>1.1</warmupTime>
+			<warmupTime>1.7</warmupTime>
 			<range>55</range>
 			<soundCast>RS_ShotCP</soundCast>
 			<soundCastTail>GunTail_Heavy</soundCastTail>
 			<muzzleFlashScale>9</muzzleFlashScale>
 		</Properties>
 		<FireModes/>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>6</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<!-- ==========  AD Crucible Rifle  =========== -->
@@ -184,15 +199,15 @@
 			<SwayFactor>1.44</SwayFactor>
 			<Bulk>9.50</Bulk>
 			<Mass>4.80</Mass>
-			<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.56</recoilAmount>
+			<recoilAmount>0.78</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_CrucibleRifle</defaultProjectile>
-			<warmupTime>1.1</warmupTime>
-			<burstShotCount>6</burstShotCount>
+			<warmupTime>1.6</warmupTime>
+			<burstShotCount>5</burstShotCount>
 			<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
 			<range>55</range>
 			<soundCast>RS_ShotCR</soundCast>
@@ -203,6 +218,10 @@
 			<aiUseBurstMode>TRUE</aiUseBurstMode>
 			<aiAimMode>AimedShot</aiAimMode>
 		</FireModes>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -214,15 +233,15 @@
 			<SwayFactor>1.44</SwayFactor>
 			<Bulk>9.50</Bulk>
 			<Mass>4.80</Mass>
-			<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.56</recoilAmount>
+			<recoilAmount>0.78</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_CrucibleRifleAD</defaultProjectile>
-			<warmupTime>1.1</warmupTime>
-			<burstShotCount>6</burstShotCount>
+			<warmupTime>1.6</warmupTime>
+			<burstShotCount>5</burstShotCount>
 			<ticksBetweenBurstShots>18</ticksBetweenBurstShots>
 			<range>55</range>
 			<soundCast>RS_ShotCR</soundCast>
@@ -233,6 +252,10 @@
 			<aiUseBurstMode>TRUE</aiUseBurstMode>
 			<aiAimMode>AimedShot</aiAimMode>
 		</FireModes>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<!-- ==========  AD Crucible Pistol  =========== -->
@@ -245,17 +268,17 @@
 			<SwayFactor>1.08</SwayFactor>
 			<Bulk>3.90</Bulk>
 			<Mass>2.40</Mass>
-			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.78</recoilAmount>
+			<recoilAmount>0.89</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_CruciblePistol</defaultProjectile>
-			<warmupTime>0.6</warmupTime>
+			<warmupTime>0.7</warmupTime>
 			<burstShotCount>5</burstShotCount>
-			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-			<range>12</range>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<range>21</range>
 			<soundCast>RS_ShotCP</soundCast>
 			<muzzleFlashScale>12</muzzleFlashScale>
 		</Properties>
@@ -266,6 +289,10 @@
 			<aimedBurstShotCount>3</aimedBurstShotCount>
 			<aiUseBurstMode>FALSE</aiUseBurstMode>
 		</FireModes>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -277,17 +304,17 @@
 			<SwayFactor>1.08</SwayFactor>
 			<Bulk>3.90</Bulk>
 			<Mass>2.40</Mass>
-			<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.78</recoilAmount>
+			<recoilAmount>0.89</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_CruciblePistolAD</defaultProjectile>
-			<warmupTime>0.6</warmupTime>
+			<warmupTime>0.7</warmupTime>
 			<burstShotCount>5</burstShotCount>
-			<ticksBetweenBurstShots>20</ticksBetweenBurstShots>
-			<range>12</range>
+			<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+			<range>21</range>
 			<soundCast>RS_ShotCP</soundCast>
 			<muzzleFlashScale>12</muzzleFlashScale>
 		</Properties>
@@ -298,6 +325,10 @@
 			<aimedBurstShotCount>3</aimedBurstShotCount>
 			<aiUseBurstMode>FALSE</aiUseBurstMode>
 		</FireModes>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>3</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<!-- ==========  AD Heat Cannon  =========== -->
@@ -309,16 +340,16 @@
 			<SwayFactor>1.48</SwayFactor>
 			<Bulk>12.70</Bulk>
 			<Mass>7.50</Mass>
-			<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.58</recoilAmount>
+			<recoilAmount>0.79</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_HeatCannon</defaultProjectile>
-			<warmupTime>1.1</warmupTime>
+			<warmupTime>1.35</warmupTime>
 			<burstShotCount>5</burstShotCount>
-			<ticksBetweenBurstShots>50</ticksBetweenBurstShots>
+			<ticksBetweenBurstShots>40</ticksBetweenBurstShots>
 			<range>55</range>
 			<soundCast>RS_ShotHC</soundCast>
 			<muzzleFlashScale>12</muzzleFlashScale>
@@ -330,6 +361,10 @@
 			<aimedBurstShotCount>3</aimedBurstShotCount>
 			<aiUseBurstMode>FALSE</aiUseBurstMode>
 		</FireModes>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>6</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -340,16 +375,16 @@
 			<SwayFactor>1.48</SwayFactor>
 			<Bulk>12.70</Bulk>
 			<Mass>7.50</Mass>
-			<RangedWeapon_Cooldown>0.90</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.58</recoilAmount>
+			<recoilAmount>0.79</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_HeatCannon</defaultProjectile>
-			<warmupTime>1.1</warmupTime>
+			<warmupTime>1.35</warmupTime>
 			<burstShotCount>5</burstShotCount>
-			<ticksBetweenBurstShots>50</ticksBetweenBurstShots>
+			<ticksBetweenBurstShots>40</ticksBetweenBurstShots>
 			<range>55</range>
 			<soundCast>RS_ShotHC</soundCast>
 			<muzzleFlashScale>12</muzzleFlashScale>
@@ -361,6 +396,10 @@
 			<aimedBurstShotCount>3</aimedBurstShotCount>
 			<aiUseBurstMode>FALSE</aiUseBurstMode>
 		</FireModes>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>6</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<!-- ==========  AD Crucible Precision Rifle  =========== -->
@@ -372,14 +411,14 @@
 			<SwayFactor>1.46</SwayFactor>
 			<Bulk>12.40</Bulk>
 			<Mass>5.20</Mass>
-			<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.06</recoilAmount>
+			<recoilAmount>0.53</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_CruciblePrecisionRifle</defaultProjectile>
-			<warmupTime>1.1</warmupTime>
+			<warmupTime>1.6</warmupTime>
 			<range>75</range>
 			<soundCast>RS_ShotCPR</soundCast>
 			<muzzleFlashScale>12</muzzleFlashScale>
@@ -387,6 +426,10 @@
 		<FireModes>
 			<aiAimMode>AimedShot</aiAimMode>
 		</FireModes>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -397,14 +440,14 @@
 			<SwayFactor>1.46</SwayFactor>
 			<Bulk>12.40</Bulk>
 			<Mass>5.20</Mass>
-			<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.06</recoilAmount>
+			<recoilAmount>0.53</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_CruciblePrecisionRifleAD</defaultProjectile>
-			<warmupTime>1.1</warmupTime>
+			<warmupTime>1.6</warmupTime>
 			<range>75</range>
 			<soundCast>RS_ShotCPR</soundCast>
 			<muzzleFlashScale>12</muzzleFlashScale>
@@ -412,6 +455,10 @@
 		<FireModes>
 			<aiAimMode>AimedShot</aiAimMode>
 		</FireModes>
+		<AmmoUser>
+			<magazineSize>6</magazineSize>
+			<reloadTime>4</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<!-- ==========  AD Plasma Caster  =========== -->
@@ -423,18 +470,16 @@
 			<SwayFactor>1.96</SwayFactor>
 			<Bulk>18.20</Bulk>
 			<Mass>10.00</Mass>
-			<RangedWeapon_Cooldown>1.75</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>5</recoilAmount>
+			<recoilAmount>0.50</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_PlasmaCaster</defaultProjectile>
-			<warmupTime>3.25</warmupTime>
+			<warmupTime>1.9</warmupTime>
 			<minRange>3</minRange>
-			<burstShotCount>3</burstShotCount>
-			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-			<range>40</range>
+			<range>35</range>
 			<soundCast>RS_ShotHarmonizer</soundCast>
 			<soundCastTail>GunTail_Heavy</soundCastTail>
 			<muzzleFlashScale>18</muzzleFlashScale>
@@ -444,6 +489,10 @@
 			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
 		</Properties>
 		<FireModes/>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>5</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -454,18 +503,16 @@
 			<SwayFactor>1.96</SwayFactor>
 			<Bulk>18.20</Bulk>
 			<Mass>10.00</Mass>
-			<RangedWeapon_Cooldown>1.75</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>1.2</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>5</recoilAmount>
+			<recoilAmount>0.50</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
-			<defaultProjectile>Bullet_PlasmaCaster</defaultProjectile>
-			<warmupTime>4.25</warmupTime>
+			<defaultProjectile>Bullet_PlasmaCaster_Fed</defaultProjectile>
+			<warmupTime>1.9</warmupTime>
 			<minRange>3</minRange>
-			<burstShotCount>3</burstShotCount>
-			<ticksBetweenBurstShots>8</ticksBetweenBurstShots>
-			<range>40</range>
+			<range>35</range>
 			<soundCast>RS_ShotHarmonizer</soundCast>
 			<soundCastTail>GunTail_Heavy</soundCastTail>
 			<muzzleFlashScale>18</muzzleFlashScale>
@@ -475,6 +522,10 @@
 			<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
 		</Properties>
 		<FireModes/>
+		<AmmoUser>
+			<magazineSize>3</magazineSize>
+			<reloadTime>5</reloadTime>
+		</AmmoUser>
 	</Operation>
 
 	<!-- ==========  AD Crucible Carbine  =========== -->
@@ -487,14 +538,14 @@
 			<SwayFactor>1.11</SwayFactor>
 			<Bulk>8.20</Bulk>
 			<Mass>4.10</Mass>
-			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>0.35</RangedWeapon_Cooldown>
 		</statBases>
 		<Properties>
-			<recoilAmount>1.38</recoilAmount>
+			<recoilAmount>0.69</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_CrucibleCarbine</defaultProjectile>
-			<warmupTime>0.85</warmupTime>
+			<warmupTime>1.07</warmupTime>
 			<burstShotCount>5</burstShotCount>
 			<ticksBetweenBurstShots>22</ticksBetweenBurstShots>
 			<range>32</range>
@@ -505,5 +556,9 @@
 			<aimedBurstShotCount>3</aimedBurstShotCount>
 			<aiUseBurstMode>FALSE</aiUseBurstMode>
 		</FireModes>
+		<AmmoUser>
+			<magazineSize>15</magazineSize>
+			<reloadTime>4</reloadTime>
+		</AmmoUser>
 	</Operation>
 </Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml
index 7ec17a04fc..7b43bf52be 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml	
@@ -53,7 +53,6 @@
 		<value>
 			<ArmorRating_Sharp>44</ArmorRating_Sharp>
 			<NightVisionEfficiency>0.70</NightVisionEfficiency>
-			<PainShockThreshold>1</PainShockThreshold>
 		</value>
 	</Operation>
 
@@ -63,7 +62,6 @@
 			<ArmorRating_Sharp>36</ArmorRating_Sharp>
 			<ArmorRating_Blunt>15</ArmorRating_Blunt>
 			<NightVisionEfficiency>0.90</NightVisionEfficiency>
-			<PainShockThreshold>1</PainShockThreshold>
 		</value>
 	</Operation>
 
@@ -127,18 +125,32 @@
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="Bion_Base" or defName="Bion_Stalker"]/statBases</xpath>
+		<xpath>Defs/ThingDef[defName="Bion_Base"]/statBases</xpath>
 		<value>
 			<CarryWeight>50</CarryWeight>
 			<CarryBulk>50</CarryBulk>
-			<AimingAccuracy>1.3</AimingAccuracy>
-			<ShootingAccuracyPawn>1.3</ShootingAccuracyPawn>
+			<AimingAccuracy>1.2</AimingAccuracy>
+			<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn>
 			<MeleeDodgeChance>0.15</MeleeDodgeChance>
 			<MeleeCritChance>0.15</MeleeCritChance>
 			<MeleeParryChance>0.1</MeleeParryChance>
 			<SmokeSensitivity>0</SmokeSensitivity>
 		</value>
 	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Bion_Stalker"]/statBases</xpath>
+		<value>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>50</CarryBulk>
+			<AimingAccuracy>1.45</AimingAccuracy>
+			<ShootingAccuracyPawn>1.45</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.20</MeleeDodgeChance>
+			<MeleeCritChance>0.15</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Bion_Base" or defName="Bion_Stalker"]/tools</xpath>
@@ -218,26 +230,12 @@
 	</Operation>
 
 	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/ThingDef[@Name="BaseBion"]/damageMultipliers</xpath>
+		<xpath>Defs/PawnKindDef[@Name="BaseBionKind"]/ignoresPainShock</xpath>
 		<nomatch Class="PatchOperationAdd">
-			<xpath>Defs/ThingDef[@Name="BaseBion"]</xpath>
+			<xpath>Defs/PawnKindDef[@Name="BaseBionKind"]</xpath>
 			<value>
-				<damageMultipliers/>
+				<ignoresPainShock>true</ignoresPainShock>
 			</value>
 		</nomatch>
 	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="BaseBion"]/damageMultipliers</xpath>
-		<value>
-			<li>
-				<damageDef>Blunt</damageDef>
-				<multiplier>0.75</multiplier>
-			</li>
-			<li>
-				<damageDef>Bomb_Secondary</damageDef>
-				<multiplier>0.25</multiplier>
-			</li>
-		</value>
-	</Operation>
 </Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml
index 58b6f98a8f..80b78846eb 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_FederatorMech.xml	
@@ -9,11 +9,18 @@
 			</li>
 		</value>
 	</Operation>
+	
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Federator"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>7</baseHealthScale>
+		</value>
+	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Blunt</xpath>
 		<value>
-			<ArmorRating_Blunt>200</ArmorRating_Blunt>
+			<ArmorRating_Blunt>400</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
@@ -21,7 +28,6 @@
 		<xpath>Defs/ThingDef[defName="Mech_Federator"]/statBases/ArmorRating_Sharp</xpath>
 		<value>
 			<ArmorRating_Sharp>75</ArmorRating_Sharp>
-			<PainShockThreshold>1</PainShockThreshold>
 		</value>
 	</Operation>
 
@@ -44,6 +50,7 @@
 			<MeleeParryChance>0.3</MeleeParryChance>
 			<SmokeSensitivity>0</SmokeSensitivity>
 			<NightVisionEfficiency>0.80</NightVisionEfficiency>
+			<MeleeHitChance>1.5</MeleeHitChance>
 		</value>
 	</Operation>
 	
@@ -61,13 +68,13 @@
 		<xpath>Defs/ThingDef[defName="Mech_Federator"]/comps</xpath>
 		<value>
 			<li Class="CombatExtended.CompProperties_ArmorDurability">
-				<Durability>1875</Durability>
+				<Durability>3750</Durability>
 				<Regenerates>true</Regenerates>
 				<RegenInterval>600</RegenInterval>
 				<RegenValue>5</RegenValue>
 				<MinArmorPct>0</MinArmorPct>
 				<MinArmorValueSharp>26.25</MinArmorValueSharp>
-				<MinArmorValueBlunt>20</MinArmorValueBlunt>
+				<MinArmorValueBlunt>40</MinArmorValueBlunt>
 				<MinArmorValueHeat>0.7</MinArmorValueHeat>
 			</li>
 		</value>
@@ -79,15 +86,15 @@
 			<li Class="CombatExtended.PartialArmorExt">
 				<stats>
 					<li>
-						<useStatic>false</useStatic>
-						<ArmorRating_Sharp>0.25</ArmorRating_Sharp>
+						<useStatic>true</useStatic>
+						<ArmorRating_Sharp>28</ArmorRating_Sharp>
 						<parts>
 							<li>SightSensor</li>
 						</parts>
 					</li>
 					<li>
-						<useStatic>false</useStatic>
-						<ArmorRating_Blunt>0.25</ArmorRating_Blunt>
+						<useStatic>true</useStatic>
+						<ArmorRating_Blunt>28</ArmorRating_Blunt>
 						<parts>
 							<li>SightSensor</li>
 						</parts>
@@ -118,7 +125,7 @@
 					<capacities>
 						<li>Blunt</li>
 					</capacities>
-					<power>35</power>
+					<power>40</power>
 					<cooldownTime>2.67</cooldownTime>
 					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
 					<surpriseAttack>
@@ -129,14 +136,14 @@
 							</li>
 						</extraMeleeDamages>
 					</surpriseAttack>
-					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationBlunt>37.5</armorPenetrationBlunt>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>right fist</label>
 					<capacities>
 						<li>Stab</li>
 					</capacities>
-					<power>45</power>
+					<power>55</power>
 					<cooldownTime>2.67</cooldownTime>
 					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
 					<surpriseAttack>
@@ -147,10 +154,20 @@
 							</li>
 						</extraMeleeDamages>
 					</surpriseAttack>
-					<armorPenetrationBlunt>15</armorPenetrationBlunt>
-					<armorPenetrationSharp>10</armorPenetrationSharp>
+					<armorPenetrationBlunt>37.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>15</armorPenetrationSharp>
 				</li>
 			</tools>
 		</value>
 	</Operation>
+	
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/PawnKindDef[@Name="BaseMechKind"]/ignoresPainShock</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/PawnKindDef[@Name="BaseMechKind"]</xpath>
+			<value>
+				<ignoresPainShock>true</ignoresPainShock>
+			</value>
+		</nomatch>
+	</Operation>
 </Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml
index a751f8b182..0f3eed9dbb 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Hulk.xml	
@@ -21,7 +21,6 @@
 		<xpath>Defs/ThingDef[defName="Bion_Hulk"]/statBases/ArmorRating_Sharp</xpath>
 		<value>
 			<ArmorRating_Sharp>50</ArmorRating_Sharp>
-			<PainShockThreshold>1</PainShockThreshold>
 		</value>
 	</Operation>
 
@@ -37,8 +36,8 @@
 		<value>
 			<CarryWeight>60</CarryWeight>
 			<CarryBulk>60</CarryBulk>
-			<AimingAccuracy>1.3</AimingAccuracy>
-			<ShootingAccuracyPawn>1.3</ShootingAccuracyPawn>
+			<AimingAccuracy>1.2</AimingAccuracy>
+			<ShootingAccuracyPawn>1.2</ShootingAccuracyPawn>
 			<MeleeDodgeChance>0.10</MeleeDodgeChance>
 			<MeleeCritChance>0.2</MeleeCritChance>
 			<MeleeParryChance>0.10</MeleeParryChance>
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml
index 68e8cfa06d..d0d319b925 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_SeekerMech.xml	
@@ -21,7 +21,6 @@
 		<xpath>Defs/ThingDef[defName="Mech_Seeker"]/statBases/ArmorRating_Sharp</xpath>
 		<value>
 			<ArmorRating_Sharp>4</ArmorRating_Sharp>
-			<PainShockThreshold>1</PainShockThreshold>
 		</value>
 	</Operation>