kronic/Project-M
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

G6+G4: Cone damage-at-contact + zone fill telegraph (ZoneEffect GhostFields) + co-op saturation budget

Browse Source 
Cone/SpecialSlam damage lands at its visual contact via ConeContactPending (knob 32, 0=legacy;
early-flush + resolve re-validate; death + BOTH class-swap paths drop armed pendings — fixes the
shipped melee death-strand in the same stroke). Zones: [GhostField] Caster/Radius/NextTick +
ZoneTelegraphSystem (Geyser latch contract on InterpolationTick; rim = true radius; arm grows,
persistent phase drains). Cone cues latch to contact (FireStartRaw, C14); TuningConfig.Defaults()
fallback at client cue sites (release-build timing fix). G4: SaturationMath ally-FX degrade
(living-enemy census, solo-exempt; enemy telegraphs structurally exempt) + CombatStressDebug +
overlay saturation rows. Reviews wf_98bf1268 (13 confirmed folded) / wf_9757d214 (5 confirmed fixed).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Luis Gonzalez
2026-07-21 13:27:50 -07:00
parent 9d6977cd64
commit 2aebc37115
25 changed files with 598 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/_Project/Scripts/Simulation/Debug/TuningConfig.cs
+13 -1
View File
@@ -53,6 +53,10 @@ namespace ProjectM.Simulation
public float MeleeBufferTicks;
/// <summary>Base contact delay (ticks from swing start to the blade landing; per-step via MeleeTiming). 0 = IMMEDIATE (legacy same-tick cleave).</summary>
public float MeleeContactTicks;
/// <summary>07-21 G6 (socket honesty): ticks from the Cone-socket fire tick to its damage landing (the
/// SpecialSlam visual contact). 0 = IMMEDIATE (legacy at-fire cleave). Keep &lt; CastFacingTicks (26) or a
/// resting gamepad stick resolves a movement-facing cone; default 21 sits 1 tick under WarriorCone cooldown 22.</summary>
public float ConeContactTicks;
// EB-1 fortress aggro: a <1 multiplier on a Husk's SQUARED distance to a structure (so structures are
// preferred targets); a closer player 'in the way' still wins. Read server-side by EnemyAISystem.
@@ -96,6 +100,7 @@ namespace ProjectM.Simulation
MeleeFinisherRangeMult = 1.25f, // 07-20 G2.2: finisher REACH (damage/recover/knockback keep MeleeFinisherMult)
MeleeBufferTicks = 10f, // 07-21 HEAVY LOCK: wider buffer fits the slower cadence (0 = off)
MeleeContactTicks = 20f, // 07-21 HEAVY LOCK: blade lands 20/12/25t per step -- clip speeds retuned to MATCH (wire tool 1.0/0.85/0.88; audit must show zero drift). Step-3 (25t) sits 1 tick under CastFacingTicks 26 -- do NOT raise without raising the cast window.
ConeContactTicks = 21f, // 07-21 G6: SpecialSlam contact ~0.35s after fire; keep < CastFacingTicks 26
StructureAggroWeight = 0.7f, // EB-1: <1 prefers structures (fortress aggro); live-tunable
StaggerKnockbackSpeed = 7f, // B2 poise: kb.Speed >= this interrupts windups/lunges; below = nudge only
SeparationMaxSpeed = 3f, // B1: max separation push (units/s) so soft-collision can't fling
@@ -130,6 +135,7 @@ namespace ProjectM.Simulation
case TuningKnob.MeleeFinisherRangeMult:
case TuningKnob.MeleeBufferTicks: // 07-20: 0 = buffer OFF sentinel (must survive ClampKnob — review C10)
case TuningKnob.MeleeContactTicks: // 07-20: 0 = IMMEDIATE sentinel (legacy same-tick cleave)
case TuningKnob.ConeContactTicks: // 07-21 G6: 0 = IMMEDIATE sentinel (legacy at-fire cone)
return math.max(0f, value);
// tick knobs: >= 1 (a 0 tick count is degenerate; a 0 i-frame window divides-by-zero in DashSystem).
// FinalSiegeMultiplier also lands here on purpose — a final siege should never be < 1x a normal one.
@@ -172,6 +178,7 @@ namespace ProjectM.Simulation
case TuningKnob.MeleeBufferTicks: c.MeleeBufferTicks = value; break;
case TuningKnob.MeleeFinisherRangeMult: c.MeleeFinisherRangeMult = value; break;
case TuningKnob.MeleeContactTicks: c.MeleeContactTicks = value; break;
case TuningKnob.ConeContactTicks: c.ConeContactTicks = value; break;
// unknown index -> no-op (matches the no-default switch convention in DebugCommandReceiveSystem)
}
@@ -210,6 +217,7 @@ namespace ProjectM.Simulation
case TuningKnob.MeleeBufferTicks: return c.MeleeBufferTicks;
case TuningKnob.MeleeFinisherRangeMult: return c.MeleeFinisherRangeMult;
case TuningKnob.MeleeContactTicks: return c.MeleeContactTicks;
case TuningKnob.ConeContactTicks: return c.ConeContactTicks;
default: return 0f;
}
@@ -246,6 +254,7 @@ namespace ProjectM.Simulation
MeleeBufferTicks = c.MeleeBufferTicks,
MeleeFinisherRangeMult = c.MeleeFinisherRangeMult,
MeleeContactTicks = c.MeleeContactTicks,
ConeContactTicks = c.ConeContactTicks,
};
@@ -280,6 +289,7 @@ namespace ProjectM.Simulation
MeleeBufferTicks = r.MeleeBufferTicks,
MeleeFinisherRangeMult = r.MeleeFinisherRangeMult,
MeleeContactTicks = r.MeleeContactTicks,
ConeContactTicks = r.ConeContactTicks,
};
}
@@ -318,9 +328,10 @@ namespace ProjectM.Simulation
public const byte MeleeBufferTicks = 29; // 07-20 G7 (0 = off sentinel)
public const byte MeleeFinisherRangeMult = 30; // 07-20 G2.2
public const byte MeleeContactTicks = 31; // 07-20 G2.1 (0 = immediate sentinel)
public const byte ConeContactTicks = 32; // 07-21 G6 (0 = immediate sentinel)
/// <summary>Knob count (overlay iteration bound).</summary>
public const byte Count = 32;
public const byte Count = 33;
}
/// <summary>
@@ -359,6 +370,7 @@ namespace ProjectM.Simulation
public float MeleeBufferTicks; // 07-20 melee feel forks (dev-protocol bump: rebuild both peers)
public float MeleeFinisherRangeMult;
public float MeleeContactTicks;
public float ConeContactTicks; // 07-21 G6 socket honesty (dev-protocol bump: rebuild both peers)
}
// NOTE: appending fields = a DEV-PROTOCOL BUMP (RpcCollection hash) — rebuild both peers together.