543edee358
- GuidedProjectileManager passed target.transform to OnFireGuided for a no-target fused round: a NullReferenceException inside InstantWeapon.Execute after the shot was queued, which skipped audio, wear, heat and visibility and unwound Zone.Update. The tuple's transform is null-safe now, and the trackmissile console command falls back to the missile. - Presentation follows the commit rather than predicting it. The manager binds each guided round to Zone.ShotCommitted (retarget to the burst point the commit names, so a Contact round bursts at its hull and a Range-clamped burst is not overshot) and ShotResolved (burst there, then). The binding is disposed when the projectile dies, so a pooled round does not accumulate them. - Beams and barrel-fired projectiles stay with F5. Unity-only; compile-checked by reading. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
79 lines
4.2 KiB
C#
79 lines
4.2 KiB
C#
using System;
|
|
using System.Collections;
|
|
using System.Collections.Generic;
|
|
using UniRx;
|
|
using CultMath;
|
|
using CultMath.UnityBridge;
|
|
using UnityEngine;
|
|
using static CultMath.math;
|
|
|
|
public class GuidedProjectileManager : InstantWeaponEffectManager
|
|
{
|
|
// Presentation follows the committed shot (FireControl): the round retargets to the burst point the commit
|
|
// names and bursts when the shot resolves, rather than predicting either from its own homing.
|
|
private static void Bind(GuidedProjectile p, Zone zone, int shotId)
|
|
{
|
|
Vector3 At(ShotOutcome o) => new Vector3(o.BurstPoint.x, p.transform.position.y, o.BurstPoint.y);
|
|
var bindings = new CompositeDisposable();
|
|
zone.ShotCommitted.Where(o => o.ShotId == shotId && o.HasBurstPoint).Subscribe(o => p.BurstAt(At(o))).AddTo(bindings);
|
|
zone.ShotResolved.Where(o => o.ShotId == shotId).Subscribe(o => p.Resolve(o.HasBurstPoint ? At(o) : (Vector3?) null)).AddTo(bindings);
|
|
p.Binding = bindings;
|
|
}
|
|
|
|
public Prototype ProjectilePrototype;
|
|
|
|
public Subject<(Entity source, Transform target, GuidedProjectile missile)> OnFireGuided = new Subject<(Entity source, Transform target, GuidedProjectile missile)>();
|
|
|
|
public override void Fire(InstantWeapon weapon, EquippedItem item, EntityInstance source, EntityInstance target, int shotId)
|
|
{
|
|
if(weapon.Data is LauncherData launcher)
|
|
{
|
|
// A round the simulation fired at no target (FireControl.Fire: a fused round with no valid targeting
|
|
// data, or out of arc) flies to the point it bursts at; one with no target and no burst is not a shot.
|
|
PendingShot shot = default;
|
|
if (target == null && !(source.Entity.Zone.TryGetShot(shotId, out shot) && shot.Fuse != null)) return;
|
|
var burst = shot.BurstPosition.ToUnity();
|
|
var p = ProjectilePrototype.Instantiate<GuidedProjectile>();
|
|
p.ShotId = shotId;
|
|
p.Source = source.transform;
|
|
p.SourceEntity = source.Entity;
|
|
if (target != null) p.Target = target.transform;
|
|
else p.TargetPosition = () => burst;
|
|
p.Frequency = launcher.DodgeFrequency;
|
|
var hp = source.Entity.Hardpoints[item.Position.x, item.Position.y];
|
|
var barrel = source.GetBarrel(hp);
|
|
p.StartPosition = (p.transform.position = barrel.position).ToCultMath();
|
|
p.Range = weapon.Range;
|
|
p.GuidanceCurve = launcher.GuidanceCurve.ToCurve();
|
|
p.LiftCurve = launcher.LiftCurve.ToCurve();
|
|
p.ThrustCurve = launcher.ThrustCurve.ToCurve();
|
|
p.Velocity = barrel.forward * weapon.Velocity;
|
|
p.Thrust = item.Evaluate(launcher.Thrust);
|
|
p.TopSpeed = item.Evaluate(launcher.MissileVelocity);
|
|
Bind(p, source.Entity.Zone, shotId);
|
|
// A round with no target (a fused round fired at none) has no transform to hand a listener.
|
|
OnFireGuided.OnNext((source.Entity, target != null ? target.transform : null, p));
|
|
}
|
|
else if(weapon.Data is GuidedWeaponData guidance)
|
|
{
|
|
var p = ProjectilePrototype.Instantiate<GuidedProjectile>();
|
|
p.ShotId = shotId;
|
|
p.Source = source.transform;
|
|
p.SourceEntity = source.Entity;
|
|
p.Frequency = guidance.DodgeFrequency;
|
|
var hp = source.Entity.Hardpoints[item.Position.x, item.Position.y];
|
|
var barrel = source.GetBarrel(hp);
|
|
p.StartPosition = (p.transform.position = barrel.position).ToCultMath();
|
|
p.Range = weapon.Range;
|
|
p.GuidanceCurve = guidance.GuidanceCurve.ToCurve();
|
|
p.LiftCurve = guidance.LiftCurve.ToCurve();
|
|
p.ThrustCurve = guidance.ThrustCurve.ToCurve();
|
|
p.Velocity = barrel.forward * weapon.Velocity;
|
|
p.Thrust = item.Evaluate(guidance.Thrust);
|
|
p.TopSpeed = item.Evaluate(guidance.MissileVelocity);
|
|
p.TargetPosition = () => (source.Entity.Position + length(source.LookAtPoint.position.ToCultMath() - source.Entity.Position) * source.Entity.LookDirection).ToUnity();
|
|
Bind(p, source.Entity.Zone, shotId);
|
|
}
|
|
else Debug.LogError($"Weapon {item.Data.Name} linked to {name} effect, but is not a Launcher!");
|
|
}
|
|
}
|