Skip to content

Refactor into ResetState, RemoveAllGhosts, use RemoveGhost, PR #29 changes #52

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

Open
RedFlames wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Refactor into ResetState, RemoveAllGhosts, use RemoveGhost, PR #29 changes #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4360535
Refactor things into ResetState, RemoveAllGhosts, use RemoveGhost more
RedFlames Oct 31, 2022
54c9035
VS loves adding useless 'using' statements... and added the NameTag c…
RedFlames Oct 31, 2022
05cd062
Fix double deaths
RedFlames Oct 31, 2022
e680209
Don't assign to Player outside of ResetState
RedFlames Oct 31, 2022
6f9e502
Make RemoveGhost return a bool if there was indeed a ghost to remove
RedFlames Nov 1, 2022
a3b716b
Revert argument name change here
RedFlames Nov 1, 2022
44be282
Add changes from PR #29 onto this refactor branch
RedFlames Nov 1, 2022
de9118a
Introduce flag for keeping ghosts on reset
RedFlames Nov 1, 2022
b855093
Prevent Ghosts from disappearing during death sequence - can't set Pl…
RedFlames Nov 1, 2022
6a4ae7a
Move the respawn logic checks for the keepGhosts & PlayerBody conditi…
RedFlames Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 58 additions & 60 deletions CelesteNet.Client/Components/CelesteNetMainComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,9 @@ protected override void Dispose(bool disposing) {
}

public void Cleanup() {
Player = null;
PlayerBody = null;
Session = null;
WasIdle = false;
WasInteractive = false;
ResetState();

foreach (Ghost ghost in Ghosts.Values)
ghost?.RemoveSelf();
Ghosts.Clear();
RemoveAllGhosts();

if (IsGrabbed && Player.StateMachine.State == Player.StFrozen)
Player.StateMachine.State = Player.StNormal;
Expand Down Expand Up @@ -169,8 +163,7 @@ public void Handle(CelesteNetConnection con, DataPlayerInfo player) {
return;

if (string.IsNullOrEmpty(player.DisplayName)) {
ghost.RunOnUpdate(ghost => ghost.NameTag.Name = "");
Ghosts.TryRemove(player.ID, out _);
RemoveGhost(player);
LastFrames.TryRemove(player.ID, out _);
Client.Data.FreeOrder<DataPlayerFrame>(player.ID);
return;
Expand All @@ -179,9 +172,7 @@ public void Handle(CelesteNetConnection con, DataPlayerInfo player) {

public void Handle(CelesteNetConnection con, DataChannelMove move) {
if (move.Player.ID == Client.PlayerInfo.ID) {
foreach (Ghost ghost in Ghosts.Values)
ghost?.RemoveSelf();
Ghosts.Clear();
RemoveAllGhosts();

// The server resends all bound data anyway.
foreach (DataPlayerInfo other in Client.Data.GetRefs<DataPlayerInfo>()) {
Expand All @@ -194,13 +185,9 @@ public void Handle(CelesteNetConnection con, DataChannelMove move) {
}

} else {
if (!Ghosts.TryGetValue(move.Player.ID, out Ghost ghost) ||
ghost == null)
if (!RemoveGhost(move.Player))
return;

ghost.RunOnUpdate(ghost => ghost.NameTag.Name = "");
Ghosts.TryRemove(move.Player.ID, out _);

foreach (DataType data in Client.Data.GetBoundRefs(move.Player))
if (data.TryGet(Client.Data, out MetaPlayerPrivateState state))
Client.Data.FreeBoundRef(data);
Expand All @@ -225,8 +212,7 @@ public void Handle(CelesteNetConnection con, DataPlayerState state) {

Session session = Session;
if (session != null && (state.SID != session.Area.SID || state.Mode != session.Area.Mode || state.Level == LevelDebugMap)) {
ghost.RunOnUpdate(ghost => ghost.NameTag.Name = "");
Ghosts.TryRemove(id, out _);
RemoveGhost(ghost.PlayerInfo);
return;
}

Expand All @@ -244,8 +230,11 @@ public void Handle(CelesteNetConnection con, DataPlayerGraphics graphics) {
}

Level level = PlayerBody?.Scene as Level;
if (ghost == null && !IsGhostOutside(Session, level, graphics.Player, out _))
if (ghost == null && !IsGhostOutside(Session, level, graphics.Player, out _)) {
ghost = CreateGhost(level, graphics.Player, graphics);
if (graphics.Player.ID == uint.MaxValue)
Logger.Log(LogLevel.WRN, "META", $"Handle graphics: Created ghost for ID uint.MaxValue ({graphics.Player.ID}) - should this be happening?");
}

if (ghost != null)
ghost.UpdateGraphics(graphics);
Expand Down Expand Up @@ -273,6 +262,8 @@ public void Handle(CelesteNetConnection con, DataPlayerFrame frame) {
if (!Client.Data.TryGetBoundRef<DataPlayerInfo, DataPlayerGraphics>(frame.Player, out DataPlayerGraphics graphics) || graphics == null)
return;
ghost = CreateGhost(level, frame.Player, graphics);
if (frame.Player.ID == uint.MaxValue)
Logger.Log(LogLevel.WRN, "META", $"Handle frame: Created ghost for ID uint.MaxValue ({frame.Player.ID}) - should this be happening?");
}

ghost.RunOnUpdate(ghost => {
Expand Down Expand Up @@ -596,17 +587,26 @@ protected Ghost CreateGhost(Level level, DataPlayerInfo player, DataPlayerGraphi
UnsupportedSpriteModes.Add(graphics.SpriteMode);
RunOnMainThread(() => {
level.Add(ghost);
level.OnEndOfFrame += () => ghost.Active = true;
ghost.UpdateGraphics(graphics);
});
ghost.UpdateGraphics(graphics);
}
return ghost;
}

protected void RemoveGhost(DataPlayerInfo info) {
Ghosts.TryRemove(info.ID, out Ghost ghost);
protected bool RemoveGhost(DataPlayerInfo player) {
if (!Ghosts.TryRemove(player.ID, out Ghost ghost))
return false;
ghost?.RunOnUpdate(g => g.NameTag.Name = "");
return true;
}

protected void RemoveAllGhosts() {
lock (Ghosts) {
foreach (Ghost ghost in Ghosts.Values)
ghost?.RemoveSelf();
Ghosts.Clear();
}
}

public void UpdateIdleTag(Entity target, ref GhostEmote idleTag, bool idle) {
Expand Down Expand Up @@ -672,16 +672,16 @@ public EventInstance PlayAudio(Ghost ghost, string sound, Vector2? at, string pa
public override void Update(GameTime gameTime) {
base.Update(gameTime);

foreach (Ghost g in Ghosts.Values)
if (g != null)
g.Active = true;

bool ready = Client != null && Client.IsReady && Client.PlayerInfo != null;
if (Engine.Scene is not Level level || !ready) {
GrabbedBy = null;

if (ready && Engine.Scene is MapEditor) {
Player = null;
PlayerBody = null;
Session = null;
WasIdle = false;
WasInteractive = false;
ResetState();
AreaKey area = (AreaKey) f_MapEditor_area.GetValue(null);

if (MapEditorArea == null || MapEditorArea.Value.SID != area.SID || MapEditorArea.Value.Mode != area.Mode) {
Expand All @@ -691,11 +691,7 @@ public override void Update(GameTime gameTime) {
}

if (Player != null && MapEditorArea == null) {
Player = null;
PlayerBody = null;
Session = null;
WasIdle = false;
WasInteractive = false;
ResetState();
SendState();
}
return;
Expand Down Expand Up @@ -732,12 +728,9 @@ public override void Update(GameTime gameTime) {
}

if (Player == null || Player.Scene != level) {
Player = level.Tracker.GetEntity<Player>();
if (Player != null) {
PlayerBody = Player;
Session = level.Session;
WasIdle = false;
WasInteractive = false;
Player player = level.Tracker.GetEntity<Player>();
if (player != Player) {
ResetState(player, level.Session);
StateUpdated |= true;
SendGraphics();
}
Expand Down Expand Up @@ -807,24 +800,19 @@ public void OnSetActualDepth(On.Monocle.Scene.orig_SetActualDepth orig, Scene sc
public void OnLoadLevel(On.Celeste.Level.orig_LoadLevel orig, Level level, Player.IntroTypes playerIntro, bool isFromLoader = false) {
orig(level, playerIntro, isFromLoader);

Session = level.Session;
WasIdle = false;
WasInteractive = false;
Player player = null;

if (Client == null)
return;
if (Client != null)
player = level.Tracker.GetEntity<Player>();

Player = level.Tracker.GetEntity<Player>();
PlayerBody = Player;
ResetState(player, level.Session);

SendState();
if (Client != null)
SendState();
}

public void OnExitLevel(Level level, LevelExit exit, LevelExit.Mode mode, Session session, HiresSnow snow) {
Session = null;
WasIdle = false;
WasInteractive = false;

// the first thing Cleanup does is call ResetState.
Cleanup();

SendState();
Expand All @@ -842,17 +830,14 @@ private Player OnLoadNewPlayer(On.Celeste.Level.orig_LoadNewPlayer orig, Vector2
private void OnPlayerAdded(On.Celeste.Player.orig_Added orig, Player self, Scene scene) {
orig(self, scene);

Session = (scene as Level)?.Session;
WasIdle = false;
WasInteractive = false;
Player = self;
PlayerBody = self;

ResetState(self, (scene as Level)?.Session);
SendState();
SendGraphics();

foreach (DataPlayerFrame frame in LastFrames.Values.ToArray())
Handle(null, frame);
scene.OnEndOfFrame += () => {
foreach (DataPlayerFrame frame in LastFrames.Values.ToArray())
Handle(null, frame);
};
}

private PlayerDeadBody OnPlayerDie(On.Celeste.Player.orig_Die orig, Player self, Vector2 direction, bool evenIfInvincible, bool registerDeathInStats) {
Expand Down Expand Up @@ -918,6 +903,19 @@ private void ILTransitionRoutine(ILContext il) {

#endregion

public void ResetState(Player player = null, Session ses = null, bool keepGhosts = false) {
// Clear ghosts if the scene changed, but not on respawns
keepGhosts |= player == null && Player != null && Player.Scene == null;
if (!keepGhosts && player?.Scene != Player?.Scene)
RemoveAllGhosts();
Player = player;
// when keeping Ghosts we also need to keep PlayerBody apparently, because some Ghost logic uses PlayerBody.Scene as Level
if(!keepGhosts)
PlayerBody = player;
Session = ses;
WasIdle = false;
WasInteractive = false;
}

#region Send

Expand Down
2 changes: 1 addition & 1 deletion CelesteNet.Client/Entities/GhostNameTag.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public override void Render() {

float scale = level.GetScreenScale();

Vector2 pos = Tracking?.Position ?? Position;
Vector2 pos = Tracking?.BottomCenter ?? Position;
pos.Y -= 16f;

pos = level.WorldToScreen(pos);
Expand Down