CIWS v2 #3534

MaxDorob · 2024-11-05T07:46:34Z

Additions

Describe new functionality added by your code

Multi verb turret
CIWS turret
Projectile, skyfaller CIWS verb (and verb that targets things with CompCIWSTarget childs)
Trajectory workers (mostly necessary because we need to know the trajectory before we launch projectile)
- LerpedTrajectoryWorker - original trajectory
- BallisticsTrajectoryWorker - non-lerped trajectory worker, mostly moved code from ProjectileCE
- SmartRocketTrajectoryWorker - trajectory worker for projectile that chase target
ProjectilePropertiesCE
- speedGain (float)
- collideDistance and impactChance (float, used for CIWS projectile)
- CIWSVersion (ThingDef, used to swap projectiles when CIWS verbs used)
- trajectoryWorker (Type, if not specified LerpedTrajectoryWorker is used (BallisticsTrajectoryWorker if lerpPosition false))

Changes

Describe adjustments to existing features made in this merge

Changed some base verb methods
Moved some trajectory work to worker class (because we need to know trajectory before launch)

References

ToDo

Testing

Check tests you have performed:

Compiles without warnings
Game runs without errors
Playtested a colony (tested few variants of CIWS and other weapons)

Examples

Turrets should use projectiles with thingClass ProjectileCE_CIWS.
You can specify CIWS version in def with CIWSVersion node like this:

<ThingDef Name="Bullet_8x35mmCharged" ParentName="Base8x35mmChargedBullet">
		<defName>Bullet_8x35mmCharged</defName>
		<label>8x35mm Charged bullet</label>
		<projectile Class="CombatExtended.ProjectilePropertiesCE">
      <CIWSVersion>Bullet_8x35mmChargedCIWS</CIWSVersion>
			<damageAmountBase>19</damageAmountBase>
			<secondaryDamage>
				<li>
					<def>Bomb_Secondary</def>
					<amount>6</amount>
				</li>
			</secondaryDamage>
			<armorPenetrationSharp>16</armorPenetrationSharp>
			<armorPenetrationBlunt>57.6</armorPenetrationBlunt>
		</projectile>
	</ThingDef>
	...

  <ThingDef Name="Bullet_8x35mmChargedCIWS" ParentName="Base8x35mmChargedBullet">
    <defName>Bullet_8x35mmChargedCIWS</defName>
    <thingClass>CombatExtended.ProjectileCE_CIWS</thingClass>
    <label>8x35mm Charged bullet</label>
    <projectile Class="CombatExtended.ProjectilePropertiesCE">
      <damageAmountBase>19</damageAmountBase>
      <secondaryDamage>
        <li>
          <def>Bomb_Secondary</def>
          <amount>6</amount>
        </li>
      </secondaryDamage>
      <armorPenetrationSharp>16</armorPenetrationSharp>
      <armorPenetrationBlunt>57.6</armorPenetrationBlunt>
      <trajectoryWorker>CombatExtended.LerpedTrajectoryWorker_ExactPosDrawing</trajectoryWorker>
    </projectile>
  </ThingDef>

CIWS must use Building_CIWS_CE as thingClass

<!--=============== Blaster CIWS ===============-->

	<ThingDef ParentName="TurretAutoBase">
		<defName>CIWS_Blaster</defName>
    <thingClass>CombatExtended.Building_CIWS_CE</thingClass>
		<label>charge blaster CIWS</label>
		<constructionSkillPrerequisite>8</constructionSkillPrerequisite>
		<graphicData>
			<texPath>Things/Building/Turrets/MachineGunBase</texPath>
			<shadowData>
				<volume>(0.27,0.25,0.27)</volume>
				<offset>(0,0,0)</offset>
			</shadowData>
		</graphicData>
		<uiIconPath>UI/Icons/Turrets/ChargeBlaster_uiIcon</uiIconPath>
		<statBases>
			<WorkToBuild>23000</WorkToBuild>
			<MaxHitPoints>150</MaxHitPoints>
			<Mass>20</Mass>
			<Bulk>25</Bulk>
			<AimingAccuracy>0.75</AimingAccuracy>
			<ShootingAccuracyTurret>1.25</ShootingAccuracyTurret>
			<NightVisionEfficiency>0.5</NightVisionEfficiency>
		</statBases>
		<techLevel>Spacer</techLevel>
		<comps>
			<li Class="CompProperties_Power">
				<compClass>CompPowerTrader</compClass>
				<basePowerConsumption>400</basePowerConsumption>
			</li>
		</comps>
		<description>Automatic turret equipped with a charge blaster.</description>
		<costList>
			<Steel>125</Steel>
			<Plasteel>40</Plasteel>
			<ComponentIndustrial>6</ComponentIndustrial>
			<ComponentSpacer>1</ComponentSpacer>
		</costList>
		<building>
			<turretGunDef>Gun_CIWSBlasterTurret</turretGunDef>
			<ai_combatDangerous>true</ai_combatDangerous>
		</building>
		<designatorDropdown>CE_AutoTurrets</designatorDropdown>
		<placeWorkers>
			<li>PlaceWorker_TurretTop</li>
			<li>PlaceWorker_ShowTurretRadius</li>
		</placeWorkers>
		<researchPrerequisites>
			<li>CE_ChargeTurret</li>
		</researchPrerequisites>
		<minifiedDef>MinifiedThing</minifiedDef>
	</ThingDef>

Gun of such CIWS may have few attack verbs unlike usual turret.
Usual attack verb (non CIWS) must be specified first (otherwise turret may ignore it).
Also you may specify CompVerbDisabler in comps to make CIWS disablable.
Example of such gun:

	<ThingDef ParentName="BaseAutoTurretGun">
		<defName>Gun_CIWSBlasterTurret</defName>
		<label>blaster turret gun</label>
		<graphicData>
			<texPath>Things/Building/Turrets/BlasterTurret_Top</texPath>
			<graphicClass>Graphic_Single</graphicClass>
		</graphicData>
		<description>Charge blaster attached to a turret mount.</description>
		<soundInteract>Interact_ChargeRifle</soundInteract>
		<statBases>
			<SightsEfficiency>1</SightsEfficiency>
			<ShotSpread>0.06</ShotSpread>
			<SwayFactor>0.86</SwayFactor>
			<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
			<Mass>10</Mass>
		</statBases>
		<verbs>
			<li Class="CombatExtended.VerbPropertiesCE">
				<recoilAmount>0.90</recoilAmount>
				<verbClass>CombatExtended.Verb_ShootCE</verbClass>
				<hasStandardCommand>true</hasStandardCommand>
				<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
				<warmupTime>1.3</warmupTime>
				<range>55</range>
				<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
				<burstShotCount>10</burstShotCount>
				<soundCast>Shot_ChargeBlaster</soundCast>
				<soundCastTail>GunTail_Heavy</soundCastTail>
				<muzzleFlashScale>9</muzzleFlashScale>
				<recoilPattern>Mounted</recoilPattern>
			</li>
      <li Class="CombatExtended.VerbProperties_CIWSProjectile">
        <verbClass>CombatExtended.VerbCIWSProjectile</verbClass>
        <recoilAmount>0.90</recoilAmount>
        <hasStandardCommand>true</hasStandardCommand>
        <defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
        <warmupTime>0.4</warmupTime>
        <range>105</range>
        <ticksBetweenBurstShots>5</ticksBetweenBurstShots>
        <burstShotCount>10</burstShotCount>
        <soundCast>Shot_ChargeBlaster</soundCast>
        <soundCastTail>GunTail_Heavy</soundCastTail>
        <muzzleFlashScale>9</muzzleFlashScale>
        <recoilPattern>Mounted</recoilPattern>
        <holdFireLabel>HoldCloseInProjectilesFire</holdFireLabel>
        <holdFireDesc>HoldCloseInProjectilesFireDesc</holdFireDesc>
      </li>
      <li Class="CombatExtended.VerbProperties_CIWSSkyfaller">
        <verbClass>CombatExtended.VerbCIWSSkyfaller</verbClass>
        <recoilAmount>0.90</recoilAmount>
        <hasStandardCommand>true</hasStandardCommand>
        <defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
        <warmupTime>0.4</warmupTime>
        <range>105</range>
        <ticksBetweenBurstShots>5</ticksBetweenBurstShots>
        <burstShotCount>10</burstShotCount>
        <soundCast>Shot_ChargeBlaster</soundCast>
        <soundCastTail>GunTail_Heavy</soundCastTail>
        <muzzleFlashScale>9</muzzleFlashScale>
        <recoilPattern>Mounted</recoilPattern>
        <holdFireLabel>HoldCloseInSkyfallersFire</holdFireLabel>
      </li>
		</verbs>
		<comps>
			<li Class="CombatExtended.CompProperties_AmmoUser">
				<magazineSize>100</magazineSize>
				<reloadTime>7.8</reloadTime>
				<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
			</li>
      <li>
        <compClass>CombatExtended.CompVerbDisabler</compClass>
      </li>
		</comps>
	</ThingDef>

Example of smart rocket, that use specific trajectory worker

	<ThingDef Name="Base50mmRocket" ParentName="BaseExplosiveBullet" Abstract="true">
		...
		<projectile Class="CombatExtended.ProjectilePropertiesCE">
			...
      <ballisticCoefficient>1.0</ballisticCoefficient>
      <mass>1.0</mass>
      <diameter>2</diameter>
		</projectile>
	</ThingDef>

	<ThingDef ParentName="Base50mmRocket">
		<defName>Bullet_50mmRocket_HE</defName>
		...
		<projectile Class="CombatExtended.ProjectilePropertiesCE">
                 ...
      <CIWSVersion>Bullet_50mmRocket_HE_CIWS</CIWSVersion>
		</projectile>
		...
	</ThingDef>

  <ThingDef ParentName="Base50mmRocket">
    <defName>Bullet_50mmRocket_HE_CIWS</defName>
    <thingClass>CombatExtended.ProjectileCE_CIWS</thingClass>
    <label>50mm rocket (HE)</label>
    <graphicData>
      <texPath>Things/Projectile/Rocket/70mmAPKWS</texPath>
      <graphicClass>Graphic_Single</graphicClass>
      <drawSize>0.70</drawSize>
    </graphicData>
    <projectile Class="CombatExtended.ProjectilePropertiesCE">
      <damageDef>Bomb</damageDef>
      <damageAmountBase>147</damageAmountBase>
      <explosionRadius>0</explosionRadius>
      <trajectoryWorker>CombatExtended.SmartRocketTrajectoryWorker</trajectoryWorker>
      <speed>120</speed>
      <speedGain>32</speedGain>
    </projectile>
    ...
  </ThingDef>
  
  <ThingDef>
     <defName>Turret_RocketswarmLauncher</defName>
     <thingClass>CombatExtended.Building_CIWS_CE</thingClass>
     ...
  </ThingDef>

…MaxDorob/HAETAE_CIWS)

Count warmup time when trying to predict position Not tested yet (as well as everything else about CIWS)

MultiVerb turret

github-actions · 2024-11-28T18:45:57Z

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-12074143163.zip

github-actions · 2024-11-28T18:50:16Z

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-12074185893.zip

… reverted)

github-actions · 2024-11-29T16:12:48Z

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-12087826645.zip

github-actions · 2024-11-29T16:17:03Z

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-12087876448.zip

github-actions · 2024-11-29T18:24:51Z

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-12089209302.zip

github-actions · 2024-11-30T14:09:03Z

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-12097015705.zip

github-actions · 2024-11-30T14:51:06Z

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-12097281167.zip

github-actions · 2024-11-30T15:23:09Z

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-12097480056.zip

github-actions · 2024-11-30T15:28:12Z

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-12097511410.zip

mszabo-wikia · 2024-11-29T19:37:28Z

Source/CombatExtended/CombatExtended/Projectiles/TrajectoryWorkers/BaseTrajectoryWorker.cs

+            float speedGain,
+            float maxSpeed,
+            int flightTicks)
+        {


suggestion: It might simplify things to pack all these parameters into a ref struct and pass that around instead. Right now the full parameter list has to be spelled out in a lot of places.

mszabo-wikia · 2024-11-29T19:40:02Z

Source/CombatExtended/CombatExtended/Comps/CompCIWSImpactHandler_Skyfaller.cs

+            Pawn pawn = thing2 as Pawn;
+            if (pawn != null)
+            {
+                if (pawn.RaceProps.Humanlike)


if (thing2 is Pawn pawn && pawn.RaceProps.Humanlike)

mszabo-wikia · 2024-11-29T19:42:03Z

Source/CombatExtended/CombatExtended/Comps/CompCIWSImpactHandler_Skyfaller.cs

+        private Thing TryDropThing(Thing thing, Map map, IntVec3 position)
+        {
+            var contents = (parent as IActiveDropPod)?.Contents;
+            Rot4 rot = (contents?.setRotation != null) ? contents.setRotation.Value : Rot4.North;


We could return early if contents are null here and spare a lot of null checks down the line

mszabo-wikia · 2024-11-29T19:58:51Z

Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs

+            return targetHeight;
+        }
+        protected virtual bool LockRotationAndAngle => numShotsFired > 0;
+        public virtual void ShiftTarget(ShiftVecReport report, bool calculateMechanicalOnly = false, bool isInstant = false, bool midBurst = false)


issue: midBurst is now unused and could be removed, that could also allow getting rid of the override.

mszabo-wikia · 2024-11-30T21:15:25Z

Source/CombatExtended/CombatExtended/Verbs/VerbCIWS.cs

+            var _target = Targets.Where(x => Props.Interceptable(x.def) && !Props.Ignored.Contains(x.def) && !Turret.IgnoredDefsSettings.Contains(x.def)).Where(x => !IsFriendlyTo(x)).FirstOrDefault(t =>
+            {
+                var verb = this;
+                if (Caster.Map.GetComponent<TurretTracker>().CIWS.Any(turret => turret.currentTargetInt.Thing == t) || ProjectileCE_CIWS.ProjectilesAt(Caster.Map).Any(x => x.intendedTarget.Thing == t))


thought: may need to profile this to ensure the linq isn't an issue

mszabo-wikia · 2024-11-30T21:19:37Z

Source/CombatExtended/CombatExtended/Comps/CompCIWSTarget.cs

+            }
+            targetList.Add(parent);
+        }
+        public override void PostDeSpawn(Map map)


question: does this cover the case where the map itself gets reaped (incident maps)?

mszabo-wikia · 2024-11-30T21:21:18Z

Source/CombatExtended/CombatExtended/Comps/CompCIWSTarget.cs

+            return Targets(map).Where(x => x.HasComp<T>());
+        }
+
+        public CompProperties_CIWSTarget Props => props as CompProperties_CIWSTarget;


suggestion: props getters should always use a (cast) expression since a type mismatch here would be an unrecoverable error. that also reduces the chance of people then treating the props as nullable and adding unnecessary null checks elsewhere.

mszabo-wikia · 2024-11-30T21:25:18Z

Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs

+            }
+            return targetHeight;
+        }
+        protected virtual bool LockRotationAndAngle => numShotsFired > 0;


nit: the previous name MidBurst is I think more descriptive since this property is used also in shootline checks where it has nothing to do with ballistics. Also this should move up to live alongside the other property declarations.

mszabo-wikia · 2024-11-30T21:28:17Z

Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs

@@ -969,43 +1046,16 @@ public override bool TryCastShot()
            // 6:       Interruptible -> stop shooting
            // 7:       Not interruptible -> shoot along previous line
            // 8:     else -> stop


nit: these should move into the newly extracted method

mszabo-wikia · 2024-11-30T21:28:33Z

Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs

            }
            else // We cannot hit the current target
            {
-                if (midBurst) // Case 2,3,6,7
+                if (!KeepBurstOnNoShootLine(suppressing, out shootLine))


nit: merge into enclosing block

MaxDorob added 30 commits July 27, 2024 23:23

Comps for CIWS (used my comps from vanilla CIWS - https://github.com/…

1752cf0

…MaxDorob/HAETAE_CIWS)

Different projectile def for CIWS-targets

898c4a9

Moved some code to base class

d7115a0

Projectile movement improvments

e085a99

Virtual check collision between

f686568

Moved unused calculations to Init

3cf9ab5

Invoking OnImpact of CIWSTarget

793cda2

Moved moving-forward code to ProjectilePropertiesCE

87b8ab3

Moved NextPositions to ProjectilePropetiesCE

5c7a14b

Returned NextPositions to ProjectileCE

f7c929d

2D segments intersection check

10ae251

NextPosition Changes

343c4cd

Initial commit for CIWS verb

c9d620c

Initial commit for CIWS projectile and turret

b4b8bd1

Name fix

ed04020

Another name fix

45f241c

Temp CalculatePointForPreemptiveFire

6b84eb7

Improved base ciws tick

afc4458

TryFindShotLine for projectile

5746b92

Development merge

c3ca285

Moved PenetrationAmount to ProjectileCE again

725c3db

Moved "MoveForward" logic to ProjectilePropetiesCE again

c2d4704

CompCIWSTarget targeting method call

d23f77d

Count warmup time when trying to predict position Not tested yet (as well as everything else about CIWS)

selecting CIWS projectile if possible for CIWS verbs

315718d

Warning about wrong projectile

6638563

Comp -> Verb

4da40bd

MultiVerb turret

IgnoredDefs changes

ee992cf

Projectile -> ProjectileCE

e6007a7

Validate target moved to base class

ffc8f51

Moved projectile code

c082f99

reverted change for other branch

4f3bc13

MaxDorob marked this pull request as ready for review November 28, 2024 18:29

MaxDorob requested review from a team as code owners November 28, 2024 18:29

Backward compatibility for vehicles

38c6d7a

Whitespace

0a7de3b

Swap thingClass and trajectory workers if not CIWS projectile (can be…

b377260

… reverted)

Whitespace

ba5e06a

Health points

3989b82

MaxDorob added 2 commits November 30, 2024 14:32

Shadow rotation fix

94293e4

Removed tryPredict

79a7393

MaxDorob mentioned this pull request Nov 30, 2024

Unavailable projectiles for Verb #3575

Open

3 tasks

MaxDorob added 2 commits November 30, 2024 18:54

Checks for if Verb available (will be used with #3575 PR)

d62426d

Development merge

ea64d73

MaxDorob added 2 commits November 30, 2024 20:26

CIWS icons

b7af0ea

CIWS text

e2f2864

MaxDorob added 3 commits November 30, 2024 21:04

Fixed warning

8a20185

Default values for hold fire

1ddbee5

KPV now able to target skyfallers

fd9c036

Fixed whitespaces

dec17b4

mszabo-wikia reviewed Nov 30, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CIWS v2 #3534

CIWS v2 #3534

MaxDorob commented Nov 5, 2024 •

edited

Loading

github-actions bot commented Nov 28, 2024

github-actions bot commented Nov 28, 2024

github-actions bot commented Nov 29, 2024

github-actions bot commented Nov 29, 2024

github-actions bot commented Nov 29, 2024

github-actions bot commented Nov 30, 2024

github-actions bot commented Nov 30, 2024

github-actions bot commented Nov 30, 2024

github-actions bot commented Nov 30, 2024

mszabo-wikia Nov 29, 2024

mszabo-wikia Nov 29, 2024

mszabo-wikia Nov 29, 2024

mszabo-wikia Nov 29, 2024

mszabo-wikia Nov 30, 2024

mszabo-wikia Nov 30, 2024

mszabo-wikia Nov 30, 2024

mszabo-wikia Nov 30, 2024

mszabo-wikia Nov 30, 2024

mszabo-wikia Nov 30, 2024

CIWS v2 #3534

Are you sure you want to change the base?

CIWS v2 #3534

Conversation

MaxDorob commented Nov 5, 2024 • edited Loading

Additions

Changes

References

ToDo

Testing

Examples

github-actions bot commented Nov 28, 2024

github-actions bot commented Nov 28, 2024

github-actions bot commented Nov 29, 2024

github-actions bot commented Nov 29, 2024

github-actions bot commented Nov 29, 2024

github-actions bot commented Nov 30, 2024

github-actions bot commented Nov 30, 2024

github-actions bot commented Nov 30, 2024

github-actions bot commented Nov 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MaxDorob commented Nov 5, 2024 •

edited

Loading