Skip to content

Misc. Fixes & Tweaks #4380

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

Merged
N7Huntsman merged 4 commits into from
Dec 25, 2025
Merged

Misc. Fixes & Tweaks #4380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
078ded2
Fix some shelling stuff
N7Huntsman Dec 20, 2025
8da0e63
Merge branch 'Development' into Release-Fixes
N7Huntsman Dec 25, 2025
77a8093
A bunch of Grimworld 40k fixes
N7Huntsman Dec 25, 2025
2f08249
Update about.xml
N7Huntsman Dec 25, 2025
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
2 changes: 1 addition & 1 deletion About/About.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<li>1.6</li>
</supportedVersions>
<packageId>CETeam.CombatExtended</packageId>
<modVersion>16.7.0.0</modVersion>
<modVersion>16.7.1.0</modVersion>
<description>Extends combat mechanics to make them deeper and more tactical.</description>
<modIconPath IgnoreIfNoMatchingField="True">UI/Icons/CE_ModIcon_JustHat</modIconPath>
<modDependencies>
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Rocket/80mmS8Rocket.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
<gravityFactor>5</gravityFactor>
<shellingProps>
<iconPath>Things/WorldObjects/Munitions/Rocket</iconPath>
<tilesPerTick>0.35</tilesPerTick>
<tilesPerTick>0.12</tilesPerTick>
<damage>0.16</damage>
<range>13</range>
</shellingProps>
Expand Down
8 changes: 4 additions & 4 deletions Defs/Ammo/Shell/120mmMortar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<shellingProps>
<iconPath>Things/WorldObjects/Munitions/Mortar</iconPath>
<tilesPerTick>0.07</tilesPerTick>
<range>30</range>
<range>18</range>
</shellingProps>
</projectile>
</ThingDef>
Expand All @@ -154,7 +154,7 @@
<soundExplode>MortarBomb_Explode</soundExplode>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
<preExplosionSpawnSingleThingDef>Filth_BlastMark</preExplosionSpawnSingleThingDef>
<shellingProps>
<shellingProps>
<damage>0.28</damage>
</shellingProps>
</projectile>
Expand Down Expand Up @@ -220,7 +220,7 @@
<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
<soundExplode>MortarIncendiary_Explode</soundExplode>
<preExplosionSpawnSingleThingDef>Filth_BlastMark</preExplosionSpawnSingleThingDef>
<shellingProps>
<shellingProps>
<damage>0.28</damage>
</shellingProps>
</projectile>
Expand All @@ -237,7 +237,7 @@
<damageDef>EMP</damageDef>
<damageAmountBase>237</damageAmountBase>
<explosionRadius>6.5</explosionRadius>
<shellingProps>
<shellingProps>
<damage>0.20</damage>
</shellingProps>
</projectile>
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Shell/81mmMortar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
<shellingProps>
<iconPath>Things/WorldObjects/Munitions/Mortar</iconPath>
<tilesPerTick>0.06</tilesPerTick>
<range>50</range>
<range>10</range>
</shellingProps>
</projectile>
</ThingDef>
Expand Down
178 changes: 47 additions & 131 deletions ...rld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Switchable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!--===== Guardian Spear - Melee =====-->

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="GW_TotE_GuardianSpear"]/tools</xpath>
<xpath>Defs/ThingDef[@Name="GW_TOE_GuardianSpearMeleeBase"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
Expand Down Expand Up @@ -44,7 +44,7 @@
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="GW_TotE_GuardianSpear"]</xpath>
<xpath>Defs/ThingDef[@Name="GW_TOE_GuardianSpearMeleeBase"]</xpath>
<value>
<equippedStatOffsets>
<MeleeCritChance>0.67</MeleeCritChance>
Expand All @@ -55,7 +55,7 @@
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="GW_TotE_GuardianSpear"]/statBases</xpath>
<xpath>Defs/ThingDef[@Name="GW_TOE_GuardianSpearMeleeBase"]/statBases</xpath>
<value>
<Bulk>13</Bulk>
<MeleeCounterParryBonus>1.88</MeleeCounterParryBonus>
Expand Down Expand Up @@ -98,67 +98,6 @@
</FireModes>
</Operation>

<!--===== Adrathic Spear - Melee =====-->

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="GW_TotE_AdrathicSpear"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>handle</label>
<capacities>
<li>Poke</li>
</capacities>
<power>4</power>
<cooldownTime>1.54</cooldownTime>
<chanceFactor>0.2</chanceFactor>
<armorPenetrationBlunt>1.425</armorPenetrationBlunt>
<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
</li>
<li Class="CombatExtended.ToolCE">
<label>shaft</label>
<capacities>
<li>Poke</li>
</capacities>
<power>4</power>
<cooldownTime>1.78</cooldownTime>
<chanceFactor>0.05</chanceFactor>
<armorPenetrationBlunt>1</armorPenetrationBlunt>
<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
</li>
<li Class="CombatExtended.ToolCE">
<label>point</label>
<capacities>
<li>Stab</li>
</capacities>
<power>52</power>
<cooldownTime>1.35</cooldownTime>
<armorPenetrationBlunt>2.8</armorPenetrationBlunt>
<armorPenetrationSharp>98</armorPenetrationSharp>
</li>
</tools>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="GW_TotE_AdrathicSpear"]</xpath>
<value>
<equippedStatOffsets>
<MeleeCritChance>0.67</MeleeCritChance>
<MeleeParryChance>1.95</MeleeParryChance>
<MeleeDodgeChance>1.1</MeleeDodgeChance>
</equippedStatOffsets>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="GW_TotE_AdrathicSpear"]/statBases</xpath>
<value>
<Bulk>13</Bulk>
<MeleeCounterParryBonus>1.88</MeleeCounterParryBonus>
</value>
</Operation>

<!--===== Adrathic Spear - Ranged =====-->

<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
Expand Down Expand Up @@ -195,67 +134,6 @@
</weaponTags>
</Operation>

<!--===== Melta Spear - Melee =====-->

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="GW_TotE_MeltaSpear"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>handle</label>
<capacities>
<li>Poke</li>
</capacities>
<power>4</power>
<cooldownTime>1.54</cooldownTime>
<chanceFactor>0.2</chanceFactor>
<armorPenetrationBlunt>1.425</armorPenetrationBlunt>
<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
</li>
<li Class="CombatExtended.ToolCE">
<label>shaft</label>
<capacities>
<li>Poke</li>
</capacities>
<power>4</power>
<cooldownTime>1.78</cooldownTime>
<chanceFactor>0.05</chanceFactor>
<armorPenetrationBlunt>1</armorPenetrationBlunt>
<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
</li>
<li Class="CombatExtended.ToolCE">
<label>point</label>
<capacities>
<li>Stab</li>
</capacities>
<power>52</power>
<cooldownTime>1.35</cooldownTime>
<armorPenetrationBlunt>2.8</armorPenetrationBlunt>
<armorPenetrationSharp>98</armorPenetrationSharp>
</li>
</tools>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="GW_TotE_MeltaSpear"]</xpath>
<value>
<equippedStatOffsets>
<MeleeCritChance>0.67</MeleeCritChance>
<MeleeParryChance>1.95</MeleeParryChance>
<MeleeDodgeChance>1.1</MeleeDodgeChance>
</equippedStatOffsets>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="GW_TotE_MeltaSpear"]/statBases</xpath>
<value>
<Bulk>13</Bulk>
<MeleeCounterParryBonus>1.88</MeleeCounterParryBonus>
</value>
</Operation>

<!--===== Melta Spear - Ranged =====-->

<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
Expand Down Expand Up @@ -296,7 +174,7 @@
<!--===== Castellan Axe - Melee =====-->

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="GW_TotE_CastellanAxe"]/tools</xpath>
<xpath>Defs/ThingDef[@Name="GW_TOE_AxeMeleeBase"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
Expand Down Expand Up @@ -336,7 +214,7 @@
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="GW_TotE_CastellanAxe"]</xpath>
<xpath>Defs/ThingDef[@Name="GW_TOE_AxeMeleeBase"]</xpath>
<value>
<equippedStatOffsets>
<MeleeCritChance>0.67</MeleeCritChance>
Expand All @@ -347,7 +225,7 @@
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="GW_TotE_CastellanAxe"]/statBases</xpath>
<xpath>Defs/ThingDef[@Name="GW_TOE_AxeMeleeBase"]/statBases</xpath>
<value>
<Bulk>15</Bulk>
<MeleeCounterParryBonus>2.02</MeleeCounterParryBonus>
Expand Down Expand Up @@ -390,10 +268,29 @@
</FireModes>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="GW_TotE_CastellanAxeR"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>handle</label>
<capacities>
<li>Poke</li>
</capacities>
<power>6</power>
<cooldownTime>1.74</cooldownTime>
<chanceFactor>0.2</chanceFactor>
<armorPenetrationBlunt>1.425</armorPenetrationBlunt>
<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
</li>
</tools>
</value>
</Operation>

<!--===== Watcher's Axe - Melee =====-->

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="GW_TotE_WatchersAxe"]/tools</xpath>
<xpath>Defs/ThingDef[@Name="GW_TOE_AxeMeleeBase"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
Expand Down Expand Up @@ -433,7 +330,7 @@
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="GW_TotE_WatchersAxe"]</xpath>
<xpath>Defs/ThingDef[@Name="GW_TOE_AxeMeleeBase"]</xpath>
<value>
<equippedStatOffsets>
<MeleeCritChance>0.67</MeleeCritChance>
Expand All @@ -444,7 +341,7 @@
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="GW_TotE_WatchersAxe"]/statBases</xpath>
<xpath>Defs/ThingDef[@Name="GW_TOE_AxeMeleeBase"]/statBases</xpath>
<value>
<Bulk>15</Bulk>
<MeleeCounterParryBonus>2.02</MeleeCounterParryBonus>
Expand Down Expand Up @@ -487,4 +384,23 @@
</FireModes>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="GW_TotE_WatchersAxeR"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>handle</label>
<capacities>
<li>Poke</li>
</capacities>
<power>6</power>
<cooldownTime>1.74</cooldownTime>
<chanceFactor>0.2</chanceFactor>
<armorPenetrationBlunt>1.425</armorPenetrationBlunt>
<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
</li>
</tools>
</value>
</Operation>

</Patch>
15 changes: 0 additions & 15 deletions ...es/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Melee_Weapons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,6 @@
</Operation>

<!-- ======== Powersword ======= -->
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="GW_AOD_Powersword"]/stuffCategories</xpath>
<value>
<li>Metallic_Weapon</li>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="GW_AOD_Powersword"]/tools</xpath>
<value>
Expand Down Expand Up @@ -265,14 +258,6 @@
</Operation>

<!-- ======== Relic Powersword ======= -->

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="GW_AOD_Relic_Powersword"]/stuffCategories</xpath>
<value>
<li>Metallic_Weapon</li>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="GW_AOD_Relic_Powersword"]/tools</xpath>
<value>
Expand Down
3 changes: 1 addition & 2 deletions ...World Scattered Sons/CE_Patch_Hediffs.xml → ...e Imperialis/Patches/CE_Patch_Hediffs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
<Patch>

<!-- Hediffs -->

<Operation Class="PatchOperationAdd">
<xpath>Defs/HediffDef[defName="GWPA_Rallied" or defName="GW_SM_GuillimanArmor"]/stages/li/statFactors</xpath>
<xpath>Defs/HediffDef[defName="GW40k_SS_InspiringAura_Reciever"]/stages/li/statFactors</xpath>
<value>
<Suppressability>-0.25</Suppressability>
</value>
Expand Down
2 changes: 1 addition & 1 deletion ModPatches/Grimworld Regiments of Renown/Patches/Regiments_Ranged.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@
<defaultProjectile>Bullet_Lasgun_Rifle</defaultProjectile>
<warmupTime>0.2</warmupTime>
<range>45</range>
<soundCast>GW_AM_GW_HOI_ROR_Gun_Lascarbinefour</soundCast>
<soundCast>GW_AM_Gun_Lascarbinefour</soundCast>
<soundCastTail>GunTail_Heavy</soundCastTail>
<muzzleFlashScale>9</muzzleFlashScale>
</Properties>
Expand Down