Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix escape pod status on joining and repairing it #2257

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Fix escape pod status on joining and repairing it #2257

wants to merge 10 commits into from

Conversation

Jannify
Copy link
Member

@Jannify Jannify commented Jan 13, 2025 •
edited
Loading

No description provided.

dartasen
dartasen reviewed Jan 13, 2025
View reviewed changes
Copy link
Member

@dartasen dartasen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested IG, seems to work overall

Upon relog, escape pod will still show the black smoke effect for 4-5s

NitroxClient/GameLogic/Spawning/Metadata/Processor/EscapePodMetadataProcessor.cs Outdated Show resolved Hide resolved
@Jannify Jannify force-pushed the fixBrokenEscapePod branch from d076af6 to 834e8c0 Compare January 14, 2025 00:32
@Jannify Jannify marked this pull request as ready for review January 14, 2025 00:33
@Jannify
Copy link
Member Author

Jannify commented Jan 14, 2025

Ready for full review. Tested heavily ingame.

@dartasen dartasen added this to the 1.8 milestone Jan 15, 2025
@OhmV-IR OhmV-IR mentioned this pull request Jan 16, 2025
Open
Measurity
Measurity requested changes Jan 21, 2025
View reviewed changes
Copy link
Collaborator

@Measurity Measurity left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Radio is now always repaired when joining a new world.

NitroxClient/Debuggers/Drawer/Subnautica/UWEEventDrawer.cs

namespace NitroxClient.Debuggers.Drawer.Subnautica;

public class UWEEventDrawer : IDrawer<Event<float>>, IDrawer<Event<PowerRelay>>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be UweEventDrawer as it's 3+ letter acronym.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with this but I think we should be consistent. In this file we have GUI did we want to change that as well?

Copy link
Collaborator

@Measurity Measurity Jan 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we could, yes I think so. But that's a Unity type. Renaming external types would be too tedious for maintaining a naming convention imo.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kept the naming from the namspace uwe gave us. There it is ALl uppercase.

tornac1234
tornac1234 requested changes Jan 22, 2025
View reviewed changes
NitroxClient/GameLogic/InitialSync/PlayerPositionInitialSyncProcessor.cs Outdated Show resolved Hide resolved
NitroxClient/GameLogic/Spawning/Metadata/Processor/EscapePodMetadataProcessor.cs Outdated Show resolved Hide resolved
NitroxModel/DataStructures/GameLogic/Entities/Metadata/EscapePodMetadata.cs Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/EscapePod_Awake_Patch.cs
@@ -10,6 +10,6 @@ public sealed partial class EscapePod_Awake_Patch : NitroxPatch, IDynamicPatch

public static bool Prefix(EscapePod __instance)
{
return !EscapePodWorldEntitySpawner.SURPRESS_ESCAPE_POD_AWAKE_METHOD;
return !EscapePodWorldEntitySpawner.SuppressEscapePodAwakeMethod;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we actually never running Awake on EscapePod even once ? It seems like it's important because it sets EscapePod.main which is used later on

NitroxPatcher/Patches/Dynamic/EscapePod_OnRepair_Patch.cs Outdated Show resolved Hide resolved
NitroxPatcher/Patches/Dynamic/Radio_OnRepair_Patch.cs Outdated Show resolved Hide resolved
@Jannify Jannify force-pushed the fixBrokenEscapePod branch from 80f3f10 to 9bae0b7 Compare January 23, 2025 01:33
@dartasen
Copy link
Member

Can you please rebase the branch

Noticed few things while testing In Game :

  • When joining server, I can see the "Press any button blabla" right before being able to move (Tested with debug build with a fresh survival world).
    As it's not mentionned in the PR description, I don't know if it's intentional or not
    image

  • On a fresh new world, repairing the escape pod will also repair the radio for the server (will take effect upon relog). Or the radio spawns will full health already, that will cause the extractor to mention it's repaired
    Before repairing escape pod only :
    image

After repairing escape pod ONLY :
image

@dartasen dartasen marked this pull request as draft January 26, 2025 11:59
@dartasen dartasen added the Area: persistence Related to serialization for long term storage (i.e. files and databases) label Jan 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dartasen dartasen dartasen left review comments

@Coding-Hen Coding-Hen Coding-Hen left review comments

@Measurity Measurity Measurity requested changes

@tornac1234 tornac1234 tornac1234 requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Area: persistence Related to serialization for long term storage (i.e. files and databases)
Projects
None yet
Milestone
1.8
Development

Successfully merging this pull request may close these issues.
5 participants
@Jannify @dartasen @Measurity @Coding-Hen @tornac1234