Reloading dead keeps the DEATH popup, now a recorded deviation (#2445)

Reloading or reconnecting while dead and unreleased shows the DEATH popup, which 1.12.1 does not. Every UI start in the reference zeroes the release timer (`0x490131`), so `GetReleaseTimeRemaining` answers 0 (`0x4962a0`). A `/reload` also signals no `PLAYER_DEAD` (`0x490168`), so `UIParent.lua` shows no popup and the player is left with no Release button.

benilla keeps the popup on purpose. This change writes that down: two `Deviation:` lines name the reference facts and the reason. It also corrects two comments that said the reference keeps the timer across a reload. Behaviour is unchanged.

Fixes #2300

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Sam Sung
2026-10-26 07:26:55 +07:00
committed by GitHub
parent 016b18a972
commit a1f2f36c46
2 changed files with 16 additions and 7 deletions
+12 -5
View File
@@ -108,8 +108,8 @@ impl DeathNet {
}
}
/// The feed's memory in two scopes: the body's state survives a `/reload`, as the reference's
/// engine-side death mirror (`[0xb4e340]`) does, while what the VM was told dies with the VM.
/// The feed's memory in two scopes: the body's state and the release window's anchor survive a
/// `/reload`, while what the VM was told dies with the VM.
#[derive(Resource, Default)]
struct DeathFeedState {
/// World-scoped: the last `(guid, dead, ghost)` the self body showed.
@@ -123,6 +123,10 @@ struct DeathFeedState {
/// What the live VM has been told; a first snapshot counts as an edge, so logging in or
/// reloading dead brings the popup up.
///
/// Deviation: a `/reload` dead keeps the release window and signals `PLAYER_DEAD` again, where
/// the reference zeroes the timer at every UI start (`0x490131`) and its cascade never calls
/// `0x495850` (`0x490168`), because without both a player who reloads dead has no Release.
#[derive(Default)]
struct DeathAnnounced {
/// The last `(guid, dead, ghost)` this VM was given an event for.
@@ -199,8 +203,10 @@ impl DeathView<'_, '_> {
let release_remaining = match death_net.release {
ReleaseTimer::At(at) => Some((at - now).max(0.0) as f32),
ReleaseTimer::Off => None, // GetReleaseTimeRemaining() == -1, the no-timer DEATH text
// No death this session armed it (dead at login): the window from the first sight
// of the body dead, while the bit is set.
// Deviation: with no death this session to arm it (dead at login or after a
// `/reload`), the window runs from the first sight of the body dead, while the bit is
// set. The reference zeroes the timer at every UI start (`0x490131`) and answers 0
// (`0x4962a0`), so its DEATH popup never shows and the player has no Release.
ReleaseTimer::Unset if store.0.player_release_timer_running() => {
died_at.map(|t| ((t + RELEASE_WINDOW_SECS - now).max(0.0)) as f32)
}
@@ -303,7 +309,8 @@ fn feed_death(
_ => {}
}
// ── The VM edges: a fresh VM's memo is empty, so reloading dead re-fires PLAYER_DEAD.
// ── The VM edges: a fresh VM's memo is empty, so reloading dead re-fires PLAYER_DEAD
// (the Deviation on `DeathAnnounced`).
let memo = feed.vm.get(script);
let prev = memo.last.filter(|&(g, ..)| g == guid);
memo.last = Some((guid, dead, ghost));
+4 -2
View File
@@ -29,7 +29,7 @@ A setting boots at the reference's default unless it is listed here (`docs/METHO
Each entry is the first sentence of a `Deviation:` comment, linking to where it lives.
- [benilla-app](#benilla-app): 243
- [benilla-app](#benilla-app): 245
- [benilla-assets](#benilla-assets): 6
- [benilla-blp](#benilla-blp): 1
- [benilla-formats](#benilla-formats): 22
@@ -128,7 +128,9 @@ Each entry is the first sentence of a `Deviation:` comment, linking to where it
#### death
- The minutes come from the server's table, not from spell 15007's `Spell.dbc` duration, because the aura the server applies is what the dialog must warn about. ([`src/death/mod.rs:529`](../crates/benilla-app/src/death/mod.rs#L529))
- A `/reload` dead keeps the release window and signals `PLAYER_DEAD` again, where the reference zeroes the timer at every UI start (`0x490131`) and its cascade never calls `0x495850` (`0x490168`), because without both a player who reloads dead has no Release. ([`src/death/mod.rs:127`](../crates/benilla-app/src/death/mod.rs#L127))
- With no death this session to arm it (dead at login or after a `/reload`), the window runs from the first sight of the body dead, while the bit is set. ([`src/death/mod.rs:206`](../crates/benilla-app/src/death/mod.rs#L206))
- The minutes come from the server's table, not from spell 15007's `Spell.dbc` duration, because the aura the server applies is what the dialog must warn about. ([`src/death/mod.rs:536`](../crates/benilla-app/src/death/mod.rs#L536))
#### entities