Gun stat rebalance (#207)

* Reenabled bullet height tracking, reduced gunshot pain * Misc fixes and tweaks -Reduced pain from piercing wounds -Removed turrets from smelt weapons recipe -Added shoulder coverage to armor vests -Fixed job spam of CompSuppressable -Fixed Harmony patch for missing part hediff not applying properly * Fixed turret inspect string, downed pawns parrying * Fixed missing unload command * Compiled for 0.4.1 * Adjusted speed for some advanced projectiles * Fixed boomrats missing CompShearable * Reload time refactor -Changed reloadTicks to reloadTime, now uses seconds for easier balancing. -Fixed some other line endings as per TurretGunCE inspect string * Fixed secondary damage not hitting same part as primary * Opened up shield coverage to XML WRT issue #176, shields now have their own DefModExtension where coverage while moving and crouching respectively can be defined, as well as whether to draw it with a ballistic shield offset * Set gun defs to use new formula values * Compiled for 0.4.2
CombatExtendedRWMod · Jun 3, 2017 · 43883d5 · 43883d5
1 parent 513572e
commit 43883d5
Show file tree

Hide file tree

Showing 28 changed files with 422 additions and 344 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,7 +2,6 @@
 <ModMetaData>
 	<name>Combat Extended</name>
 	<author>CE Team</author>
-	<url>https://ludeon.com/forums/index.php?topic=27374.0</url>
-    <targetVersion>0.17.1546</targetVersion>
+	<targetVersion>0.17.1546</targetVersion>
 	<description>Version: 0.4.0\n\nExtends combat mechanics to make them deeper and more tactical.</description>
 </ModMetaData>
diff --git a/Assemblies/CombatExtended.dll b/Assemblies/CombatExtended.dll
diff --git a/Defs/Ammo/Advanced/30x64mmFuelCell.xml b/Defs/Ammo/Advanced/30x64mmFuelCell.xml
@@ -86,7 +86,7 @@
       <shaderType>TransparentPostLight</shaderType>
     </graphicData>
     <projectile>
-      <speed>60</speed>
+      <speed>40</speed>
       <flyOverhead>false</flyOverhead>
     </projectile>
   </ThingDef>

diff --git a/Defs/Ammo/Advanced/5x35mmCharged.xml b/Defs/Ammo/Advanced/5x35mmCharged.xml
@@ -57,7 +57,7 @@
     <projectile>
       <damageDef>Bullet</damageDef>
       <damageAmountBase>10</damageAmountBase>
-      <speed>170</speed>
+      <speed>200</speed>
       <secondaryDamage>
         <li>
           <def>Bomb_Secondary</def>

diff --git a/Defs/Ammo/Advanced/80x256mmFuelCell.xml b/Defs/Ammo/Advanced/80x256mmFuelCell.xml
@@ -68,7 +68,7 @@
     <projectile>
       <damageDef>Flame</damageDef>
       <damageAmountBase>100</damageAmountBase>
-      <speed>60</speed>
+      <speed>100</speed>
       <flyOverhead>false</flyOverhead>
       <explosionRadius>3.5</explosionRadius>
       <preExplosionSpawnThingDef>FilthFuel</preExplosionSpawnThingDef>

diff --git a/Defs/Ammo/Shell/90mmCannon.xml b/Defs/Ammo/Shell/90mmCannon.xml
@@ -33,7 +33,7 @@
 		</tradeTags>
     <statBases>
       <MaxHitPoints>200</MaxHitPoints>
-			<Mass>4.6</Mass>
+			<Mass>10</Mass>
 			<Bulk>7</Bulk>
     </statBases>
     <cookOffFlashScale>30</cookOffFlashScale>

diff --git a/Defs/ThingDefs_Misc/Apparel_Shield.xml b/Defs/ThingDefs_Misc/Apparel_Shield.xml
@@ -60,9 +60,19 @@
     <apparel>
       <tags>
         <li>TribalShield</li>
-        <li>CE_Shield</li>
       </tags>
     </apparel>
+    <ModExtensions>
+      <li Class="CombatExtended.ShieldDefExtension">
+        <shieldCoverage>
+          <li>Hands</li>
+          <li>Arms</li>
+          <li>Shoulders</li>
+          <li>Torso</li>
+          <li>Neck</li>
+        </shieldCoverage>
+      </li>
+    </ModExtensions>
   </ThingDef>
 
   <ThingDef ParentName="ShieldBase">
@@ -97,9 +107,24 @@
     <apparel>
       <tags>
         <li>OutlanderShield</li>
-        <li>CE_BallisticShield</li>
       </tags>
     </apparel>
+    <ModExtensions>
+      <li Class="CombatExtended.ShieldDefExtension">
+        <shieldCoverage>
+          <li>Hands</li>
+          <li>Arms</li>
+          <li>Shoulders</li>
+          <li>Torso</li>
+          <li>Neck</li>
+          <li>FullHead</li>
+        </shieldCoverage>
+        <crouchCoverage>
+          <li>Legs</li>
+        </crouchCoverage>
+        <drawAsTall>true</drawAsTall>
+      </li>
+    </ModExtensions>
   </ThingDef>
 
 </Defs>
diff --git a/Defs/ThingDefs_Misc/Weapons_Turrets.xml b/Defs/ThingDefs_Misc/Weapons_Turrets.xml
@@ -38,20 +38,20 @@
     <soundInteract>InteractChargeRifle</soundInteract>
     <statBases>
       <MarketValue>2000</MarketValue>
-      <SightsEfficiency>1.25</SightsEfficiency>
+      <SightsEfficiency>0.5</SightsEfficiency>
       <ShotSpread>0.08</ShotSpread>
-      <SwayFactor>0.23</SwayFactor>
-      <RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+      <SwayFactor>1.4</SwayFactor>
+      <RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
     </statBases>
     <verbs>
       <li Class="CombatExtended.VerbPropertiesCE">
         <recoilPattern>Mounted</recoilPattern>
-        <recoilAmount>0.41</recoilAmount>
+        <recoilAmount>0.53</recoilAmount>
         <verbClass>CombatExtended.Verb_ShootCE</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
         <projectileDef>Bullet_6x24mmCharged</projectileDef>
-        <warmupTime>2</warmupTime>
-        <range>40</range>
+        <warmupTime>1.1</warmupTime>
+        <range>55</range>
         <ticksBetweenBurstShots>5</ticksBetweenBurstShots>
         <burstShotCount>10</burstShotCount>
         <soundCast>ShotChargeBlaster</soundCast>
@@ -61,8 +61,8 @@
     </verbs>
     <comps>
       <li Class="CombatExtended.CompProperties_AmmoUser">
-        <magazineSize>300</magazineSize>
-        <reloadTicks>420</reloadTicks>
+        <magazineSize>100</magazineSize>
+        <reloadTime>7.8</reloadTime>
         <spawnUnloaded>true</spawnUnloaded>
         <ammoSet>AmmoSet_6x24mmCharged</ammoSet>
       </li>
@@ -81,20 +81,20 @@
     <description>Large caliber gun on a turret mount.</description>
     <statBases>
       <MarketValue>2000</MarketValue>
-      <SightsEfficiency>1.25</SightsEfficiency>
-      <ShotSpread>0.08</ShotSpread>
-      <SwayFactor>1.2</SwayFactor>
-      <RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+      <SightsEfficiency>0.5</SightsEfficiency>
+      <ShotSpread>0.01</ShotSpread>
+      <SwayFactor>7.70</SwayFactor>
+      <RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
     </statBases>
     <verbs>
       <li Class="CombatExtended.VerbPropertiesCE">
         <recoilPattern>Mounted</recoilPattern>
-        <recoilAmount>0.78</recoilAmount>
+        <recoilAmount>0.95</recoilAmount>
         <verbClass>CombatExtended.Verb_ShootCE</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
         <projectileDef>Bullet_145x114mm_FMJ</projectileDef>
-        <warmupTime>2.5</warmupTime>
-        <range>40</range>
+        <warmupTime>1.1</warmupTime>
+        <range>55</range>
         <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
         <burstShotCount>10</burstShotCount>
         <soundCast>HeavyMG</soundCast>
@@ -104,8 +104,8 @@
     </verbs>
     <comps>
       <li Class="CombatExtended.CompProperties_AmmoUser">
-        <magazineSize>100</magazineSize>
-        <reloadTicks>420</reloadTicks>
+        <magazineSize>40</magazineSize>
+        <reloadTime>7.8</reloadTime>
         <spawnUnloaded>true</spawnUnloaded>
         <ammoSet>AmmoSet_145x114mm</ammoSet>
       </li>
@@ -124,19 +124,19 @@
     <description>Heavy machine gun for use against light vehicles.</description>
     <statBases>
       <MarketValue>2000</MarketValue>
-      <SightsEfficiency>1.25</SightsEfficiency>
-      <ShotSpread>0.08</ShotSpread>
-      <SwayFactor>1.18</SwayFactor>
-      <RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+      <SightsEfficiency>0.5</SightsEfficiency>
+      <ShotSpread>0.01</ShotSpread>
+      <SwayFactor>6.88</SwayFactor>
+      <RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
     </statBases>
     <verbs>
       <li Class="CombatExtended.VerbPropertiesCE">
         <recoilPattern>Mounted</recoilPattern>
-        <recoilAmount>0.79</recoilAmount>
+        <recoilAmount>1.08</recoilAmount>
         <verbClass>CombatExtended.Verb_ShootCE</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
         <projectileDef>Bullet_145x114mm_FMJ</projectileDef>
-        <warmupTime>2.5</warmupTime>
+        <warmupTime>1.1</warmupTime>
         <range>86</range>
         <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
         <burstShotCount>10</burstShotCount>
@@ -148,7 +148,7 @@
     <comps>
       <li Class="CombatExtended.CompProperties_AmmoUser">
         <magazineSize>40</magazineSize>
-        <reloadTicks>420</reloadTicks>
+        <reloadTime>7.8</reloadTime>
         <spawnUnloaded>true</spawnUnloaded>
         <ammoSet>AmmoSet_145x114mm</ammoSet>
       </li>
@@ -171,20 +171,20 @@
     <statBases>
       <MarketValue>2000</MarketValue>
       <SightsEfficiency>0.50</SightsEfficiency>
-      <ShotSpread>0.08</ShotSpread>
-      <SwayFactor>0.24</SwayFactor>
-      <RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+      <ShotSpread>0.04</ShotSpread>
+      <SwayFactor>2.51</SwayFactor>
+      <RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
     </statBases>
     <verbs>
       <li Class="CombatExtended.VerbPropertiesCE">
         <recoilPattern>Mounted</recoilPattern>
-        <recoilAmount>0.51</recoilAmount>
+        <recoilAmount>0.60</recoilAmount>
         <verbClass>CombatExtended.Verb_ShootCE</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
         <projectileDef>Bullet_762x51mmNATO_FMJ</projectileDef>
-        <warmupTime>1.5</warmupTime>
+        <warmupTime>1.1</warmupTime>
         <range>75</range>
-        <ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+        <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
         <burstShotCount>10</burstShotCount>
         <soundCast>MediumMG</soundCast>
         <soundCastTail>GunTail_Medium</soundCastTail>
@@ -194,7 +194,7 @@
     <comps>
       <li Class="CombatExtended.CompProperties_AmmoUser">
         <magazineSize>100</magazineSize>
-        <reloadTicks>510</reloadTicks>
+        <reloadTime>7.8</reloadTime>
         <spawnUnloaded>true</spawnUnloaded>
         <ammoSet>AmmoSet_762x51mmNATO</ammoSet>
       </li>
@@ -217,10 +217,10 @@
     <soundInteract>ArtilleryShellLoaded</soundInteract>
     <statBases>
       <MarketValue>2000</MarketValue>
-      <SightsEfficiency>1.25</SightsEfficiency>
-      <ShotSpread>0.1</ShotSpread>
-      <SwayFactor>1.5</SwayFactor>
-      <RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+      <SightsEfficiency>0.6</SightsEfficiency>
+      <ShotSpread>0.01</ShotSpread>
+      <SwayFactor>2.99</SwayFactor>
+      <RangedWeapon_Cooldown>2.57</RangedWeapon_Cooldown>
     </statBases>
     <verbs>
       <li Class="CombatExtended.VerbPropertiesCE">
@@ -243,7 +243,7 @@
     <comps>
       <li Class="CombatExtended.CompProperties_AmmoUser">
         <magazineSize>1</magazineSize>
-        <reloadTicks>750</reloadTicks>
+        <reloadTime>9.8</reloadTime>
         <spawnUnloaded>true</spawnUnloaded>
         <ammoSet>AmmoSet_90mmCannonShell</ammoSet>
       </li>
@@ -263,20 +263,20 @@
     <description>AGS-30 attached to a tripod.</description>
     <statBases>
       <MarketValue>2000</MarketValue>
-      <SightsEfficiency>1.25</SightsEfficiency>
-      <ShotSpread>0.08</ShotSpread>
-      <SwayFactor>0.25</SwayFactor>
-      <RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+      <SightsEfficiency>0.77</SightsEfficiency>
+      <ShotSpread>0.15</ShotSpread>
+      <SwayFactor>2.19</SwayFactor>
+      <RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
     </statBases>
     <verbs>
       <li Class="CombatExtended.VerbPropertiesCE">
         <recoilPattern>Mounted</recoilPattern>
-        <recoilAmount>0.80</recoilAmount>
+        <recoilAmount>4.90</recoilAmount>
         <verbClass>CombatExtended.Verb_ShootCE</verbClass>
         <hasStandardCommand>true</hasStandardCommand>
         <projectileDef>Bullet_30x29mmGrenade_HE</projectileDef>
         <ai_IsIncendiary>true</ai_IsIncendiary>
-        <warmupTime>2</warmupTime>
+        <warmupTime>1.37</warmupTime>
         <minRange>8</minRange>
         <range>75</range>
         <ticksBetweenBurstShots>9</ticksBetweenBurstShots>
@@ -292,7 +292,7 @@
     <comps>
       <li Class="CombatExtended.CompProperties_AmmoUser">
         <magazineSize>30</magazineSize>
-        <reloadTicks>420</reloadTicks>
+        <reloadTime>7.8</reloadTime>
         <spawnUnloaded>true</spawnUnloaded>
         <ammoSet>AmmoSet_30x29mmGrenade</ammoSet>
       </li>

diff --git a/Patches/Core/DamageDefs/Damages_LocalInjury.xml b/Patches/Core/DamageDefs/Damages_LocalInjury.xml
@@ -102,5 +102,14 @@
     <value>BurnDamage</value>
 	</Operation>
 
+  <!-- ========== Change Bomb hediff ========== -->
+
+  <Operation Class="PatchOperationReplace">
+    <xpath>*/DamageDef[defName="Bomb"]/hediff</xpath>
+    <value>
+      <hediff>Blast</hediff>
+    </value>
+  </Operation>
+
 </Patch>
 
diff --git a/Patches/Core/ThingDefs_Buildings/Buildings_Security.xml b/Patches/Core/ThingDefs_Buildings/Buildings_Security.xml
@@ -121,7 +121,7 @@
 			  </li>
 			  <li Class="CombatExtended.CompProperties_AmmoUser">
 			    <magazineSize>1</magazineSize>
-			    <reloadTicks>300</reloadTicks>
+			    <reloadTime>300</reloadTime>
 			    <spawnUnloaded>true</spawnUnloaded>
 			    <ammoSet>AmmoSet_81mmMortarShell</ammoSet>
 			  </li>