rust/src/game_manager.rs

@@ -24,8 +24,12 @@ use crate::{
     },
     pickup::PickupKind,
     player::{
-        DamageSource, IPlayer, NetTransform, ball::Ball, local_player::LocalPlayer,
-        remote_player::RemotePlayer, telegrenade::Telegrenade, weapon::WeaponType,
+        DamageSource, IPlayer, NetTransform,
+        ball::Ball,
+        local_player::LocalPlayer,
+        remote_player::RemotePlayer,
+        telegrenade::{self, Telegrenade},
+        weapon::WeaponType,
     },
     replay::{ReplayEvent, ReplayPlayback, ReplayRecorder},
     team_resource::TeamResource,

rust/src/game_settings.rs

@@ -25,7 +25,6 @@ pub const ANNOUNCER_BUS: &str = "Announcer";
 pub struct GameSettings {
     pub fov: f64,
     pub default_name: String,
-    pub replay_fps: u8,
     pub recent_servers: Vec<RecentServer>,
     pub volume: VolumeSettings,
     pub keybinds: KeybindSettings,
@@ -50,7 +49,6 @@ pub struct KeybindSettings {
     pub shoot: Keybind,
     pub melee: Keybind,
     pub jump: Keybind,
-    pub telegrenade: Keybind,
 }
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, PartialOrd)]
@@ -124,7 +122,6 @@ impl Default for GameSettings {
         Self {
             fov: 90.,
             default_name: "Default McGee".to_owned(),
-            replay_fps: 60,
             recent_servers: Vec::new(),
             volume: VolumeSettings {
                 master_volume: 100.,
@@ -142,7 +139,6 @@ impl Default for GameSettings {
                 shoot: Keybind::MouseButton(MouseButton::LEFT.to_godot()),
                 melee: Keybind::Key(Key::F.to_godot()),
                 jump: Keybind::Key(Key::SPACE.to_godot()),
-                telegrenade: Keybind::Key(Key::Q.to_godot()),
             },
         }
     }
@@ -192,7 +188,6 @@ impl GameSettingsManager {
         set_keybind("shoot", settings.keybinds.shoot);
         set_keybind("punch", settings.keybinds.melee);
         set_keybind("jump", settings.keybinds.jump);
-        set_keybind("throw_telegrenade", settings.keybinds.telegrenade);
 
         self.settings = settings;
         if let Some(mut file) = FileAccess::open("user://config.toml", ModeFlags::WRITE) {

rust/src/replay.rs

@@ -10,7 +10,6 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     game_manager::{Game, GameManager, Player},
-    game_settings::GameSettingsManager,
     map::Map,
     net::{network_manager::BallSync, util::NetVector3},
     pickup::{PickupKind, ReplayVisibility},
@@ -412,9 +411,7 @@ impl INode for ReplayRecorder {
         }
         self.time_elapsed += delta;
 
-        let fps = GameSettingsManager::singleton().bind().settings.replay_fps;
-
-        if self.time_elapsed > (self.current_frame.time + (1. / fps as f64)) {
+        if self.time_elapsed > (self.current_frame.time + (1. / 60.)) {
             self.replay.frames.push(self.current_frame.clone());
             self.current_frame = self.record_frame();
         }

rust/src/ui/main_menu.rs

@@ -1,15 +1,21 @@
+use std::io::Cursor;
+
 use godot::{
-    classes::{Button, Camera3D, FileDialog, Label, LineEdit, OptionButton, Panel, SpinBox},
+    classes::{
+        Button, Camera3D, FileAccess, FileDialog, Label, LineEdit, OptionButton, Panel, SpinBox,
+        file_access::ModeFlags,
+    },
     prelude::*,
     register::property::SimpleVar,
 };
 
 use crate::{
     bgm::{Music, MusicManager},
+    game_manager::GameManager,
     game_settings::{GameSettingsManager, RecentServer},
     net::network_manager::NetworkManager,
     popup_queue::{Popup, PopupQueue},
-    replay::StandaloneReplayManager,
+    replay::{Replay, StandaloneReplayManager},
     ui::credits::CreditsMenu,
 };
 

rust/src/ui/replay_finished_screen.rs

@@ -1,5 +1,5 @@
 use godot::{
-    classes::{Button, HBoxContainer, IPanel, Label, Panel},
+    classes::{Button, FileDialog, HBoxContainer, IPanel, Label, Panel},
     prelude::*,
 };
 

rust/src/ui/settings.rs

@@ -2,9 +2,9 @@ use std::collections::HashMap;
 
 use godot::{
     classes::{
-        Button, Control, GridContainer, IPanelContainer, InputEvent, Label, LineEdit,
-        PanelContainer,
-        control::{FocusBehaviorRecursive, SizeFlags},
+        Button, Control, GridContainer, IPanelContainer, InputEvent, InputEventKey,
+        InputEventMouseButton, InputMap, Label, LineEdit, PanelContainer, TextureButton,
+        control::{FocusBehaviorRecursive, FocusMode, SizeFlags},
     },
     prelude::*,
 };
@@ -19,7 +19,6 @@ pub enum Setting {
     // General settings
     FoV,
     DefaultName,
-    ReplayFPS,
 
     // Volume settings
     MasterVolume,
@@ -37,7 +36,6 @@ pub enum Setting {
     Jump,
     SelectRaygun,
     SelectShotgun,
-    ThrowTelegrenade,
 }
 
 pub enum SettingsTab {
@@ -51,7 +49,6 @@ impl ToString for Setting {
         match self {
             Setting::FoV => "Field of View",
             Setting::DefaultName => "Default Name",
-            Setting::ReplayFPS => "Replay FPS",
 
             Setting::MasterVolume => "Master volume",
             Setting::SfxVolume => "Sfx Volume",
@@ -67,7 +64,6 @@ impl ToString for Setting {
             Setting::Shoot => "Shoot",
             Setting::Melee => "Melee",
             Setting::Jump => "Jump",
-            Setting::ThrowTelegrenade => "Throw Telegrenade",
         }
         .to_string()
     }
@@ -78,7 +74,6 @@ impl Setting {
         match self {
             Setting::FoV => SettingsTab::General,
             Setting::DefaultName => SettingsTab::General,
-            Setting::ReplayFPS => SettingsTab::General,
 
             Setting::MasterVolume => SettingsTab::Volume,
             Setting::SfxVolume => SettingsTab::Volume,
@@ -305,9 +300,6 @@ impl SettingsPanel {
                 (Setting::DefaultName, SettingValue::String(value)) => {
                     new_settings.default_name = value.clone()
                 }
-                (Setting::ReplayFPS, SettingValue::SliderNumber(value)) => {
-                    new_settings.replay_fps = value.value as u8;
-                }
 
                 (Setting::MasterVolume, SettingValue::SliderNumber(value)) => {
                     new_settings.volume.master_volume = value.value;
@@ -349,9 +341,6 @@ impl SettingsPanel {
                 (Setting::Jump, SettingValue::Keybind(keybind)) => {
                     new_settings.keybinds.jump = *keybind;
                 }
-                (Setting::ThrowTelegrenade, SettingValue::Keybind(keybind)) => {
-                    new_settings.keybinds.telegrenade = *keybind;
-                }
                 _ => {}
             }
         }
@@ -384,14 +373,6 @@ fn settings_from(map: &mut HashMap<Setting, SettingValue>, settings: &GameSettin
         Setting::DefaultName,
         SettingValue::String(settings.default_name.clone()),
     );
-    map.insert(
-        Setting::ReplayFPS,
-        SettingValue::SliderNumber(SliderValue {
-            min: 1.,
-            max: 240.,
-            value: 60.,
-        }),
-    );
     map.insert(
         Setting::MasterVolume,
         SettingValue::SliderNumber(SliderValue {
@@ -458,8 +439,4 @@ fn settings_from(map: &mut HashMap<Setting, SettingValue>, settings: &GameSettin
         SettingValue::Keybind(settings.keybinds.melee),
     );
     map.insert(Setting::Jump, SettingValue::Keybind(settings.keybinds.jump));
-    map.insert(
-        Setting::ThrowTelegrenade,
-        SettingValue::Keybind(settings.keybinds.telegrenade),
-    );
 }