CREDITS.md

@@ -1,4 +0,0 @@
-- [Sound effects](Assets/Audio/Sfx/ZapSplat) from [zapsplat.com](https://www.zapsplat.com/)
-  - [LaserFast and LaserWithRecovery](godot/assets/)
-  - [Hit](godot/assets/Hit.mp3)
-- [Soldier model and rig](godot/RawAssets/Soldier/) by [Casti_131](https://opengameart.org/content/low-poly-soldier-with-weapons)

godot/scenes/lobby.tscn

@@ -1,6 +1,6 @@
 [gd_scene format=3 uid="uid://bwd6bj21x310s"]
 
-[ext_resource type="PackedScene" uid="uid://ccd0wj2usx5os" path="res://scenes/ui/lobby_player_listing.tscn" id="1_o1atq"]
+[ext_resource type="PackedScene" uid="uid://ccd0wj2usx5os" path="res://scenes/ui/player_listing.tscn" id="1_o1atq"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_1cgct"]
 font_size = 32

godot/scenes/player/local_player.tscn

@@ -57,14 +57,3 @@ offset_bottom = 11.5
 grow_horizontal = 2
 grow_vertical = 2
 horizontal_alignment = 1
-
-[node name="score_view" type="SimpleScoreView" parent="." unique_id=1128041371]
-anchors_preset = 5
-anchor_left = 0.5
-anchor_right = 0.5
-offset_left = -20.0
-offset_top = 18.0
-offset_right = 20.0
-offset_bottom = 58.0
-grow_horizontal = 2
-alignment = 1

godot/scenes/ui/player_listing.tscn

@@ -1,11 +1,11 @@
 [gd_scene format=3 uid="uid://ccd0wj2usx5os"]
 
-[node name="lobby_player_listing" type="LobbyPlayerListing" unique_id=887620055 node_paths=PackedStringArray("name_label", "ping_label", "ready_label", "team_dropdown")]
+[node name="player_listing" type="PlayerListing" unique_id=772938280 node_paths=PackedStringArray("name_label", "ping_label", "ready_label", "team_dropdown")]
 name_label = NodePath("name")
 ping_label = NodePath("ping")
 ready_label = NodePath("ready")
 team_dropdown = NodePath("option_button")
-offset_right = 673.0
+offset_right = 319.0
 offset_bottom = 23.0
 columns = 4
 

rust/src/game_manager.rs

@@ -252,8 +252,6 @@ impl Game {
     pub fn on_map_changed(id: u8);
     #[signal]
     pub fn options_changed();
-    #[signal]
-    pub fn on_goal();
 
     pub fn singleton() -> Option<Gd<Game>> {
         GameManager::singleton()
@@ -524,8 +522,7 @@ impl Game {
             self.goals
                 .insert(*team, self.goals.get(&team).copied().unwrap_or(0) + 1);
         }
-        self.run_deferred(move |s| {
-            s.signals().on_goal().emit();
+        self.run_deferred(move |_| {
             if let Some(peer) = &mut NetworkManager::singleton().bind_mut().peer {
                 if let PeerKind::Server(peer, _) = peer {
                     peer.broadcast_reliable(Package::Goal(teams));

rust/src/ui/lobby.rs

@@ -11,7 +11,7 @@ use godot::{
 use crate::{
     game_manager::{Game, GameManager, GameOption, GameOptionValue, GameOptions},
     net::network_manager::{NetworkManager, Package, PeerKind},
-    ui::lobby_player_listing::LobbyPlayerListing,
+    ui::player_listing::PlayerListing,
 };
 
 #[derive(GodotClass)]
@@ -239,7 +239,7 @@ impl LobbyPanel {
                     if let Some(prefab) = &self.player_listing_prefab {
                         for player in &game.bind().players {
                             if let Some(node) = prefab.instantiate() {
-                                let mut listing = node.cast::<LobbyPlayerListing>();
+                                let mut listing = node.cast::<PlayerListing>();
                                 listing.bind_mut().player_id = Some(player.id());
                                 listing.bind_mut().update_teams(game.bind().get_teams());
                                 listing.bind_mut().update();
@@ -250,7 +250,7 @@ impl LobbyPanel {
                 }
             } else {
                 for child in list.get_children().iter_shared() {
-                    let mut listing = child.cast::<LobbyPlayerListing>();
+                    let mut listing = child.cast::<PlayerListing>();
                     if let Some(game) = Game::singleton() {
                         listing.bind_mut().update_teams(game.bind().get_teams());
                     }

rust/src/ui/mod.rs

@@ -1,5 +1,4 @@
 pub mod cli;
 pub mod lobby;
-pub mod lobby_player_listing;
 pub mod net_stats;
-pub mod simple_score_view;
+pub mod player_listing;

rust/src/ui/player_listing.rs

@@ -11,7 +11,7 @@ use crate::{
 
 #[derive(GodotClass)]
 #[class(base=GridContainer, init)]
-pub struct LobbyPlayerListing {
+pub struct PlayerListing {
     #[export]
     pub name_label: Option<Gd<Label>>,
     #[export]
@@ -27,7 +27,7 @@ pub struct LobbyPlayerListing {
 }
 
 #[godot_api]
-impl IGridContainer for LobbyPlayerListing {
+impl IGridContainer for PlayerListing {
     fn ready(&mut self) {
         self.run_deferred(|s| {
             if let Some(game) = &mut Game::singleton() {
@@ -65,7 +65,7 @@ impl IGridContainer for LobbyPlayerListing {
     }
 }
 
-impl LobbyPlayerListing {
+impl PlayerListing {
     pub fn update_game_options(&mut self, opts: &GameOptions, self_id: Option<u16>) {
         let is_host = NetworkManager::singleton().bind().is_host();
 

rust/src/ui/simple_score_view.rs

@@ -1,55 +0,0 @@
-use std::collections::HashMap;
-
-use godot::{
-    classes::{HBoxContainer, IHBoxContainer, Label},
-    prelude::*,
-};
-
-use crate::game_manager::Game;
-
-#[derive(GodotClass)]
-#[class(base=HBoxContainer, init)]
-pub struct SimpleScoreView {
-    team_goals: HashMap<u8, Gd<Label>>,
-    base: Base<HBoxContainer>,
-}
-
-#[godot_api]
-impl IHBoxContainer for SimpleScoreView {
-    fn ready(&mut self) {
-        self.run_deferred(|s| {
-            if let Some(game) = Game::singleton() {
-                for (id, team) in game.bind().get_teams().iter_shared().enumerate() {
-                    let mut goals_label = Label::new_alloc();
-                    goals_label.set_modulate(team.bind().color);
-                    goals_label.set_text("0");
-                    if !s.team_goals.is_empty() {
-                        let mut dash = Label::new_alloc();
-                        dash.set_text(" - ");
-                        s.base_mut().add_child(&dash);
-                    }
-                    s.base_mut().add_child(&goals_label);
-                    s.team_goals.insert(id as u8, goals_label);
-                }
-
-                game.signals()
-                    .on_goal()
-                    .connect_other(s, |s| s.update_goals());
-            }
-        });
-    }
-}
-
-impl SimpleScoreView {
-    pub fn update_goals(&mut self) {
-        if let Some(game) = Game::singleton() {
-            for (id, _) in game.bind().get_teams().iter_shared().enumerate() {
-                if let Some(goals) = game.bind().goals.get(&(id as u8))
-                    && let Some(label) = self.team_goals.get_mut(&(id as u8))
-                {
-                    label.set_text(&goals.to_string());
-                }
-            }
-        }
-    }
-}