Skip to content
This repository was archived by the owner on Apr 14, 2020. It is now read-only.

Commit 43883d5

Browse files
NoImageAvailableNoImageAvailable
authored
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
1 parent 513572e commit 43883d5

28 files changed

+422
-344
lines changed

‎About/About.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<ModMetaData>
33
<name>Combat Extended</name>
44
<author>CE Team</author>
5-
<url>https://ludeon.com/forums/index.php?topic=27374.0</url>
6-
<targetVersion>0.17.1546</targetVersion>
5+
<targetVersion>0.17.1546</targetVersion>
76
<description>Version: 0.4.0\n\nExtends combat mechanics to make them deeper and more tactical.</description>
87
</ModMetaData>

‎Assemblies/CombatExtended.dll‎

-1 KB
Binary file not shown.

‎Defs/Ammo/Advanced/30x64mmFuelCell.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<shaderType>TransparentPostLight</shaderType>
8787
</graphicData>
8888
<projectile>
89-
<speed>60</speed>
89+
<speed>40</speed>
9090
<flyOverhead>false</flyOverhead>
9191
</projectile>
9292
</ThingDef>

‎Defs/Ammo/Advanced/5x35mmCharged.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<projectile>
5858
<damageDef>Bullet</damageDef>
5959
<damageAmountBase>10</damageAmountBase>
60-
<speed>170</speed>
60+
<speed>200</speed>
6161
<secondaryDamage>
6262
<li>
6363
<def>Bomb_Secondary</def>

‎Defs/Ammo/Advanced/80x256mmFuelCell.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<projectile>
6969
<damageDef>Flame</damageDef>
7070
<damageAmountBase>100</damageAmountBase>
71-
<speed>60</speed>
71+
<speed>100</speed>
7272
<flyOverhead>false</flyOverhead>
7373
<explosionRadius>3.5</explosionRadius>
7474
<preExplosionSpawnThingDef>FilthFuel</preExplosionSpawnThingDef>

‎Defs/Ammo/Shell/90mmCannon.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</tradeTags>
3434
<statBases>
3535
<MaxHitPoints>200</MaxHitPoints>
36-
<Mass>4.6</Mass>
36+
<Mass>10</Mass>
3737
<Bulk>7</Bulk>
3838
</statBases>
3939
<cookOffFlashScale>30</cookOffFlashScale>

‎Defs/ThingDefs_Misc/Apparel_Shield.xml‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,19 @@
6060
<apparel>
6161
<tags>
6262
<li>TribalShield</li>
63-
<li>CE_Shield</li>
6463
</tags>
6564
</apparel>
65+
<ModExtensions>
66+
<li Class="CombatExtended.ShieldDefExtension">
67+
<shieldCoverage>
68+
<li>Hands</li>
69+
<li>Arms</li>
70+
<li>Shoulders</li>
71+
<li>Torso</li>
72+
<li>Neck</li>
73+
</shieldCoverage>
74+
</li>
75+
</ModExtensions>
6676
</ThingDef>
6777

6878
<ThingDef ParentName="ShieldBase">
@@ -97,9 +107,24 @@
97107
<apparel>
98108
<tags>
99109
<li>OutlanderShield</li>
100-
<li>CE_BallisticShield</li>
101110
</tags>
102111
</apparel>
112+
<ModExtensions>
113+
<li Class="CombatExtended.ShieldDefExtension">
114+
<shieldCoverage>
115+
<li>Hands</li>
116+
<li>Arms</li>
117+
<li>Shoulders</li>
118+
<li>Torso</li>
119+
<li>Neck</li>
120+
<li>FullHead</li>
121+
</shieldCoverage>
122+
<crouchCoverage>
123+
<li>Legs</li>
124+
</crouchCoverage>
125+
<drawAsTall>true</drawAsTall>
126+
</li>
127+
</ModExtensions>
103128
</ThingDef>
104129

105130
</Defs>

‎Defs/ThingDefs_Misc/Weapons_Turrets.xml‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@
3838
<soundInteract>InteractChargeRifle</soundInteract>
3939
<statBases>
4040
<MarketValue>2000</MarketValue>
41-
<SightsEfficiency>1.25</SightsEfficiency>
41+
<SightsEfficiency>0.5</SightsEfficiency>
4242
<ShotSpread>0.08</ShotSpread>
43-
<SwayFactor>0.23</SwayFactor>
44-
<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
43+
<SwayFactor>1.4</SwayFactor>
44+
<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
4545
</statBases>
4646
<verbs>
4747
<li Class="CombatExtended.VerbPropertiesCE">
4848
<recoilPattern>Mounted</recoilPattern>
49-
<recoilAmount>0.41</recoilAmount>
49+
<recoilAmount>0.53</recoilAmount>
5050
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
5151
<hasStandardCommand>true</hasStandardCommand>
5252
<projectileDef>Bullet_6x24mmCharged</projectileDef>
53-
<warmupTime>2</warmupTime>
54-
<range>40</range>
53+
<warmupTime>1.1</warmupTime>
54+
<range>55</range>
5555
<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
5656
<burstShotCount>10</burstShotCount>
5757
<soundCast>ShotChargeBlaster</soundCast>
@@ -61,8 +61,8 @@
6161
</verbs>
6262
<comps>
6363
<li Class="CombatExtended.CompProperties_AmmoUser">
64-
<magazineSize>300</magazineSize>
65-
<reloadTicks>420</reloadTicks>
64+
<magazineSize>100</magazineSize>
65+
<reloadTime>7.8</reloadTime>
6666
<spawnUnloaded>true</spawnUnloaded>
6767
<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
6868
</li>
@@ -81,20 +81,20 @@
8181
<description>Large caliber gun on a turret mount.</description>
8282
<statBases>
8383
<MarketValue>2000</MarketValue>
84-
<SightsEfficiency>1.25</SightsEfficiency>
85-
<ShotSpread>0.08</ShotSpread>
86-
<SwayFactor>1.2</SwayFactor>
87-
<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
84+
<SightsEfficiency>0.5</SightsEfficiency>
85+
<ShotSpread>0.01</ShotSpread>
86+
<SwayFactor>7.70</SwayFactor>
87+
<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
8888
</statBases>
8989
<verbs>
9090
<li Class="CombatExtended.VerbPropertiesCE">
9191
<recoilPattern>Mounted</recoilPattern>
92-
<recoilAmount>0.78</recoilAmount>
92+
<recoilAmount>0.95</recoilAmount>
9393
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
9494
<hasStandardCommand>true</hasStandardCommand>
9595
<projectileDef>Bullet_145x114mm_FMJ</projectileDef>
96-
<warmupTime>2.5</warmupTime>
97-
<range>40</range>
96+
<warmupTime>1.1</warmupTime>
97+
<range>55</range>
9898
<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
9999
<burstShotCount>10</burstShotCount>
100100
<soundCast>HeavyMG</soundCast>
@@ -104,8 +104,8 @@
104104
</verbs>
105105
<comps>
106106
<li Class="CombatExtended.CompProperties_AmmoUser">
107-
<magazineSize>100</magazineSize>
108-
<reloadTicks>420</reloadTicks>
107+
<magazineSize>40</magazineSize>
108+
<reloadTime>7.8</reloadTime>
109109
<spawnUnloaded>true</spawnUnloaded>
110110
<ammoSet>AmmoSet_145x114mm</ammoSet>
111111
</li>
@@ -124,19 +124,19 @@
124124
<description>Heavy machine gun for use against light vehicles.</description>
125125
<statBases>
126126
<MarketValue>2000</MarketValue>
127-
<SightsEfficiency>1.25</SightsEfficiency>
128-
<ShotSpread>0.08</ShotSpread>
129-
<SwayFactor>1.18</SwayFactor>
130-
<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
127+
<SightsEfficiency>0.5</SightsEfficiency>
128+
<ShotSpread>0.01</ShotSpread>
129+
<SwayFactor>6.88</SwayFactor>
130+
<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
131131
</statBases>
132132
<verbs>
133133
<li Class="CombatExtended.VerbPropertiesCE">
134134
<recoilPattern>Mounted</recoilPattern>
135-
<recoilAmount>0.79</recoilAmount>
135+
<recoilAmount>1.08</recoilAmount>
136136
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
137137
<hasStandardCommand>true</hasStandardCommand>
138138
<projectileDef>Bullet_145x114mm_FMJ</projectileDef>
139-
<warmupTime>2.5</warmupTime>
139+
<warmupTime>1.1</warmupTime>
140140
<range>86</range>
141141
<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
142142
<burstShotCount>10</burstShotCount>
@@ -148,7 +148,7 @@
148148
<comps>
149149
<li Class="CombatExtended.CompProperties_AmmoUser">
150150
<magazineSize>40</magazineSize>
151-
<reloadTicks>420</reloadTicks>
151+
<reloadTime>7.8</reloadTime>
152152
<spawnUnloaded>true</spawnUnloaded>
153153
<ammoSet>AmmoSet_145x114mm</ammoSet>
154154
</li>
@@ -171,20 +171,20 @@
171171
<statBases>
172172
<MarketValue>2000</MarketValue>
173173
<SightsEfficiency>0.50</SightsEfficiency>
174-
<ShotSpread>0.08</ShotSpread>
175-
<SwayFactor>0.24</SwayFactor>
176-
<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
174+
<ShotSpread>0.04</ShotSpread>
175+
<SwayFactor>2.51</SwayFactor>
176+
<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
177177
</statBases>
178178
<verbs>
179179
<li Class="CombatExtended.VerbPropertiesCE">
180180
<recoilPattern>Mounted</recoilPattern>
181-
<recoilAmount>0.51</recoilAmount>
181+
<recoilAmount>0.60</recoilAmount>
182182
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
183183
<hasStandardCommand>true</hasStandardCommand>
184184
<projectileDef>Bullet_762x51mmNATO_FMJ</projectileDef>
185-
<warmupTime>1.5</warmupTime>
185+
<warmupTime>1.1</warmupTime>
186186
<range>75</range>
187-
<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
187+
<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
188188
<burstShotCount>10</burstShotCount>
189189
<soundCast>MediumMG</soundCast>
190190
<soundCastTail>GunTail_Medium</soundCastTail>
@@ -194,7 +194,7 @@
194194
<comps>
195195
<li Class="CombatExtended.CompProperties_AmmoUser">
196196
<magazineSize>100</magazineSize>
197-
<reloadTicks>510</reloadTicks>
197+
<reloadTime>7.8</reloadTime>
198198
<spawnUnloaded>true</spawnUnloaded>
199199
<ammoSet>AmmoSet_762x51mmNATO</ammoSet>
200200
</li>
@@ -217,10 +217,10 @@
217217
<soundInteract>ArtilleryShellLoaded</soundInteract>
218218
<statBases>
219219
<MarketValue>2000</MarketValue>
220-
<SightsEfficiency>1.25</SightsEfficiency>
221-
<ShotSpread>0.1</ShotSpread>
222-
<SwayFactor>1.5</SwayFactor>
223-
<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
220+
<SightsEfficiency>0.6</SightsEfficiency>
221+
<ShotSpread>0.01</ShotSpread>
222+
<SwayFactor>2.99</SwayFactor>
223+
<RangedWeapon_Cooldown>2.57</RangedWeapon_Cooldown>
224224
</statBases>
225225
<verbs>
226226
<li Class="CombatExtended.VerbPropertiesCE">
@@ -243,7 +243,7 @@
243243
<comps>
244244
<li Class="CombatExtended.CompProperties_AmmoUser">
245245
<magazineSize>1</magazineSize>
246-
<reloadTicks>750</reloadTicks>
246+
<reloadTime>9.8</reloadTime>
247247
<spawnUnloaded>true</spawnUnloaded>
248248
<ammoSet>AmmoSet_90mmCannonShell</ammoSet>
249249
</li>
@@ -263,20 +263,20 @@
263263
<description>AGS-30 attached to a tripod.</description>
264264
<statBases>
265265
<MarketValue>2000</MarketValue>
266-
<SightsEfficiency>1.25</SightsEfficiency>
267-
<ShotSpread>0.08</ShotSpread>
268-
<SwayFactor>0.25</SwayFactor>
269-
<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
266+
<SightsEfficiency>0.77</SightsEfficiency>
267+
<ShotSpread>0.15</ShotSpread>
268+
<SwayFactor>2.19</SwayFactor>
269+
<RangedWeapon_Cooldown>0.40</RangedWeapon_Cooldown>
270270
</statBases>
271271
<verbs>
272272
<li Class="CombatExtended.VerbPropertiesCE">
273273
<recoilPattern>Mounted</recoilPattern>
274-
<recoilAmount>0.80</recoilAmount>
274+
<recoilAmount>4.90</recoilAmount>
275275
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
276276
<hasStandardCommand>true</hasStandardCommand>
277277
<projectileDef>Bullet_30x29mmGrenade_HE</projectileDef>
278278
<ai_IsIncendiary>true</ai_IsIncendiary>
279-
<warmupTime>2</warmupTime>
279+
<warmupTime>1.37</warmupTime>
280280
<minRange>8</minRange>
281281
<range>75</range>
282282
<ticksBetweenBurstShots>9</ticksBetweenBurstShots>
@@ -292,7 +292,7 @@
292292
<comps>
293293
<li Class="CombatExtended.CompProperties_AmmoUser">
294294
<magazineSize>30</magazineSize>
295-
<reloadTicks>420</reloadTicks>
295+
<reloadTime>7.8</reloadTime>
296296
<spawnUnloaded>true</spawnUnloaded>
297297
<ammoSet>AmmoSet_30x29mmGrenade</ammoSet>
298298
</li>

‎Patches/Core/DamageDefs/Damages_LocalInjury.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,14 @@
102102
<value>BurnDamage</value>
103103
</Operation>
104104

105+
<!-- ========== Change Bomb hediff ========== -->
106+
107+
<Operation Class="PatchOperationReplace">
108+
<xpath>*/DamageDef[defName="Bomb"]/hediff</xpath>
109+
<value>
110+
<hediff>Blast</hediff>
111+
</value>
112+
</Operation>
113+
105114
</Patch>
106115

‎Patches/Core/ThingDefs_Buildings/Buildings_Security.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
</li>
122122
<li Class="CombatExtended.CompProperties_AmmoUser">
123123
<magazineSize>1</magazineSize>
124-
<reloadTicks>300</reloadTicks>
124+
<reloadTime>300</reloadTime>
125125
<spawnUnloaded>true</spawnUnloaded>
126126
<ammoSet>AmmoSet_81mmMortarShell</ammoSet>
127127
</li>

0 commit comments

Comments
 (0)