Skip to content

Fix #175: Add Ghost Collidable check (& some properties) #177

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
unknownersamli wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix #175: Add Ghost Collidable check (& some properties) #177

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e510adb
Fix #175: simply add Ghost colliding logic
unknownersamli Jun 21, 2025
2dd1703
Add new property to describe the Ghost whether it is grabable
Jun 24, 2025
ac1be20
Change Collidable logic again or you cant stamp on Ghost while it is …
Jun 25, 2025
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
14 changes: 9 additions & 5 deletions CelesteNet.Client/Entities/Ghost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ public class Ghost : Actor, ITickReceiver {
public Holdable Holdable;
private bool HoldableAdded;

public bool MutualInteractable => CelesteNetClientModule.Session.UseInteractions && Interactive;
public bool Grabable => IdleTag == null && MutualInteractable;

public GhostNameTag? NameTag;
public GhostEmote? IdleTag;

Expand Down Expand Up @@ -80,7 +83,7 @@ public Ghost(CelesteNetClientContext? context, DataPlayerInfo playerInfo, Player
OnRelease = OnRelease
};

Collidable = true;
Collidable = MutualInteractable;
Collider = new Hitbox(8f, 11f, -4f, -11f);
Add(new PlayerCollider(OnPlayer));

Expand Down Expand Up @@ -115,7 +118,7 @@ public void OnPickup() {
}

public void OnPlayer(Player player) {
if (!Interactive || GrabCooldown > 0f || !CelesteNetClientModule.Session.UseInteractions || Context?.Main.GrabbedBy == this)
if (!MutualInteractable || GrabCooldown > 0f || Context?.Main.GrabbedBy == this)
return;

if (player.StateMachine.State == Player.StNormal &&
Expand All @@ -137,7 +140,7 @@ public void OnPlayer(Player player) {
}

public void OnCarry(Vector2 position) {
if (!Interactive || GrabCooldown > 0f || !CelesteNetClientModule.Session.UseInteractions || IdleTag != null)
if (!Grabable || GrabCooldown > 0f)
return;

Position = position;
Expand All @@ -159,7 +162,7 @@ public void OnCarry(Vector2 position) {
public void OnRelease(Vector2 force) {
Collidable = true;

if (!Interactive || GrabCooldown > 0f || !CelesteNetClientModule.Session.UseInteractions || IdleTag != null)
if (!Grabable || GrabCooldown > 0f)
return;

CelesteNetClient? client = Context?.Client;
Expand Down Expand Up @@ -189,7 +192,8 @@ public override void Update() {
return;
}

bool holdable = Interactive && GrabCooldown <= 0f && CelesteNetClientModule.Session.UseInteractions && IdleTag == null;
bool holdable = Grabable && GrabCooldown <= 0f;
Collidable = Holdable.Holder == null && MutualInteractable; //Not sure it is save or not

GrabCooldown -= Engine.RawDeltaTime;
if (GrabCooldown < 0f)
Expand Down