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

Rename Layer 5, Add Layer 7 as Moving Walls

Browse Source
This commit is contained in:
Sofia 2026-08-06 18:18:43 +03:00
parent aa30e21ad1
commit c866db3581
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
godot/project.godot
View File

@ -158,8 +158,9 @@ prev_spectator={
3d_physics/layer_2="Remote Player" 3d_physics/layer_2="Remote Player"
3d_physics/layer_3="Walls" 3d_physics/layer_3="Walls"
3d_physics/layer_4="Ball and Goals" 3d_physics/layer_4="Ball and Goals"
3d_physics/layer_5="I forget" 3d_physics/layer_5="Replay Players"
3d_physics/layer_6="Grate Walls" 3d_physics/layer_6="Grate Walls"
3d_physics/layer_7="Moving Walls"
[physics] [physics]

2
godot/scenes/misc/ball.tscn
View File

@ -31,7 +31,7 @@ stream_9/stream = ExtResource("10_p4exv")
[node name="ball" type="Ball" unique_id=816748600 node_paths=PackedStringArray("bounce_sfx")] [node name="ball" type="Ball" unique_id=816748600 node_paths=PackedStringArray("bounce_sfx")]
bounce_sfx = NodePath("bounce_sfx") bounce_sfx = NodePath("bounce_sfx")
collision_layer = 8 collision_layer = 8
collision_mask = 39 collision_mask = 103
contact_monitor = true contact_monitor = true
max_contacts_reported = 10 max_contacts_reported = 10

2
godot/scenes/player/local_player.tscn
View File

@ -45,7 +45,7 @@ punch_cooldown = 1.0
telegrenade_cooldown = NodePath("cooldown_icon") telegrenade_cooldown = NodePath("cooldown_icon")
telefrag_area_prefab = ExtResource("1_0yoer") telefrag_area_prefab = ExtResource("1_0yoer")
telegrenade_cd = 10.0 telegrenade_cd = 10.0
collision_mask = 36 collision_mask = 100
slide_on_ceiling = false slide_on_ceiling = false
floor_constant_speed = true floor_constant_speed = true

2
godot/scenes/player/remote_player.tscn
View File

@ -60,7 +60,7 @@ arrow = NodePath("arrow")
telefrag_area_prefab = ExtResource("1_8dfyr") telefrag_area_prefab = ExtResource("1_8dfyr")
telegrenade_cd = 10.0 telegrenade_cd = 10.0
collision_layer = 2 collision_layer = 2
collision_mask = 36 collision_mask = 100
slide_on_ceiling = false slide_on_ceiling = false
floor_constant_speed = true floor_constant_speed = true

8
rust/src/map/triggers.rs
View File

@ -115,21 +115,29 @@ impl Triggerable {
} }
} }
/// Returns true if this triggerable is active currently on the real running
/// version of the game.
#[func] #[func]
pub fn is_server_active(&self) -> bool { pub fn is_server_active(&self) -> bool {
self.active.is_some() self.active.is_some()
} }
/// Returns the amount of time this triggerable has been active on the real
/// running version of the game.
#[func] #[func]
pub fn server_active_for(&self) -> f64 { pub fn server_active_for(&self) -> f64 {
self.active_for self.active_for
} }
/// Returns true if this triggerable should be visibly active, whether it's
/// happening in a replay or the real game.
#[func] #[func]
pub fn is_active(&self) -> bool { pub fn is_active(&self) -> bool {
self.visual_active.is_some() self.visual_active.is_some()
} }
/// Returns the amount of time this triggerable has been visually active,
/// whether it's happening in replay or in the real game.
#[func] #[func]
pub fn active_for(&self) -> f64 { pub fn active_for(&self) -> f64 {
self.visual_active_for self.visual_active_for