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.

Sign up for GitHub

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

Patch Anomaly DLC #3105

Merged
merged 70 commits into from
Jun 21, 2024
Merged

Patch Anomaly DLC #3105

Show file tree
Hide file tree
Changes from 66 commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
30e206e
LoadFolders for Anomaly
N7Huntsman Apr 12, 2024
051c3d0
Patch Items
N7Huntsman Apr 12, 2024
5d16c22
Patch pawnkinds and scenario
N7Huntsman Apr 12, 2024
90ca66c
Patch Deadlife mortar shell.
N7Huntsman Apr 12, 2024
ad48d37
Patch apparel, adjust resources
N7Huntsman Apr 13, 2024
c1f97b2
Patch implants
N7Huntsman Apr 14, 2024
fc796f6
Patch Entities
N7Huntsman Apr 15, 2024
f09d1be
Abilities and Packs wip
N7Huntsman Apr 15, 2024
5813543
Patch fleshbeasts wip
N7Huntsman Apr 15, 2024
f4d41f9
Patch bodies wip
N7Huntsman Apr 16, 2024
46c9a7e
Body patches wip
N7Huntsman Apr 17, 2024
6adf95a
Finish patching bodies
N7Huntsman Apr 18, 2024
e2308bb
Patch fleshbeasts
N7Huntsman Apr 18, 2024
c8e202e
Patch Nerve Spiker
N7Huntsman Apr 18, 2024
2b7710f
Tweak projectile texture
N7Huntsman Apr 18, 2024
839f9fd
Ranged Weapons WIP
N7Huntsman Apr 18, 2024
7e41b0e
Tweak NerveSpiker
N7Huntsman Apr 19, 2024
4b0d86f
Add CE patches for ghoul and shambler weapon
emilys314 Apr 19, 2024
af020c1
Hellcat rifle wip
N7Huntsman Apr 19, 2024
4f480bf
Adjust flare pack patch
N7Huntsman Apr 19, 2024
cc7f476
Merge pull request #3094 from emilys314/patch-ghoul-and-shambler-weapons
N7Huntsman Apr 21, 2024
8c96ec2
Merge branch 'Development' into Anomaly-DLC
N7Huntsman Apr 23, 2024
afab58c
Fix typo
N7Huntsman Apr 24, 2024
72bf850
Fix deadlife shell recipe typo
N7Huntsman May 1, 2024
05e275c
Merge branch 'Development' into Anomaly-DLC
N7Huntsman May 1, 2024
c380ea0
Patch Fleshmass Spitter
N7Huntsman May 1, 2024
4a757b9
Merge branch 'Development' into Anomaly-DLC
N7Huntsman May 1, 2024
2e9246c
Incinerator wip
N7Huntsman May 7, 2024
412741e
Merge branch 'Development' into Anomaly-DLC
N7Huntsman May 31, 2024
17d5454
Remove flare motes and fix mutant format
N7Huntsman May 31, 2024
9151405
Merge branch 'Anomaly-DLC' of https://github.com/CombatExtended-Conti…
N7Huntsman May 31, 2024
0474fef
Make Ghouls and Shamblers immune to suppression and smoke
N7Huntsman May 31, 2024
6f2b564
Fix typo
N7Huntsman May 31, 2024
184f235
Give shamblers 20% damage reduction to bullets
N7Huntsman May 31, 2024
8655413
Awoken corpses, too.
N7Huntsman May 31, 2024
9d5e890
Remove bullet multi from mutants
N7Huntsman Jun 1, 2024
3a086e0
Add new Hellcat texture
N7Huntsman Jun 1, 2024
09cf2a6
Galil ACE stats for Hellcat Rifle
N7Huntsman Jun 1, 2024
0bd5301
ACP, AM, VWE-G fixes
N7Huntsman Jun 3, 2024
45beb24
Correct hellcat ammoset
N7Huntsman Jun 4, 2024
d4ff57c
Patch tactical turret
N7Huntsman Jun 5, 2024
9f4f8a0
Give shamblers a damage reduction
N7Huntsman Jun 5, 2024
3fb3cf2
Balance pass
N7Huntsman Jun 5, 2024
bcb9ead
XML typo fixes.
Thorbane Jun 6, 2024
174711c
Fix typo
N7Huntsman Jun 7, 2024
9a613a4
Add CE Verb for Anomaly launching abilities
Thorbane Jun 7, 2024
56a530d
Fix missing null check
Thorbane Jun 8, 2024
75d9cad
Fix default projectiles in patches
Thorbane Jun 8, 2024
a0445ee
Configure Anomaly underbarrel weapons
N7Huntsman Jun 8, 2024
22c9782
whitespace clean up
N7Huntsman Jun 8, 2024
9d8602d
Merge branch 'Development' into Anomaly-DLC
N7Huntsman Jun 8, 2024
be765bf
Merge branch 'Anomaly-DLC' into Anomaly-Underbarrel-Weapons
N7Huntsman Jun 8, 2024
f21eb60
Fix typo
N7Huntsman Jun 8, 2024
09f4295
Give noctol a stab attack.
N7Huntsman Jun 8, 2024
f1a3928
Tweak incinerator underbarrel label
N7Huntsman Jun 8, 2024
e9c11df
Ability projectile tweaks
N7Huntsman Jun 8, 2024
0d42547
Merge branch 'Development' into Anomaly-DLC
N7Huntsman Jun 9, 2024
65e1bfc
Merge pull request #3178 from CombatExtended-Continued/Anomaly-Underb…
N7Huntsman Jun 9, 2024
d3bf100
Add bioferrite arrow textures
N7Huntsman Jun 9, 2024
7bd0467
Fix some entity armor
N7Huntsman Jun 9, 2024
414e77f
Patch heatspikes
N7Huntsman Jun 10, 2024
2252bd6
Adjust Gorehulk range and flee behavior
N7Huntsman Jun 11, 2024
7f70f94
Use new bioferrite arrow texture
N7Huntsman Jun 13, 2024
fa19e55
Fix typo
N7Huntsman Jun 13, 2024
2530ea3
Reduce entity accuracy, decrease heatspike accuracy
N7Huntsman Jun 13, 2024
bc58f71
Update modlist
N7Huntsman Jun 14, 2024
e048367
Add bulk to apparel to avoid autopatcher
N7Huntsman Jun 20, 2024
fb8e92a
Fix noctol armor
N7Huntsman Jun 20, 2024
f949bbf
Merge branch 'Development' into Anomaly-DLC
N7Huntsman Jun 20, 2024
f675f2d
Fix deadlife verb, turret pack housekeeping
N7Huntsman Jun 21, 2024
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
53 changes: 53 additions & 0 deletions Anomaly/Defs/Ammo/Flamethrower_Burst.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>

<!-- ==================== AmmoSet ========================== -->

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_Incinerator_Burst</defName>
<label>flamethrower fuel</label>
<ammoTypes>
<Ammo_Flamethrower_Napalm>Bullet_Incinerator_Burst_Napalm</Ammo_Flamethrower_Napalm>
<Ammo_Flamethrower_Prometheum>Bullet_Incinerator_Burst_Prometheum</Ammo_Flamethrower_Prometheum>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<!-- ================== Projectiles ================== -->

<ThingDef ParentName="BaseFlamethrowerBullet">
<defName>Bullet_Incinerator_Burst_Napalm</defName>
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<label>jellied chemfuel stream</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<pelletCount>20</pelletCount>
<damageDef>Flame</damageDef>
<damageAmountBase>3</damageAmountBase>
<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
<preExplosionSpawnChance>0.33</preExplosionSpawnChance>
<soundExplode>CE_FlamethrowerExplosion</soundExplode>
<explosionRadius>1.0</explosionRadius>
<ai_IsIncendiary>true</ai_IsIncendiary>
<screenShakeFactor>0</screenShakeFactor>
<spreadMult>0.5</spreadMult>
</projectile>
</ThingDef>

<ThingDef ParentName="BaseFlamethrowerBullet">
<defName>Bullet_Incinerator_Burst_Prometheum</defName>
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<label>jellied prometheum stream</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<pelletCount>20</pelletCount>
<damageDef>PrometheumFlame</damageDef>
<damageAmountBase>5</damageAmountBase>
<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
<preExplosionSpawnChance>0.67</preExplosionSpawnChance>
<soundExplode>CE_FlamethrowerExplosion</soundExplode>
<explosionRadius>1.2</explosionRadius>
<ai_IsIncendiary>true</ai_IsIncendiary>
<screenShakeFactor>0</screenShakeFactor>
<spreadMult>0.5</spreadMult>
</projectile>
</ThingDef>

</Defs>
94 changes: 94 additions & 0 deletions Anomaly/Defs/Ammo/NerveSpikerBolt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>

<ThingCategoryDef>
<defName>AmmoNerveSpiker</defName>
<label>nerve spiker</label>
<parent>AmmoNeolithic</parent>
<iconPath>UI/Icons/ThingCategories/CaliberArrow</iconPath>
</ThingCategoryDef>

<!-- ==================== AmmoSet ========================== -->

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_NerveSpikerBolt</defName>
<label>nerve spiker bolts</label>
<ammoTypes>
<Ammo_NerveSpikerBolt>Projectile_NerveSpikerBolt</Ammo_NerveSpikerBolt>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->

<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>
<graphicData>
<texPath>Things/Ammo/Neolithic/Arrow/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] -->
</statBases>
<thingCategories>
<li>AmmoNerveSpiker</li>
</thingCategories>
<tradeTags inherit="false">
<li>CE_PreIndustrialAmmo</li>
</tradeTags>
<ammoClass>Nerve</ammoClass>
</ThingDef>

<!-- ================== Projectiles ================== -->

<ThingDef ParentName="BaseCrossbowBoltProjectile">
<defName>Projectile_NerveSpikerBolt</defName>
<label>nerve spiker bolt</label>
<graphicData>
<texPath>Things/Projectile/Arrows/Arrow_Bioferrite</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Nerve</damageDef>
<speed>34</speed>
Copy link
Contributor

Choose a reason for hiding this comment

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

My revised formula states 28, the same formula currently in use for all arrows and bolts.

<damageAmountBase>12</damageAmountBase>
<armorPenetrationBlunt>7.08</armorPenetrationBlunt>
<armorPenetrationSharp>5</armorPenetrationSharp>
Copy link
Contributor

Choose a reason for hiding this comment

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

The sheet states 2.5mm, is this a typo or is it intended?
Plasteel bolts have 3.5mm AP so ~3mm would make sense unless there's a reason behind the 5.

<preExplosionSpawnChance>0.25</preExplosionSpawnChance>
Copy link
Contributor

Choose a reason for hiding this comment

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

Would bump to higher than 0.5.

<preExplosionSpawnThingDef>Bioferrite</preExplosionSpawnThingDef> <!-- The bolts crack/bend on impact and can't immediately be reused.-->
</projectile>
</ThingDef>

<!-- ==================== Recipes ========================== -->

<RecipeDef ParentName="AmmoRecipeNeolithicBase">
<defName>MakeAmmo_NerveSpikerBolt</defName>
<label>make nerve spiker bolts x10</label>
<description>Craft 10 nerve spiker bolts.</description>
<jobString>Making nerve spiker bolts.</jobString>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Bioferrite</li>
</thingDefs>
</filter>
<count>10</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Bioferrite</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_NerveSpikerBolt>10</Ammo_NerveSpikerBolt>
</products>
<workAmount>400</workAmount>
</RecipeDef>

</Defs>
196 changes: 196 additions & 0 deletions Anomaly/Patches/AbilityDefs/Abilities_Anomaly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>

<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[@Name="SpikeLaunchBase"]/verbProperties/verbClass</xpath>
<value>
<verbClass>CombatExtended.Verb_AbilityShootCE</verbClass>
</value>
</Operation>

<!-- ========== Spike Base ========== -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[@Name="SpikeBase"]/projectile</xpath>
<value>
<thingClass>CombatExtended.BulletCE</thingClass>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>RangedStab</damageDef>
<speed>57</speed>
<damageAmountBase>1</damageAmountBase>
</projectile>
</value>
</Operation>

<!-- ========== Tough/Tri Spike ========== -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[defName="SpikeLaunch_Toughspike"]/verbProperties</xpath>
<value>
<verbProperties Class="CombatExtended.VerbPropertiesCE">
<range>18.9</range>
<defaultProjectile>Spike_Toughspike</defaultProjectile>
</verbProperties>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Spike_Toughspike"]/projectile</xpath>
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>11</damageAmountBase>
<armorPenetrationSharp>7.5</armorPenetrationSharp>
<armorPenetrationBlunt>8.2</armorPenetrationBlunt>
</projectile>
</value>
</Operation>

<!-- ========== Finger Spike ========== -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[defName="SpikeLaunch_Fingerspike"]/verbProperties</xpath>
<value>
<verbProperties Class="CombatExtended.VerbPropertiesCE">
<range>18.9</range>
<defaultProjectile>Spike_Fingerspike</defaultProjectile>
</verbProperties>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Spike_Fingerspike"]/projectile</xpath>
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>8</damageAmountBase>
<armorPenetrationSharp>3.85</armorPenetrationSharp>
<armorPenetrationBlunt>4.22</armorPenetrationBlunt>
</projectile>
</value>
</Operation>

<!-- ========== Gorehulk Spike ========== -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[defName="SpineLaunch_Gorehulk"]/verbProperties</xpath>
<value>
<verbProperties Class="CombatExtended.VerbPropertiesCE">
<soundCast>Gorehulk_Spine_Launch</soundCast>
<range>27.9</range>
<defaultProjectile>Spine_Gorehulk</defaultProjectile>
</verbProperties>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Spine_Gorehulk"]/projectile</xpath>
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>15</damageAmountBase>
<armorPenetrationSharp>14.75</armorPenetrationSharp>
<armorPenetrationBlunt>16.16</armorPenetrationBlunt>
</projectile>
</value>
</Operation>

<!-- ========== Devourer Leap ========== -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[defName="ConsumeLeap_Devourer"]/verbProperties/range</xpath>
<value>
<range>12.9</range>
</value>
</Operation>

<!-- ========== Heatspikes ========== -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[defName="Heatspikes"]/verbProperties</xpath>
<value>
<verbProperties Class="CombatExtended.VerbPropertiesCE">
<soundCast>Heatspikes_Shot</soundCast>
<verbClass>CombatExtended.Verb_AbilityShootCE</verbClass>
<soundCastTail>Heatspikes_Tail</soundCastTail>
<range>44.9</range>
<defaultProjectile>Bullet_Heatspike</defaultProjectile>
<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
<warmupTime>0</warmupTime>
<burstShotCount>12</burstShotCount>
<stopBurstWithoutLos>false</stopBurstWithoutLos>
<recoilAmount>3</recoilAmount> <!-- Abilities can't use ShotSpread, so give high recoil. -->
</verbProperties>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Bullet_Heatspike"]/projectile</xpath>
<value>
<thingClass>CombatExtended.BulletCE</thingClass>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>EnergyBolt</damageDef>
<damageAmountBase>18</damageAmountBase>
<speed>54</speed>
<bulletChanceToStartFire>1</bulletChanceToStartFire>
<armorPenetrationSharp>20</armorPenetrationSharp>
<armorPenetrationBlunt>1</armorPenetrationBlunt>
</projectile>
</value>
</Operation>

<!-- ========== Fleshmelter Bolt ========== -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[defName="FleshmelterBolt"]/verbProperties/range</xpath>
<value>
<range>44.9</range>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Bullet_FleshmelterBolt"]/projectile</xpath>
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>NociosphereVaporize</damageDef>
<damageAmountBase>150</damageAmountBase>
<speed>120</speed>
<soundAmbient>FleshmelterBolt_Launch</soundAmbient>
<explosionRadius>2.49</explosionRadius>
<screenShakeFactor>1.25</screenShakeFactor>
<explosionChanceToStartFire>0.75</explosionChanceToStartFire>
<bulletChanceToStartFire>1</bulletChanceToStartFire>
</projectile>
</value>
</Operation>

<!-- ========== Psychic Slaughter ========== -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[defName="PsychicSlaughter"]/verbProperties/range</xpath>
<value>
<range>7.9</range>
</value>
</Operation>

<!-- ========== Fleshmelter Bolt ========== -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[defName="CorrosiveSpray"]/verbProperties/range</xpath>
<value>
<range>12.9</range>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Proj_CorrosiveFluid"]/projectile</xpath>
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>AcidBurn</damageDef>
<speed>40</speed>
<damageAmountBase>30</damageAmountBase>
<shadowSize>0</shadowSize>
<filth>Filth_SpentAcid</filth>
<filthCount>1</filthCount>
</projectile>
</value>
</Operation>

</Patch>
Loading
Loading