Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Anomaly balance pass #3293

Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Anomaly/Defs/Ammo/Flamethrower_Burst.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ammoTypes>
<Ammo_Flamethrower_Napalm>Bullet_Incinerator_Burst_Napalm</Ammo_Flamethrower_Napalm>
<Ammo_Flamethrower_Prometheum>Bullet_Incinerator_Burst_Prometheum</Ammo_Flamethrower_Prometheum>
<Ammo_Flamethrower_Bioferrite>Bullet_Incinerator_Burst_Bioferrite</Ammo_Flamethrower_Bioferrite>
<Ammo_Flamethrower_Bioferrite>Bullet_Incinerator_Burst_Bioferrite</Ammo_Flamethrower_Bioferrite>
</ammoTypes>
</CombatExtended.AmmoSetDef>

Expand All @@ -20,7 +20,7 @@
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<label>jellied chemfuel stream</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<pelletCount>20</pelletCount>
<pelletCount>20</pelletCount>
<damageDef>Flame</damageDef>
<damageAmountBase>3</damageAmountBase>
<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
Expand Down
4 changes: 2 additions & 2 deletions Anomaly/Defs/Ammo/NerveSpikerBolt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoCrossbowBoltBase">
<defName>Ammo_NerveSpikerBolt</defName>
<label>nerve spiker bolt</label>
<description>A heavy bioferrite bolt, 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.</description>
<description>A heavy bioferrite bolt, 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.</description>
<graphicData>
<texPath>Things/Ammo/Medieval/Bolt/Bioferrite</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
Expand Down Expand Up @@ -55,7 +55,7 @@
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>NerveBioferrite</damageDef>
<speed>34</speed>
<speed>34</speed>
<damageAmountBase>11</damageAmountBase>
<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
<armorPenetrationSharp>5</armorPenetrationSharp>
Expand Down
5 changes: 5 additions & 0 deletions Anomaly/Defs/DamageDefs/DamageDefs_Anomaly.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>

<DamageDef ParentName="Scratch">
<defName>DemolishScratch</defName>
<buildingDamageFactorImpassable>2</buildingDamageFactorImpassable>
</DamageDef>

<DamageDef ParentName="Nerve">
<defName>NerveBioferrite</defName>
<additionalHediffs>
Expand Down
4 changes: 2 additions & 2 deletions Anomaly/Defs/HediffDefs/Hediffs_Anomaly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<!-- Global -->

<!-- It would be preferable to apply the regen modifier is a factor, but that's not currently possible. -->
<!-- It would be preferable to apply the regen modifier is a factor, but that's not currently possible. -->

<HediffDef>
<defName>BioferriteToxicity</defName>
Expand Down Expand Up @@ -56,7 +56,7 @@
<IncomingDamageFactor>1.40</IncomingDamageFactor>
</statFactors>
<regeneration>-350</regeneration> <!-- Offsets impossible regeneration. -->
</li>
</li>
</stages>
</HediffDef>

Expand Down
9 changes: 9 additions & 0 deletions Anomaly/Defs/ToolCapacityDefs/ToolCapacity.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>

<ToolCapacityDef>
<defName>DemolishScratch</defName>
<label>scratch</label>
</ToolCapacityDef>

</Defs>
32 changes: 16 additions & 16 deletions Anomaly/Patches/AbilityDefs/Abilities_Anomaly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>11</damageAmountBase>
Copy link
Contributor

@N7Huntsman N7Huntsman Jul 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you've gone too far the other direction with the changes to the spike projectile AP. While the gorehulk spikes do have 20% less AP than the other kinds in vanilla, the way CE armor works, this just turns into a big damage nerf.

Copy link
Contributor Author

@SamaelGray SamaelGray Jul 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not 20% less, it's 100% vs 15% armor penetration... the base spike projectile is what dictates the tough/trispike and fingerspike projectiles which same as the sanghuophage projectiles, have 100% AP in vanilla.

<armorPenetrationSharp>7.5</armorPenetrationSharp>
<armorPenetrationBlunt>8.2</armorPenetrationBlunt>
<armorPenetrationSharp>12</armorPenetrationSharp>
<armorPenetrationBlunt>16</armorPenetrationBlunt>
</projectile>
</value>
</Operation>
Expand All @@ -51,7 +51,7 @@
<xpath>Defs/AbilityDef[defName="SpikeLaunch_Fingerspike"]/verbProperties</xpath>
<value>
<verbProperties Class="CombatExtended.VerbPropertiesCE">
<range>18.9</range>
<range>12.9</range>
<defaultProjectile>Spike_Fingerspike</defaultProjectile>
</verbProperties>
</value>
Expand All @@ -62,8 +62,8 @@
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>8</damageAmountBase>
<armorPenetrationSharp>3.85</armorPenetrationSharp>
<armorPenetrationBlunt>4.22</armorPenetrationBlunt>
<armorPenetrationSharp>9</armorPenetrationSharp>
SamaelGray marked this conversation as resolved.
Show resolved Hide resolved
<armorPenetrationBlunt>12</armorPenetrationBlunt>
</projectile>
</value>
</Operation>
Expand All @@ -73,11 +73,11 @@
<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[defName="SpineLaunch_Gorehulk"]/verbProperties</xpath>
<value>
<verbProperties Class="CombatExtended.VerbPropertiesCE">
<verbProperties Class="CombatExtended.VerbPropertiesCE">
<soundCast>Gorehulk_Spine_Launch</soundCast>
<range>27.9</range>
<defaultProjectile>Spine_Gorehulk</defaultProjectile>
</verbProperties>
</verbProperties>
</value>
</Operation>

Expand All @@ -86,8 +86,8 @@
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>15</damageAmountBase>
<armorPenetrationSharp>14.75</armorPenetrationSharp>
<armorPenetrationBlunt>16.16</armorPenetrationBlunt>
<armorPenetrationSharp>6</armorPenetrationSharp>
<armorPenetrationBlunt>8</armorPenetrationBlunt>
</projectile>
</value>
</Operation>
Expand All @@ -106,25 +106,25 @@
<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[defName="Heatspikes"]/verbProperties</xpath>
<value>
<verbProperties Class="CombatExtended.VerbPropertiesCE">
<verbProperties Class="CombatExtended.VerbPropertiesCE">
<soundCast>Heatspikes_Shot</soundCast>
<verbClass>CombatExtended.Verb_AbilityShootCE</verbClass>
<verbClass>CombatExtended.Verb_AbilityShootCE</verbClass>
<soundCastTail>Heatspikes_Tail</soundCastTail>
<range>44.9</range>
<range>44</range>
<defaultProjectile>Bullet_Heatspike</defaultProjectile>
<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
<warmupTime>0</warmupTime>
<burstShotCount>12</burstShotCount>
<burstShotCount>10</burstShotCount>
<stopBurstWithoutLos>false</stopBurstWithoutLos>
<recoilAmount>3</recoilAmount> <!-- Abilities can't use ShotSpread, so give high recoil. -->
</verbProperties>
</verbProperties>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Bullet_Heatspike"]/projectile</xpath>
<value>
<thingClass>CombatExtended.BulletCE</thingClass>
<thingClass>CombatExtended.BulletCE</thingClass>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>EnergyBolt</damageDef>
<damageAmountBase>18</damageAmountBase>
Expand All @@ -141,7 +141,7 @@
<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[defName="FleshmelterBolt"]/verbProperties/range</xpath>
<value>
<range>44.9</range>
<range>44</range>
</value>
</Operation>

Expand Down
17 changes: 12 additions & 5 deletions Anomaly/Patches/Bodies/Devourer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Devourer"]/corePart</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -20,7 +20,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -30,7 +30,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Fin"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -40,7 +40,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -50,7 +50,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand Down Expand Up @@ -78,6 +78,13 @@
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
<value>
Expand Down
8 changes: 4 additions & 4 deletions Anomaly/Patches/Bodies/Dreadmeld.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Dreadmeld"]/corePart</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -20,7 +20,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Dreadmeld"]/corePart/parts/li[def="Tentacle"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -30,7 +30,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Dreadmeld"]/corePart/parts/li[def="FleshbeastHead"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -40,7 +40,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Dreadmeld"]/corePart/parts/li[def="FleshbeastHead"]/parts/li[def="FleshbeastSpike"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand Down
14 changes: 7 additions & 7 deletions Anomaly/Patches/Bodies/Fingerspike.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -20,7 +20,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart/parts/li[def="Spine"]/parts/li[def="FleshbeastSpike"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -30,7 +30,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart/parts/li[def="Neck"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -40,7 +40,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart/parts/li[def="Neck"]/parts/li[def="FleshbeastHead"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -50,7 +50,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart/parts/li[def="Neck"]/parts/li[def="FleshbeastHead"]/parts/li[def="Jaw"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -60,7 +60,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart/parts/li[def="Shoulder"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -70,7 +70,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart/parts/li[def="FleshbeastLeg"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand Down
6 changes: 3 additions & 3 deletions Anomaly/Patches/Bodies/Fleshbulb.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Bulbfreak"]/corePart</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -20,7 +20,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Bulbfreak"]/corePart/parts/li[def="FleshbeastHead"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand All @@ -30,7 +30,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Bulbfreak"]/corePart/parts/li[def="FleshbeastHead"]/parts/li[def="Tentacle"]</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand Down
2 changes: 1 addition & 1 deletion Anomaly/Patches/Bodies/FleshmassNucleus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="FleshmassNucleus"]/corePart</xpath>
<value>
<groups/>
<groups />
</value>
</nomatch>
</Operation>
Expand Down
Loading
Loading