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

Compare commits

base: teascade:698c9067a7aa44ba6a88f833f0cb4480548aa893
Branches Tags
teascade:main
..
compare: teascade:3c0353c76eacefd1fe2f12f39170e5abd39c3df0
Branches Tags
teascade:main

No commits in common. "698c9067a7aa44ba6a88f833f0cb4480548aa893" and "3c0353c76eacefd1fe2f12f39170e5abd39c3df0" have entirely different histories.
698c9067a7 ... 3c0353c76e

7 changed files with 45 additions and 126 deletions
Show Stats Expand all files Collapse all files

2
godot/scenes/game_manager.tscn
View File

@ -3,5 +3,5 @@
[ext_resource type="MapResource" uid="uid://c7n1tacc7a73t" path="res://maps/default_map.tres" id="1_glms7"]
[node name="game_manager" type="GameManager" unique_id=1442044769]
respawn_timer = 10.0
respawn_timer = 5.0
maps = Array[MapResource]([ExtResource("1_glms7")])

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

@ -8,7 +8,7 @@ glow_enabled = true
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_oh8vq"]
[node name="player" type="LocalPlayer" unique_id=863055906 node_paths=PackedStringArray("camera", "soldier_mesh", "collider", "splorch", "dead_cam_target", "respawn_label")]
[node name="player" type="LocalPlayer" unique_id=863055906 node_paths=PackedStringArray("camera", "soldier_mesh", "collider", "splorch", "dead_cam_target")]
look_sensitivity = 1.5
camera = NodePath("camera_3d")
move_speed = 5.0
@ -16,7 +16,6 @@ soldier_mesh = NodePath("soldier_m")
collider = NodePath("collision_shape_3d2")
splorch = NodePath("splorch")
dead_cam_target = NodePath("dead_camera_target")
respawn_label = NodePath("respawn_label")
health = 100
collision_mask = 4
@ -38,17 +37,3 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.16157162, 1.4223524, 0)
[node name="dead_camera_target" type="Node3D" parent="." unique_id=559969559]
transform = Transform3D(1, 0, 0, 0, 0.9069022, 0.4213412, 0, -0.4213412, 0.9069022, 0, 2.3258846, 1.5254744)
[node name="respawn_label" type="Label" parent="." unique_id=595642200]
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -20.0
offset_top = -11.5
offset_right = 20.0
offset_bottom = 11.5
grow_horizontal = 2
grow_vertical = 2
horizontal_alignment = 1

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

@ -5,13 +5,12 @@
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_1cgct"]
[node name="player" type="RemotePlayer" unique_id=845968872 node_paths=PackedStringArray("soldier_mesh", "collider", "splorch", "spectator_camera")]
[node name="player" type="RemotePlayer" unique_id=845968872 node_paths=PackedStringArray("soldier_mesh", "collider", "splorch")]
move_speed = 5.0
soldier_mesh = NodePath("soldier_m")
collider = NodePath("collision_shape_3d")
splorch = NodePath("gpu_particles_3d")
health = 100
spectator_camera = NodePath("spectate_root/spectate_camera")
collision_layer = 2
collision_mask = 4
@ -24,9 +23,3 @@ shape = SubResource("CapsuleShape3D_1cgct")
[node name="gpu_particles_3d" parent="." unique_id=986677517 instance=ExtResource("2_orxjf")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4540546, 0)
[node name="spectate_root" type="Node3D" parent="." unique_id=624336254]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.7611488, 0)
[node name="spectate_camera" type="Camera3D" parent="spectate_root" unique_id=1408688016]
transform = Transform3D(1, 0, 0, 0, 0.89379096, 0.44848388, 0, -0.44848388, 0.89379096, 0, 0.6601318, 1.0407685)

31
rust/src/game_manager.rs
View File

@ -324,27 +324,23 @@ impl Game {
.bind_mut()
.signals()
.on_die()
.connect_other(self, move |s, spid| s.on_death(spid, id));
.connect_other(self, move |s| s.on_death(id));
local_player
.bind_mut()
.signals()
.on_take_damage()
.connect_other(self, move |s, spid, damage| {
s.on_take_damage(spid, id, damage)
});
.connect_other(self, move |s, damage| s.on_take_damage(id, damage));
} else if let Ok(mut remote_player) = character.clone().try_cast::<RemotePlayer>() {
remote_player
.bind_mut()
.signals()
.on_die()
.connect_other(self, move |s, spid| s.on_death(spid, id));
.connect_other(self, move |s| s.on_death(id));
remote_player
.bind_mut()
.signals()
.on_take_damage()
.connect_other(self, move |s, spid, damage| {
s.on_take_damage(spid, id, damage)
});
.connect_other(self, move |s, damage| s.on_take_damage(id, damage));
}
}
@ -438,39 +434,38 @@ impl Game {
}
// Handle taking damage, from server to client
pub fn handle_take_damage(&mut self, source_player_id: u16, player_id: u16, damage: i32) {
pub fn handle_take_damage(&mut self, player_id: u16, damage: i32) {
if let Some(player) = self.find_player_mut(player_id) {
if let Some(character) = &mut player.character {
character
.dyn_bind_mut()
.take_damage(source_player_id, damage, false);
character.dyn_bind_mut().take_damage(damage, false);
}
}
}
// Handle dying, from server to client
pub fn handle_kill(&mut self, source_player_id: u16, player_id: u16) {
pub fn handle_kill(&mut self, player_id: u16) {
if let Some(player) = self.find_player_mut(player_id) {
if let Some(character) = &mut player.character {
character.dyn_bind_mut().kill(source_player_id);
character.dyn_bind_mut().kill();
}
}
}
// Called whenever a player takes damage on the server-side
pub fn on_take_damage(&mut self, source_player_id: u16, target_player_id: u16, damage: i32) {
pub fn on_take_damage(&mut self, player_id: u16, damage: i32) {
if let Some(peer) = &mut NetworkManager::singleton().bind_mut().peer {
if let PeerKind::Server(peer, _) = peer {
peer.broadcast_reliable(TakeDamage(source_player_id, target_player_id, damage));
peer.broadcast_reliable(TakeDamage(player_id, damage));
}
}
}
// Called whenever a player dies on the server-side
pub fn on_death(&mut self, source_player_id: u16, target_player_id: u16) {
pub fn on_death(&mut self, player_id: u16) {
if let Some(peer) = &mut NetworkManager::singleton().bind_mut().peer {
if let PeerKind::Server(peer, _) = peer {
peer.broadcast_reliable(Kill(source_player_id, target_player_id));
godot_print!("Sent kill!");
peer.broadcast_reliable(Kill(player_id));
}
}
}

21
rust/src/net/network_manager.rs
View File

@ -238,23 +238,14 @@ impl INode for NetworkManager {
);
}
}
Package::TakeDamage(
source_player_id,
target_player_id,
damage,
) => {
Package::TakeDamage(player_id, damage) => {
if let Some(game) = &mut Game::singleton() {
game.bind_mut().handle_take_damage(
source_player_id,
target_player_id,
damage,
);
game.bind_mut().handle_take_damage(player_id, damage);
}
}
Package::Kill(source_player_id, target_player_id) => {
Package::Kill(player_id) => {
if let Some(game) = &mut Game::singleton() {
game.bind_mut()
.handle_kill(source_player_id, target_player_id);
game.bind_mut().handle_kill(player_id);
}
}
_ => {}
@ -560,8 +551,8 @@ pub enum Package {
SelfSync(SyncPackage),
Jump(u16),
Shoot(u16, NetVector3, NetPlayerTransform, f32),
TakeDamage(u16, u16, i32),
Kill(u16, u16),
TakeDamage(u16, i32),
Kill(u16),
}
#[derive(Debug, Clone, Serialize, Deserialize)]

85
rust/src/player.rs
View File

@ -3,8 +3,8 @@ use std::{f32::consts::PI, ops::Neg};
use godot::{
classes::{
AudioStreamPlayer3D, Camera3D, CharacterBody3D, CollisionShape3D, GpuParticles3D,
ICharacterBody3D, Input, InputEvent, InputEventMouseMotion, Label,
PhysicsRayQueryParameters3D, input::MouseMode,
ICharacterBody3D, Input, InputEvent, InputEventMouseMotion, PhysicsRayQueryParameters3D,
input::MouseMode,
},
obj::WithBaseField,
prelude::*,
@ -12,7 +12,6 @@ use godot::{
use serde::{Deserialize, Serialize};
use crate::{
game_manager::Game,
net::{
network_manager::{
NetworkManager,
@ -46,9 +45,9 @@ pub trait IPlayer {
fn get_transform(&self) -> NetPlayerTransform;
fn jump(&mut self);
fn try_shoot(&mut self, to: Vector3, deal_damage: bool) -> bool;
fn take_damage(&mut self, source_player: u16, damage: i32, kill: bool);
fn take_damage(&mut self, damage: i32, kill: bool);
fn is_dead(&self) -> bool;
fn kill(&mut self, source_player: u16);
fn kill(&mut self);
fn dead_for(&self) -> f64;
}
@ -98,8 +97,6 @@ pub struct LocalPlayer {
#[export]
dead_cam_target: Option<Gd<Node3D>>,
#[export]
respawn_label: Option<Gd<Label>>,
#[export]
health: i32,
pub player_id: Option<u16>,
@ -113,7 +110,6 @@ pub struct LocalPlayer {
is_dead: bool,
dead_for: f64,
killer_id: Option<u16>,
locked: bool,
@ -186,9 +182,7 @@ impl IPlayer for LocalPlayer {
if self.shoot_cd <= 0. {
let rid = self.base().get_rid();
if let Some(weapon) = &mut self.weapon {
weapon
.dyn_bind_mut()
.shoot(rid, self.player_id.unwrap_or(0), to, deal_damage);
weapon.dyn_bind_mut().shoot(rid, to, deal_damage);
}
self.shoot_cd = 0.2;
true
@ -197,11 +191,11 @@ impl IPlayer for LocalPlayer {
}
}
fn take_damage(&mut self, source_player: u16, damage: i32, kill: bool) {
self.run_deferred(move |s| s.signals().on_take_damage().emit(source_player, damage));
fn take_damage(&mut self, damage: i32, kill: bool) {
self.run_deferred(move |s| s.signals().on_take_damage().emit(damage));
self.health -= damage;
if kill && self.health <= 0 {
self.kill(source_player);
self.kill();
}
}
@ -213,8 +207,8 @@ impl IPlayer for LocalPlayer {
self.dead_for
}
fn kill(&mut self, source_player: u16) {
self.run_deferred(move |s| s.signals().on_die().emit(source_player));
fn kill(&mut self) {
self.run_deferred(move |s| s.signals().on_die().emit());
if let Some(mut mesh) = self.soldier_mesh.take() {
mesh.queue_free();
}
@ -228,7 +222,6 @@ impl IPlayer for LocalPlayer {
splorch.set_emitting(true);
}
self.is_dead = true;
self.killer_id = Some(source_player);
}
}
@ -253,45 +246,11 @@ impl ICharacterBody3D for LocalPlayer {
if let Some(mesh) = &mut self.soldier_mesh {
self.weapon = mesh.bind_mut().spawn_raygun();
}
if let Some(camera) = &mut self.camera {
camera.set_current(true);
}
}
fn process(&mut self, delta: f64) {
if self.is_dead {
self.dead_for += delta;
if let Some(label) = &mut self.respawn_label {
let respawn_timer = if let Some(game) = Game::singleton() {
game.bind().respawn_timer
} else {
0.
};
let time_remaining = respawn_timer - self.dead_for;
label.set_text(&format!("Respawn in\n{:.2}", time_remaining));
}
if let Some(camera) = &self.camera {
if camera.is_current() && self.dead_for > 3. {
if let Some(game) = Game::singleton()
&& let Some(killer_id) = self.killer_id
{
let game = game.bind();
let remote_player = game.find_player(killer_id);
if let Some(remote_player) = &remote_player
&& let Some(remote_character) = remote_player.character.clone()
&& let Ok(mut remote_character) =
remote_character.try_cast::<RemotePlayer>()
&& let Some(camera) = &mut remote_character.bind_mut().spectator_camera
{
camera.set_current(true);
}
}
}
}
}
self.shoot_cd -= delta;
@ -396,9 +355,9 @@ impl ICharacterBody3D for LocalPlayer {
#[godot_api]
impl LocalPlayer {
#[signal]
pub fn on_die(source_player: u16);
pub fn on_die();
#[signal]
pub fn on_take_damage(source_player: u16, damage: i32);
pub fn on_take_damage(damage: i32);
fn set_lock(&mut self, locked: bool) {
self.locked = locked;
@ -423,8 +382,6 @@ pub struct RemotePlayer {
splorch: Option<Gd<GpuParticles3D>>,
#[export]
health: i32,
#[export]
spectator_camera: Option<Gd<Camera3D>>,
pub player_id: Option<u16>,
pub weapon: Option<DynGd<Node3D, dyn Weapon>>,
@ -505,9 +462,7 @@ impl IPlayer for RemotePlayer {
if self.shoot_cd <= 0. {
let rid = self.base().get_rid();
if let Some(weapon) = &mut self.weapon {
weapon
.dyn_bind_mut()
.shoot(rid, self.player_id.unwrap_or(0), to, deal_damage);
weapon.dyn_bind_mut().shoot(rid, to, deal_damage);
}
self.shoot_cd = 0.2;
true
@ -516,11 +471,11 @@ impl IPlayer for RemotePlayer {
}
}
fn take_damage(&mut self, source_player: u16, damage: i32, kill: bool) {
self.run_deferred(move |s| s.signals().on_take_damage().emit(source_player, damage));
fn take_damage(&mut self, damage: i32, kill: bool) {
self.run_deferred(move |s| s.signals().on_take_damage().emit(damage));
self.health -= damage;
if kill && self.health <= 0 {
self.kill(source_player);
self.kill();
}
}
@ -532,8 +487,8 @@ impl IPlayer for RemotePlayer {
self.dead_for
}
fn kill(&mut self, source_player: u16) {
self.run_deferred(move |s| s.signals().on_die().emit(source_player));
fn kill(&mut self) {
self.run_deferred(move |s| s.signals().on_die().emit());
if let Some(mut mesh) = self.soldier_mesh.take() {
mesh.queue_free();
}
@ -579,7 +534,7 @@ impl ICharacterBody3D for RemotePlayer {
#[godot_api]
impl RemotePlayer {
#[signal]
pub fn on_die(source_player: u16);
pub fn on_die();
#[signal]
pub fn on_take_damage(source_player: u16, damage: i32);
pub fn on_take_damage(damage: i32);
}

6
rust/src/weapon.rs
View File

@ -6,7 +6,7 @@ use godot::{
use crate::{net::util::cast_ray, player::IPlayer};
pub trait Weapon {
fn shoot(&mut self, player_rid: Rid, player_id: u16, to: Vector3, deal_damage: bool);
fn shoot(&mut self, player: Rid, to: Vector3, deal_damage: bool);
}
#[derive(GodotClass)]
@ -24,7 +24,7 @@ pub struct Raygun {
#[godot_dyn]
impl Weapon for Raygun {
fn shoot(&mut self, player: Rid, player_id: u16, to: Vector3, deal_damage: bool) {
fn shoot(&mut self, player: Rid, to: Vector3, deal_damage: bool) {
if let Some(emitter) = &mut self.sound_emitter {
emitter.play();
}
@ -56,7 +56,7 @@ impl Weapon for Raygun {
if deal_damage && let Some(target) = target {
if let Ok(mut player) = target.collider.try_dynify::<dyn IPlayer>() {
player.dyn_bind_mut().take_damage(player_id, 100, true);
player.dyn_bind_mut().take_damage(100, true);
}
}
}