teascade/skullball
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ball problem in a neater way

Browse Source
This commit is contained in:
Sofia 2026-07-27 01:41:03 +03:00
parent 463004639c
commit 6992bc5eff
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rust/src/map.rs
View File

@ -117,6 +117,7 @@ impl Map {
node.bind_mut().player_id = Some(player_id); node.bind_mut().player_id = Some(player_id);
node.bind_mut().player_name = player.name.clone(); node.bind_mut().player_name = player.name.clone();
node.bind_mut().player_color = player.color.clone().into(); node.bind_mut().player_color = player.color.clone().into();
node.bind_mut().replay_mode = true;
self.base_mut().add_child(&node); self.base_mut().add_child(&node);
node.bind_mut() node.bind_mut()

4
rust/src/player/local_player.rs
View File

@ -301,6 +301,10 @@ impl IPlayer for LocalPlayer {
fn get_camera_origin(&self) -> Option<Gd<Node3D>> { fn get_camera_origin(&self) -> Option<Gd<Node3D>> {
self.camera_origin.clone() self.camera_origin.clone()
} }
fn is_replay_mode(&self) -> bool {
false
}
} }
#[godot_api] #[godot_api]

3
rust/src/player/mod.rs
View File

@ -56,6 +56,7 @@ pub trait IPlayer {
fn take_weapon(&mut self) -> Option<DynGd<Node3D, dyn Weapon>>; fn take_weapon(&mut self) -> Option<DynGd<Node3D, dyn Weapon>>;
fn drop_ball(&mut self, with_velocity: bool) -> bool; fn drop_ball(&mut self, with_velocity: bool) -> bool;
fn get_camera_origin(&self) -> Option<Gd<Node3D>>; fn get_camera_origin(&self) -> Option<Gd<Node3D>>;
fn is_replay_mode(&self) -> bool;
} }
pub trait PlayerCommon { pub trait PlayerCommon {
@ -181,7 +182,7 @@ impl<T: IPlayer + ICharacterBody3D + WithBaseField> PlayerCommon for T {
return false; return false;
} }
if self.drop_ball(true) { if !self.is_replay_mode() && self.drop_ball(true) {
return true; return true;
} }

7
rust/src/player/remote_player.rs
View File

@ -48,6 +48,7 @@ pub struct RemotePlayer {
pub player_id: Option<u16>, pub player_id: Option<u16>,
pub player_name: String, pub player_name: String,
pub player_color: Color, pub player_color: Color,
pub replay_mode: bool,
movement_dir: Vector3, movement_dir: Vector3,
y_speed: f32, y_speed: f32,
@ -168,7 +169,9 @@ impl IPlayer for RemotePlayer {
} }
fn kill(&mut self, source: DamageSource) { fn kill(&mut self, source: DamageSource) {
if !self.replay_mode {
self.drop_ball(false); self.drop_ball(false);
}
let (signal, player, kind) = source.into_signal(); let (signal, player, kind) = source.into_signal();
self.run_deferred(move |s| s.signals().on_die().emit(signal, player, kind)); self.run_deferred(move |s| s.signals().on_die().emit(signal, player, kind));
@ -223,6 +226,10 @@ impl IPlayer for RemotePlayer {
fn get_camera_origin(&self) -> Option<Gd<Node3D>> { fn get_camera_origin(&self) -> Option<Gd<Node3D>> {
self.camera_origin.clone() self.camera_origin.clone()
} }
fn is_replay_mode(&self) -> bool {
self.replay_mode
}
} }
#[godot_api] #[godot_api]