Death markers setting by OhmV-IR · Pull Request #2253 · SubnauticaNitrox/Nitrox

OhmV-IR · 2025-01-12T03:08:37Z

The death markers setting places beacons where players die so they can retrieve items or equipment that was left behind.
I have tested the PR in-game using 2 players, swim out a bit from the lifepod and use the kill command or suffocate, beacon should only appear for the dying player. Then when that player goes within 20m of the beacon or disconnects from the server the beacon should disappear. The beacon can also be hidden from the HUD through the PDA. Ready for CW reviews.

Closes

Closes Add optional DeathMarker #2155

Coding-Hen · 2025-01-12T09:03:50Z

I haven't tested this yet but a general question of does this still try and spawn a beacon even if the person is on land, if this is desired then does it spawn and roll around potentially not being in the correct place

NitroxServer/ConsoleCommands/SetDeathMarkersCommand.cs

NitroxClient/Communication/Packets/Processors/PlayerDeathProcessor.cs

NitroxClient/Communication/MultiplayerSession/ConnectionState/CommunicatingState.cs

OhmV-IR · 2025-01-12T21:52:06Z

Yeah so when it spawns on land it actually falls through the land to the water below. To combat this, I set the gravitational constant in the beacon's WorldForces component to 0 so gravity has no effect on it and added above-water drag because floating point error gave the object a tiny velocity in a random direction causing it to drag. it works on land now. Tested in-water again too

OhmV-IR · 2025-01-12T22:15:39Z

Instead of using beacons have just switched to using blank gameobjects and attaching the PingInstance component. tested IG again

NitroxClient/Communication/Packets/Processors/PlayerDeathProcessor.cs

NitroxClient/GameLogic/LocalPlayer.cs

NitroxPatcher/Patches/Dynamic/Player_OnKill_Patch.cs

NitroxServer/ConsoleCommands/SetDeathMarkersCommand.cs

Nitrox.Server.Subnautica/Models/Commands/SetDeathMarkersCommand.cs

NitroxServer/ConsoleCommands/SetDeathMarkersCommand.cs

Nitrox.Assets.Subnautica/LanguageFiles/en.json

NitroxClient/Communication/Packets/Processors/PlayerDeathProcessor.cs

NitroxClient/GameLogic/LocalPlayer.cs

NitroxClient/MonoBehaviours/Gui/InGame/DeathBeacon.cs

Nitrox.Server.Subnautica/Models/Commands/SetDeathMarkersCommand.cs

NitroxClient/MonoBehaviours/Gui/InGame/DeathBeacon.cs

NitroxClient/GameLogic/LocalPlayer.cs

Jannify · 2025-01-17T00:40:46Z

NitroxClient/MonoBehaviours/Gui/InGame/DeathBeacon.cs

+    }
+    private void CheckPlayerDistance()


This is still open

Jannify

LGTM CW

Coding-Hen

LGTM, it will be good to have a marker for ease of finding the body again

Coding-Hen · 2025-01-17T07:49:28Z

Might be good to squash down some of the commits where sensible

NitroxServer/Serialization/ServerConfig.cs

dartasen · 2025-01-25T14:26:38Z

@Coding-Hen Has this been tested IG ?

…acon spawns, beacon spawn code working

…riggers them)

…g on disconnect

Co-authored-by: Coding-Hen <8798074+Coding-Hen@users.noreply.github.com>

OhmV-IR · 2025-02-15T04:40:46Z

Rebased to solve merge conflicts

OhmV-IR · 2025-02-15T04:58:45Z

Updated this for new launcher and tested IG. Needs new CW reviews because some changes were made and its possible I goofed the rebase but I don't think I did

NitroxClient/MonoBehaviours/Gui/InGame/DeathBeacon.cs

NitroxClient/GameLogic/LocalPlayer.cs

OhmV-IR · 2025-02-19T04:01:58Z

Tested in-game on commit 99d9ce4 (Moved spawning of death beacon to PlayerDeath in PlayerDeathBroadcaster)

tornac1234

Apart from those changes, a test session revealed the PR to be working (so we'll be able to merge it after that)

NitroxClient/MonoBehaviours/Gui/InGame/DeathBeacon.cs

Nitrox.Model.Subnautica/Packets/DeathMarkersChanged.cs

NitroxServer/ConsoleCommands/SetDeathMarkersCommand.cs

Co-authored-by: rootcan <24827220+tornac1234@users.noreply.github.com>

…dUnofficial into DeathMarkers

Jannify

LGTM CW

tornac1234

Command class name is not the right one but it's fine ig

dartasen · 2025-12-22T20:15:15Z

Is it possible to please rebase this PR ? 🙏

OhmV-IR · 2025-12-24T12:10:28Z

made the merge but have not tested IG yet, gotta do that sometime

github-actions · 2025-12-24T12:11:07Z

Test Results

245 tests ±0 244 ✅ ±0 7s ⏱️ -1s
1 suites ±0 1 💤 ±0
1 files ±0 0 ❌ ±0

Results for commit 74a6a63. ± Comparison against base commit a565b16.

Coding-Hen reviewed Jan 12, 2025

View reviewed changes

OhmV-IR requested a review from Coding-Hen January 12, 2025 21:52

Jannify requested changes Jan 15, 2025

View reviewed changes

Jannify requested changes Jan 16, 2025

View reviewed changes

Jannify reviewed Jan 17, 2025

View reviewed changes

Jannify approved these changes Jan 17, 2025

View reviewed changes

Coding-Hen approved these changes Jan 17, 2025

View reviewed changes

NinjaPedroX reviewed Jan 17, 2025

View reviewed changes

NitroxServer/Serialization/ServerConfig.cs Outdated Show resolved Hide resolved

Coding-Hen approved these changes Jan 25, 2025

View reviewed changes

dartasen added the Area: user interface (game) Related to UI/UX in the game label Jan 26, 2025

OhmV-IR and others added 15 commits February 14, 2025 23:39

Added boilerplate for DeathMarkers setting

4f8d334

Create beacons on all clients

9c528c4

Fix syntax error

aa32a3d

Shift to using the existing PlayerDeathEvent packet to trigger the be…

bc433fe

…acon spawns, beacon spawn code working

Make death beacons player exclusive(only spawns for the player that t…

46618e4

…riggers them)

Disconnecting also despawns all active death beacons

887fc59

Fix death beacons getting synced to other players and not disappearin…

c309ada

…g on disconnect

Remove unnecessary logging

68a3130

Remove unnecessary method, various semantic updates to prep for PR

90822ec

Fixed a random import that was accidentally added

b12d092

Update NitroxServer/ConsoleCommands/SetDeathMarkersCommand.cs

c6ad6ef

Co-authored-by: Coding-Hen <8798074+Coding-Hen@users.noreply.github.com>

Fixed deathbeacons on land

54596ac

Switch to using blank gameobjects instead of actual beacons

30ab97a

Added missing using

c20ea8c

Removed unneeded changes

e231019

OhmV-IR added 2 commits February 14, 2025 23:40

Fixed add and sort usings, as well as added a whitespace

47c5829

set DeathMarkers setting to true by default

3b4f648

OhmV-IR force-pushed the DeathMarkers branch from f5c0e7e to 3b4f648 Compare February 15, 2025 04:40

Fix DeathMarkers for NitroxLauncher(tested in-game for this commit)

4f9fa44

Jannify requested changes Feb 19, 2025

View reviewed changes

NitroxClient/MonoBehaviours/Gui/InGame/DeathBeacon.cs Show resolved Hide resolved

NitroxClient/GameLogic/LocalPlayer.cs Outdated Show resolved Hide resolved

OhmV-IR added 2 commits February 18, 2025 22:43

Added missing namespace declaration

74beffe

Moved spawning of death beacon to PlayerDeath in PlayerDeathBroadcaster

99d9ce4

OhmV-IR requested a review from Jannify February 19, 2025 03:46

NikeLaosClericus mentioned this pull request Feb 23, 2025

Death markers NikeLaosClericus/Nitrox#3

Merged

tornac1234 requested changes Feb 24, 2025

View reviewed changes

OhmV-IR and others added 6 commits February 23, 2025 20:09

Update NitroxModel/Packets/DeathMarkersChanged.cs

870f6a6

Co-authored-by: rootcan <24827220+tornac1234@users.noreply.github.com>

Update NitroxServer/ConsoleCommands/SetDeathMarkersCommand.cs

a03e883

Co-authored-by: rootcan <24827220+tornac1234@users.noreply.github.com>

Add newline between namespace and class

120fa35

Merge branch 'DeathMarkers' of https://github.com/OhmV-IR/NitroxModde…

a52d626

…dUnofficial into DeathMarkers

Fix missing import

5262c91

change setdeathmarkers to deathmarkers cmd name

b63420f

OhmV-IR requested a review from tornac1234 February 27, 2025 03:17

Jannify approved these changes Mar 1, 2025

View reviewed changes

tornac1234 approved these changes Mar 1, 2025

View reviewed changes

tornac1234 added this to the 1.9 milestone Mar 11, 2025

Adrien Bourdeaux added 3 commits December 23, 2025 23:57

merge master

04bb00a

Merge branch 'master' into DeathMarkers

a3d305c

make it build

74a6a63

Measurity removed this from the 1.9 milestone Feb 16, 2026

Conversation

OhmV-IR commented Jan 12, 2025 • edited by Measurity Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Closes

Uh oh!

Coding-Hen commented Jan 12, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

OhmV-IR commented Jan 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

OhmV-IR commented Jan 12, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Jannify Jan 17, 2025

Choose a reason for hiding this comment

Uh oh!

Jannify left a comment

Choose a reason for hiding this comment

Uh oh!

Coding-Hen left a comment

Choose a reason for hiding this comment

Uh oh!

Coding-Hen commented Jan 17, 2025

Uh oh!

Uh oh!

dartasen commented Jan 25, 2025

Uh oh!

OhmV-IR commented Feb 15, 2025

Uh oh!

OhmV-IR commented Feb 15, 2025

Uh oh!

Uh oh!

Uh oh!

OhmV-IR commented Feb 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tornac1234 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Jannify left a comment

Choose a reason for hiding this comment

Uh oh!

tornac1234 left a comment

Choose a reason for hiding this comment

Uh oh!

dartasen commented Dec 22, 2025

Uh oh!

OhmV-IR commented Dec 24, 2025

Uh oh!

github-actions bot commented Dec 24, 2025

Test Results

Uh oh!

OhmV-IR commented Jan 12, 2025 •

edited by Measurity

Loading

OhmV-IR commented Jan 12, 2025 •

edited

Loading

OhmV-IR commented Feb 19, 2025 •

edited

Loading

tornac1234 left a comment •

edited

Loading