Kalospacer/ArachnaeSwarm
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

暂存

Browse Source
This commit is contained in:
ProjectKoi-Kalo\Kalo
2025-09-07 18:10:03 +08:00
parent b28594c604
commit acfc078f91
5 changed files with 62 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
1.6/1.6/Assemblies/ArachnaeSwarm.dll
View File

Binary file not shown.

5
1.6/1.6/Defs/AbilityDefs/Abilities_TrackingCharge.xml
View File

@@ -39,10 +39,13 @@
<inertiaDistance>6</inertiaDistance>
<collisionDamageDef>Blunt</collisionDamageDef>
<flyerDef>ARA_Flyer_TrackingCharge</flyerDef>
<maxFlightTicks>600</maxFlightTicks> <!-- 7.5 seconds timeout -->
<collisionRadius>2.5</collisionRadius> <!-- Larger collision radius -->
<impactSound>Pawn_Melee_BigBash_HitPawn</impactSound>
</li>
<li Class="CompProperties_AbilityEffecterOnCaster">
<effecterDef>WarTrumpet</effecterDef>
<maintainTicks>20</maintainTicks> <!-- Long enough for the "2nd wave" to spawn -->
</li>
</comps>
</AbilityDef>

2
Source/ArachnaeSwarm/Abilities/CompProperties_TrackingCharge.cs
View File

@@ -11,10 +11,8 @@ namespace ArachnaeSwarm
public float inertiaDistance = 3f;
public DamageDef collisionDamageDef;
public ThingDef flyerDef;
public int maxFlightTicks = 300; // Default 5 seconds timeout
public float collisionRadius = 1.5f;
public SoundDef impactSound;
public CompProperties_TrackingCharge()
{
this.compClass = typeof(CompAbilityEffect_TrackingCharge);

113
Source/ArachnaeSwarm/Abilities/PawnFlyer_TrackingCharge.cs
View File

@@ -23,12 +23,9 @@ namespace ArachnaeSwarm
public SoundDef impactSound;
// --- Internal state ---
private Vector3 currentSpeed;
private float distanceTraveled = 0f;
private bool homing = true;
private int inertiaTicks = -1;
private Vector3 exactPosition;
private bool hasHitPrimaryTarget = false;
private Vector3 exactPosition;
// --- Reflection Fields ---
private static FieldInfo TicksFlyingInfo;
@@ -83,88 +80,76 @@ namespace ArachnaeSwarm
protected override void Tick()
{
int ticksFlying = (int)TicksFlyingInfo.GetValue(this);
// --- THE CORRECT APPROACH ---
// Let the base class handle all flight mechanics (position, timing, etc.)
// We only intervene to do two things:
// 1. Continuously update the destination to "steer" the flyer.
// 2. Perform our own collision check.
if (ticksFlying == 0)
{
Vector3 startVec = (Vector3)StartVecInfo.GetValue(this);
IntVec3 destCell = (IntVec3)DestCellInfo.GetValue(this);
Vector3 destinationPos = GenThing.TrueCenter(destCell, Rot4.North, this.FlyingThing.def.size, this.def.Altitude);
Vector3 direction = (destinationPos - startVec).normalized;
this.currentSpeed = direction * this.def.pawnFlyer.flightSpeed;
}
this.exactPosition += this.currentSpeed;
this.distanceTraveled += this.currentSpeed.magnitude;
if (inertiaTicks > 0)
{
inertiaTicks--;
if (inertiaTicks <= 0) { Land(); return; }
}
else
{
if (homing && primaryTarget.HasThing && primaryTarget.Thing.Spawned)
{
Vector3 desiredDirection = (primaryTarget.Thing.DrawPos - this.exactPosition).normalized;
this.currentSpeed = Vector3.RotateTowards(this.currentSpeed, desiredDirection, this.homingSpeed * 0.017f, 999f).normalized * this.def.pawnFlyer.flightSpeed;
}
else
{
homing = false;
// Steer the flyer by constantly updating its destination cell.
DestCellInfo.SetValue(this, primaryTarget.Thing.Position);
}
float calculatedDamage = this.initialDamage + (this.distanceTraveled * this.damagePerTile);
var dinfo = new DamageInfo(this.collisionDamageDef, calculatedDamage, 1f, -1, this.FlyingPawn);
if (!hasHitPrimaryTarget && homing && primaryTarget.HasThing && primaryTarget.Thing.Spawned && (this.exactPosition - primaryTarget.Thing.DrawPos).sqrMagnitude < this.collisionRadius * this.collisionRadius)
// Perform our custom collision check.
if (!hasHitPrimaryTarget && primaryTarget.HasThing && primaryTarget.Thing.Spawned)
{
// Use DrawPos for accurate distance checking, not Position.
if ((this.DrawPos - primaryTarget.Thing.DrawPos).sqrMagnitude < this.collisionRadius * this.collisionRadius)
{
// --- Impact! ---
if (this.impactSound != null)
{
SoundStarter.PlayOneShot(this.impactSound, new TargetInfo(this.exactPosition.ToIntVec3(), this.Map));
SoundStarter.PlayOneShot(this.impactSound, new TargetInfo(this.Position, this.Map));
}
hasHitPrimaryTarget = true; // Mark as hit to prevent re-triggering
// Calculate damage based on distance traveled so far.
// We need to get the distance from the base class now.
Vector3 startPosition = (Vector3)StartVecInfo.GetValue(this);
float distance = (this.DrawPos - startPosition).magnitude;
float calculatedDamage = this.initialDamage + (distance * this.damagePerTile);
var dinfo = new DamageInfo(this.collisionDamageDef, calculatedDamage, 1f, -1, this.FlyingPawn);
primaryTarget.Thing.TakeDamage(dinfo);
hasHitPrimaryTarget = true;
// Stop homing. The flyer will now continue to its last set destination.
homing = false;
this.inertiaTicks = (int)(this.inertiaDistance / this.currentSpeed.magnitude);
// To create the "inertia" effect, we now set the destination to be a point
// past the target.
Vector3 direction = (this.DrawPos - startPosition).normalized;
IntVec3 inertiaEndPos = (this.DrawPos + (direction * this.inertiaDistance)).ToIntVec3();
DestCellInfo.SetValue(this, inertiaEndPos);
}
}
foreach (var thing in GenRadial.RadialDistinctThingsAround(this.exactPosition.ToIntVec3(), this.Map, 1.0f, false))
// --- AOE Damage Logic ---
// Damage other hostiles in the path.
float aoeDamage = this.initialDamage + (((Vector3)StartVecInfo.GetValue(this) - this.DrawPos).magnitude * this.damagePerTile);
var aoeDinfo = new DamageInfo(this.collisionDamageDef, aoeDamage, 1f, -1, this.FlyingPawn);
foreach (var thing in GenRadial.RadialDistinctThingsAround(this.Position, this.Map, 1.0f, false))
{
// Avoid damaging self or the primary target (which is handled above)
if (thing == this.FlyingPawn || thing == this || (hasHitPrimaryTarget && thing == primaryTarget.Thing)) continue;
if (thing is Pawn pawn && !pawn.Downed && pawn.HostileTo(this.FlyingPawn)) pawn.TakeDamage(dinfo);
else if (thing.def.destroyable && thing.def.building != null) thing.TakeDamage(dinfo);
}
}
try
if (thing != this.FlyingPawn && thing != this && thing != primaryTarget.Thing)
{
// We still need to update the destination for the base flyer logic to work correctly
DestCellInfo.SetValue(this, this.exactPosition.ToIntVec3());
// --- FIX for infinite flight ---
// The old TicksFlightTimeInfo update logic is removed.
}
catch (System.Exception ex)
if (thing is Pawn pawn && !pawn.Downed && pawn.HostileTo(this.FlyingPawn))
{
Log.ErrorOnce($"Exception during reflection in PawnFlyer_TrackingCharge: {ex}", this.thingIDNumber);
pawn.TakeDamage(aoeDinfo);
}
TicksFlyingInfo.SetValue(this, ticksFlying + 1);
// --- RELIABLE TIMEOUT & BOUNDS CHECK ---
if (ticksFlying > this.maxFlightTicks || !this.exactPosition.ToIntVec3().InBounds(this.Map))
{
Land();
}
}
private void Land()
// Let the base class do its thing. This is crucial.
// It will handle the movement, timing, and eventual landing based on its calculated ticksFlightTime.
base.Tick();
}
protected override void RespawnPawn()
{
if (this.Destroyed) return;
// This is the correct place to call the base method.
// The base class's TickInterval will call this method before destroying the flyer.
base.RespawnPawn();
this.Destroy();
}
}
}

8
Source/ArachnaeSwarm/Abilities/Verb_CastAbilityTrackingCharge.cs
View File

@@ -46,7 +46,6 @@ namespace ArachnaeSwarm
trackingCharge.inertiaDistance = props.inertiaDistance;
trackingCharge.collisionDamageDef = props.collisionDamageDef;
trackingCharge.primaryTarget = this.currentTarget;
trackingCharge.maxFlightTicks = props.maxFlightTicks;
trackingCharge.collisionRadius = props.collisionRadius;
trackingCharge.impactSound = props.impactSound;
@@ -54,6 +53,13 @@ namespace ArachnaeSwarm
trackingCharge.StartFlight(this.CasterPawn, this.currentTarget.Cell);
GenSpawn.Spawn(trackingCharge, this.CasterPawn.Position, map); // Use the cached map
// --- FIX for Comp Effects ---
// --- The Standard Pattern to trigger Comps like EffecterOnCaster ---
// After our custom verb logic (spawning the flyer) is done,
// we call the ability's Activate method with invalid targets.
// This triggers the standard Comp cycle without re-casting the verb.
this.ability.Activate(LocalTargetInfo.Invalid, LocalTargetInfo.Invalid);
return true;
}
}