Merge pull request #41 from Jupeyy/pr_vanilla_fixes

Add rcon config variables to chain.
ddnet · Jan 7, 2025 · f6d0192 · f6d0192
2 parents c021626 + 13d66b7
commit f6d0192
Show file tree

Hide file tree

Showing 9 changed files with 164 additions and 109 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/game/game-base/Cargo.toml b/game/game-base/Cargo.toml
@@ -8,6 +8,8 @@ math = { path = "../../lib/math" }
 base = { path = "../../lib/base" }
 image = { path = "../../lib/image" }
 graphics-types = { path = "../../lib/graphics-types" }
+config = { path = "../../lib/config" }
+command-parser = { path = "../../lib/command-parser" }
 pool = { path = "../../lib/pool" }
 hiarc = { path = "../../lib/hiarc", features = ["enable_time"] }
 

diff --git a/game/game-base/src/config_helper.rs b/game/game-base/src/config_helper.rs
@@ -0,0 +1,30 @@
+use std::ops::Range;
+
+use command_parser::parser::{self, Syn};
+
+pub fn handle_config_variable_cmd(
+    cmd: &parser::Command,
+    config: &mut dyn config::traits::ConfigInterface,
+) -> anyhow::Result<String> {
+    fn syn_vec_to_config_val(args: &[(Syn, Range<usize>)]) -> Option<String> {
+        args.first().map(|(arg, _)| match arg {
+            parser::Syn::Command(cmd) => cmd.cmd_text.clone(),
+            parser::Syn::Commands(cmds) => cmds
+                .first()
+                .map(|cmd| cmd.cmd_text.clone())
+                .unwrap_or_default(),
+            parser::Syn::Text(text) => text.clone(),
+            parser::Syn::Number(num) => num.clone(),
+            parser::Syn::Float(num) => num.clone(),
+            parser::Syn::JsonObjectLike(obj) => obj.clone(),
+            parser::Syn::JsonArrayLike(obj) => obj.clone(),
+        })
+    }
+    Ok(config.try_set_from_str(
+        cmd.cmd_text.clone(),
+        None,
+        syn_vec_to_config_val(&cmd.args),
+        None,
+        config::traits::ConfigFromStrOperation::Set,
+    )?)
+}
diff --git a/game/game-base/src/lib.rs b/game/game-base/src/lib.rs
@@ -1,5 +1,6 @@
 pub mod assets_url;
 pub mod browser_favorite_player;
+pub mod config_helper;
 pub mod datafile;
 pub mod game_types;
 pub mod indexmap_tests;

diff --git a/game/game-server/src/server.rs b/game/game-server/src/server.rs
@@ -3,7 +3,6 @@ use std::{
     fmt::Debug,
     net::IpAddr,
     num::NonZeroUsize,
-    ops::Range,
     path::PathBuf,
     sync::{atomic::AtomicBool, Arc, Weak},
     time::Duration,
@@ -83,6 +82,7 @@ use crate::{
 };
 
 use game_base::{
+    config_helper::handle_config_variable_cmd,
     game_types::{is_next_tick, time_until_tick},
     local_server_info::{LocalServerConnectInfo, LocalServerInfo, LocalServerState, ServerDbgGame},
     network::{
@@ -527,7 +527,7 @@ impl Server {
 
                         match chain_cmd.cmd {
                             ServerRconCommand::ConfVariable => {
-                                Self::handle_config_variable_cmd(&cmd, config).map(|msg| {
+                                handle_config_variable_cmd(&cmd, config).map(|msg| {
                                     format!("Updated value for {}: {}", cmd.cmd_text, msg)
                                 })
                             }
@@ -557,8 +557,8 @@ impl Server {
                         };
 
                         if let ServerRconCommand::ConfVariable = chain_cmd.cmd {
-                            Self::handle_config_variable_cmd(cmd, config)
-                                .map(|msg| format!("Updated value for {}: {}", cmd.cmd_text, msg))
+                            handle_config_variable_cmd(cmd, config)
+                                .map(|msg| format!("Current value for {}: {}", cmd.cmd_text, msg))
                         } else {
                             Err(anyhow!("Failed to handle config variable: {cmd}"))
                         }
@@ -1701,33 +1701,6 @@ impl Server {
         );
     }
 
-    fn handle_config_variable_cmd(
-        cmd: &parser::Command,
-        config: &mut ConfigGame,
-    ) -> anyhow::Result<String> {
-        fn syn_vec_to_config_val(args: &[(Syn, Range<usize>)]) -> Option<String> {
-            args.first().map(|(arg, _)| match arg {
-                parser::Syn::Command(cmd) => cmd.cmd_text.clone(),
-                parser::Syn::Commands(cmds) => cmds
-                    .first()
-                    .map(|cmd| cmd.cmd_text.clone())
-                    .unwrap_or_default(),
-                parser::Syn::Text(text) => text.clone(),
-                parser::Syn::Number(num) => num.clone(),
-                parser::Syn::Float(num) => num.clone(),
-                parser::Syn::JsonObjectLike(obj) => obj.clone(),
-                parser::Syn::JsonArrayLike(obj) => obj.clone(),
-            })
-        }
-        Ok(config.try_set_from_str(
-            cmd.cmd_text.clone(),
-            None,
-            syn_vec_to_config_val(&cmd.args),
-            None,
-            config::traits::ConfigFromStrOperation::Set,
-        )?)
-    }
-
     fn handle_cmd_full(
         &mut self,
         cmd: parser::Command,
@@ -1831,7 +1804,7 @@ impl Server {
                 Ok(res.join("\n"))
             }
             ServerRconCommand::ConfVariable => {
-                Self::handle_config_variable_cmd(&cmd, &mut self.config_game)
+                handle_config_variable_cmd(&cmd, &mut self.config_game)
                     .map(|msg| format!("Updated value for {}: {}", cmd.cmd_text, msg))
             }
             ServerRconCommand::Exec => {
@@ -1907,8 +1880,8 @@ impl Server {
                 };
 
                 if let ServerRconCommand::ConfVariable = chain_cmd.cmd {
-                    Self::handle_config_variable_cmd(cmd, &mut self.config_game)
-                        .map(|msg| format!("Updated value for {}: {}", cmd.cmd_text, msg))
+                    handle_config_variable_cmd(cmd, &mut self.config_game)
+                        .map(|msg| format!("Current value for {}: {}", cmd.cmd_text, msg))
                 } else {
                     Err(anyhow!("This command was invalid: {cmd}"))
                 }

diff --git a/game/vanilla/src/config.rs b/game/vanilla/src/config.rs
@@ -51,4 +51,11 @@ pub mod config {
         /// this is false for vanilla
         pub allow_player_vote_cam: bool,
     }
+
+    /// Wraps vanilla config for the console chain
+    #[config_default]
+    #[derive(Debug, Clone, Serialize, Deserialize, ConfigInterface)]
+    pub struct ConfigVanillaWrapper {
+        pub vanilla: ConfigVanilla,
+    }
 }
diff --git a/game/vanilla/src/entities/character.rs b/game/vanilla/src/entities/character.rs
@@ -164,6 +164,7 @@ pub mod character {
             self.weapons.copy_clone_from(&other.weapons);
             self.buffs.copy_clone_from(&other.buffs);
             self.debuffs.copy_clone_from(&other.debuffs);
+            self.queued_emoticon.clone_from(&other.queued_emoticon);
             self.interactions.clone_from(&other.interactions);
         }
     }