ba303e5fd0
- StructureCatalogAuthoring: WallCostOre -> WallCostBiomass (it bakes a Biomass cost; [FormerlySerializedAs] preserves the scene value). - Harvester/Fabricator authoring: resource-id byte defaults reference ResourceId.Ore/.Charge instead of magic 2/4. - RegionMath.RegionBoundaryX (= ExpeditionOffsetX*0.5) single-sources the region-flip X used by HudSystem + OnboardingSystem (was 500f in 3 places). - CharacterComponent.DefaultGroundedSharpness single-sources the CC sharpness 15f (GetDefault, DashSystem, PlayerDeathStateSystem, PlayerCharacterAuthoring). - InventorySlot [InternalBufferCapacity] references Tuning.InventoryMaxSlots. - ConnectionMode enum -> byte-const class (project convention; removes the latent enum-in-Burst trap); field + one Seed() param become byte. - Tuning.ChargerWindupTicks single-sources the Charger telegraph windup (EnemyBaker + TuningConfig.Defaults; was a bare 30 that could drift). - (TicksPerSecond deliberately NOT added: no seconds->ticks conversion site exists; the tick-count fields are per-authoring designer tunables, so a const would be unreferenced.) 451/451 EditMode tests pass. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
59 lines
3.2 KiB
C#
59 lines
3.2 KiB
C#
using Unity.Burst;
|
|
using Unity.Entities;
|
|
using Unity.Mathematics;
|
|
using Unity.NetCode;
|
|
|
|
namespace ProjectM.Simulation
|
|
{
|
|
/// <summary>
|
|
/// Derives the LOCAL enableable <see cref="Dead"/> gate from the replicated <see cref="Health"/> every predicted
|
|
/// tick (Dead == Health.Current <= 0). Runs in BOTH worlds inside
|
|
/// <see cref="PredictedSimulationSystemGroup"/>, BEFORE movement/aim/fire, so a dead player is excluded from
|
|
/// those systems (which query <c>.WithDisabled<Dead>()</c>) on the server AND the owner-predicting client.
|
|
/// Because it is a pure function of the already-replicated, reconciled Health (the same derive-don't-replicate
|
|
/// pattern as <see cref="StatRecomputeSystem"/>), the gate is identical across server, owner-client, and rollback
|
|
/// — no replicated enabled bit required. Also zeroes <see cref="CharacterControl.MoveVelocity"/> while dead so
|
|
/// the kinematic character holds still (the movement system is skipped and would otherwise coast on stale
|
|
/// velocity). The authoritative recovery (Health refill + reposition) is owned server-side by
|
|
/// <c>PlayerRespawnSystem</c>. Visits dead players too via <c>.WithPresent<Dead>()</c> (required to write
|
|
/// the enabled bit on an entity whose Dead is currently disabled).
|
|
/// </summary>
|
|
[UpdateInGroup(typeof(PredictedSimulationSystemGroup))]
|
|
[UpdateBefore(typeof(PlayerControlSystem))]
|
|
[UpdateBefore(typeof(PlayerAimSystem))]
|
|
[BurstCompile]
|
|
public partial struct PlayerDeathStateSystem : ISystem
|
|
{
|
|
[BurstCompile]
|
|
public void OnUpdate(ref SystemState state)
|
|
{
|
|
foreach (var (health, control, deadEnabled, entity) in
|
|
SystemAPI.Query<RefRO<Health>, RefRW<CharacterControl>, EnabledRefRW<Dead>>()
|
|
.WithAll<PlayerTag, Simulate>()
|
|
.WithPresent<Dead>()
|
|
.WithEntityAccess())
|
|
{
|
|
bool isDead = health.ValueRO.Current <= 0f;
|
|
deadEnabled.ValueRW = isDead;
|
|
if (isDead)
|
|
{
|
|
control.ValueRW.MoveVelocity = float3.zero;
|
|
// MC-1: clear any in-flight dash window + restore base sharpness so a death mid-dash leaves
|
|
// no stale i-frames / stuck-fast on respawn (DashSystem skips dead players via .WithDisabled<Dead>()).
|
|
if (SystemAPI.HasComponent<DashState>(entity))
|
|
SystemAPI.SetComponent(entity, default(DashState));
|
|
// MC-4: clear any in-flight combo so a death mid-combo leaves no stale lock/step on respawn.
|
|
if (SystemAPI.HasComponent<MeleeCombo>(entity))
|
|
SystemAPI.SetComponent(entity, default(MeleeCombo));
|
|
if (SystemAPI.HasComponent<CharacterComponent>(entity))
|
|
{
|
|
var cc = SystemAPI.GetComponent<CharacterComponent>(entity);
|
|
cc.GroundedMovementSharpness = CharacterComponent.DefaultGroundedSharpness;
|
|
SystemAPI.SetComponent(entity, cc);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|