Skip to content

Implement Non-Snap Turret Aiming #4055

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

Draft
N7Huntsman wants to merge 2 commits into
base: Development
Choose a base branch
from
Draft

Implement Non-Snap Turret Aiming #4055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2aa560
Implement Non-Snap Turret Aiming
N7Huntsman Jul 15, 2025
8a2ec91
Implement for Royalty and vanilla turrets.
N7Huntsman Jul 27, 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
32 changes: 30 additions & 2 deletions Defs/ThingDefs_Buildings/Buildings_Turrets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,12 @@
<researchPrerequisites>
<li>CE_HeavyTurret</li>
</researchPrerequisites>
<modExtensions>
<li Class="CombatExtended.NonSnapTurretExtension">
<speed>0.8</speed>
<angleWeightMultiplier>1.1</angleWeightMultiplier>
</li>
</modExtensions>
</ThingDef>

<!--=============== Medium Turret ===============-->
Expand Down Expand Up @@ -251,6 +257,12 @@
<li>GunTurrets</li>
<li>PrecisionRifling</li>
</researchPrerequisites>
<modExtensions>
<li Class="CombatExtended.NonSnapTurretExtension">
<speed>0.8</speed>
<angleWeightMultiplier>1.1</angleWeightMultiplier>
</li>
</modExtensions>
</ThingDef>

<!--=============== KPV ===============-->
Expand Down Expand Up @@ -299,6 +311,12 @@
<li>PrecisionRifling</li>
</researchPrerequisites>
<minifiedDef>MinifiedThing</minifiedDef>
<modExtensions>
<li Class="CombatExtended.NonSnapTurretExtension">
<speed>0.5</speed>
<angleWeightMultiplier>1.5</angleWeightMultiplier>
</li>
</modExtensions>
</ThingDef>

<!--=============== M240B ===============-->
Expand Down Expand Up @@ -344,6 +362,12 @@
<li Class="CombatExtended.CompProperties_FireArc">
</li>
</comps>
<modExtensions>
<li Class="CombatExtended.NonSnapTurretExtension">
<speed>0.8</speed>
<angleWeightMultiplier>1.1</angleWeightMultiplier>
</li>
</modExtensions>
</ThingDef>

<!--=============== AGS-30 ===============-->
Expand Down Expand Up @@ -386,6 +410,12 @@
<li>CE_Launchers</li>
</researchPrerequisites>
<minifiedDef>MinifiedThing</minifiedDef>
<modExtensions>
<li Class="CombatExtended.NonSnapTurretExtension">
<speed>0.8</speed>
<angleWeightMultiplier>1.1</angleWeightMultiplier>
</li>
</modExtensions>
</ThingDef>

<!--=============== Flak cannon ===============-->
Expand Down Expand Up @@ -457,14 +487,12 @@
<multiplier>0.66</multiplier>
</li>
</damageMultipliers>

<comps>
<li Class="CombatExtended.CompProperties_FireArc">
<spanRange>10~135</spanRange>
<maxSpanDeviation>135</maxSpanDeviation>
</li>
</comps>

<modExtensions>
<li Class="CombatExtended.NonSnapTurretExtension">
<speed>0.2</speed>
Expand Down
30 changes: 30 additions & 0 deletions Patches/Core/ThingDefs_Buildings/Buildings_Security.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,16 @@
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/ThingDef[defName="Turret_Autocannon"]</xpath>
<value>
<li Class="CombatExtended.NonSnapTurretExtension">
<speed>0.5</speed>
<angleWeightMultiplier>1.5</angleWeightMultiplier>
</li>
</value>
</Operation>

<!-- ========== Foam Turret ========== -->

<Operation Class="PatchOperationReplace">
Expand Down Expand Up @@ -382,6 +392,16 @@
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/ThingDef[defName="Turret_RocketswarmLauncher"]</xpath>
<value>
<li Class="CombatExtended.NonSnapTurretExtension">
<speed>0.5</speed>
<angleWeightMultiplier>1.5</angleWeightMultiplier>
</li>
</value>
</Operation>

<Operation Class="PatchOperationRemove">
<xpath>Defs/ThingDef[defName="Gun_RocketswarmLauncher"]/statBases/AccuracyTouch
| Defs/ThingDef[defName="Gun_RocketswarmLauncher"]/statBases/AccuracyShort
Expand Down Expand Up @@ -589,6 +609,16 @@
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/ThingDef[defName="Turret_Mortar"]</xpath>
<value>
<li Class="CombatExtended.NonSnapTurretExtension">
<speed>0.5</speed>
<angleWeightMultiplier>1.5</angleWeightMultiplier>
</li>
</value>
</Operation>

<!-- ========== Traps ========== -->

<Operation Class="PatchOperationAdd">
Expand Down
30 changes: 30 additions & 0 deletions Royalty/Patches/ThingDefs_Buildings/Buildings_Mechanoid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,16 @@
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/ThingDef[defName="Turret_AutoChargeBlaster"]</xpath>
<value>
<li Class="CombatExtended.NonSnapTurretExtension">
<speed>0.5</speed>
<angleWeightMultiplier>1.5</angleWeightMultiplier>
</li>
</value>
</Operation>

<!-- ========== Auto Inferno Turret ========== -->

<Operation Class="PatchOperationReplace">
Expand Down Expand Up @@ -245,6 +255,16 @@
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/ThingDef[defName="Turret_AutoInferno"]</xpath>
<value>
<li Class="CombatExtended.NonSnapTurretExtension">
<speed>0.35</speed>
<angleWeightMultiplier>1.75</angleWeightMultiplier>
</li>
</value>
</Operation>

<!-- ========== Auto Mortar ========== -->

<!-- Auto Mortar Base -->
Expand Down Expand Up @@ -289,6 +309,16 @@
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/ThingDef[defName="Turret_AutoMortar"]</xpath>
<value>
<li Class="CombatExtended.NonSnapTurretExtension">
<speed>0.8</speed>
<angleWeightMultiplier>1.1</angleWeightMultiplier>
</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Turret_AutoMortar"]/comps</xpath>
<value>
Expand Down