Lobbyconfig fixes & enhancements

proepkes · Jul 18, 2018 · 50690c9 · 50690c9
1 parent 0a7ad48
commit 50690c9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 105 deletions.
diff --git a/SpeedDate.ServerPlugins/Lobbies/LobbiesConfig.cs b/SpeedDate.ServerPlugins/Lobbies/LobbiesConfig.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 using SpeedDate.Configuration;
 
 namespace SpeedDate.ServerPlugins.Lobbies
@@ -9,21 +10,23 @@ class LobbiesConfig : IConfig
     {
         public string LobbyFiles { get; set; } = string.Empty;
 
-        public IEnumerable<string> ReadAllFiles()
+        public IEnumerable<(string filename, string content)> ReadAllFiles()
         {
-            var result = new List<string>();
+            var result = new List<(string, string)>();
             foreach (var file in LobbyFiles.Split(';'))
             {
-                var fileName = file;
+                var filePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                var fileName = $"{filePath}\\{file}";
+
                 if (!File.Exists(fileName))
                 {
-                    fileName = $"{file}.lobby";
+                    fileName = $"{filePath}\\{file}.lobby";
                     if (!File.Exists(fileName)) //Search for file.lobby
                     {
-                        fileName = $"Lobbies\\{file}";
+                        fileName = $"{filePath}\\Lobbies\\{file}";
                         if (!File.Exists(fileName)) //Search for Lobbies\file
                         {
-                            fileName = $"Lobbies\\{file}.lobby";
+                            fileName = $"{filePath}\\Lobbies\\{file}.lobby";
                             if (!File.Exists(fileName)) //Search for Lobbies\file.lobby
                             {
                                 continue;
@@ -32,7 +35,7 @@ public IEnumerable<string> ReadAllFiles()
                     }
                 }
 
-                result.Add(File.ReadAllText(fileName));
+                result.Add((file, File.ReadAllText(fileName)));
             }
 
             return result;

diff --git a/SpeedDate.ServerPlugins/Lobbies/LobbiesExtensionMethods.cs b/SpeedDate.ServerPlugins/Lobbies/LobbiesExtensionMethods.cs
diff --git a/SpeedDate.ServerPlugins/Lobbies/LobbiesHelper.cs b/SpeedDate.ServerPlugins/Lobbies/LobbiesHelper.cs
@@ -50,7 +50,8 @@ public static LobbyBuilder CreateLobbyBuilder(StringReader reader)
                         EnableReadySystem = Convert.ToBoolean(xmlReader["EnableReadySystem"]),
                         EnableTeamSwitching = Convert.ToBoolean(xmlReader["EnableTeamSwitching"]),
                         PlayAgainEnabled = Convert.ToBoolean(xmlReader["PlayAgainEnabled"]),
-                        StartGameWhenAllReady = Convert.ToBoolean(xmlReader["StartGameWhenAllReady"])
+                        StartGameWhenAllReady = Convert.ToBoolean(xmlReader["StartGameWhenAllReady"]),
+                        Name = properties.ExtractLobbyName()
                     };
                 });
 

diff --git a/SpeedDate.ServerPlugins/Lobbies/LobbiesPlugin.cs b/SpeedDate.ServerPlugins/Lobbies/LobbiesPlugin.cs
@@ -51,9 +51,9 @@ public IEnumerable<GameInfoPacket> GetPublicGames(IPeer peer, Dictionary<string,
 
         public override void Loaded()
         {
-            foreach (var lobbySettings in _config.ReadAllFiles())
+            foreach (var lobbyFile in _config.ReadAllFiles())
             {
-                Factories.Add(lobbySettings, LobbiesHelper.CreateLobbyBuilder(new StringReader(lobbySettings)));
+                Factories.Add(lobbyFile.filename , LobbiesHelper.CreateLobbyBuilder(new StringReader(lobbyFile.content)));
             }
 
             Server.SetHandler(OpCodes.CreateLobby, HandleCreateLobby);
@@ -405,4 +405,4 @@ private void HandleGetLobbyTypes(IIncommingMessage message)
             message.Respond(Factories.Keys.ToBytes(), ResponseStatus.Success);
         }
     }
-}
+}
diff --git a/SpeedDate.ServerPlugins/Lobbies/TwoVsTwo.lobby b/SpeedDate.ServerPlugins/Lobbies/TwoVsTwo.lobby
@@ -16,13 +16,13 @@
   </Teams>
   <Controls>
     <Control Key="speed" Label="Game Speed">
-      <Controloption IsDefault="true">1x</Controloption>
-      <Controloption>2x</Controloption>
-      <Controloption>3x</Controloption>
+      <Controloption IsDefault="true" Value="1x" />
+      <Controloption Value="2x" />
+      <Controloption Value="3x" />
     </Control>
     <Control Key="gravity" Label="Gravity">
-      <Controloption>On</Controloption>
-      <Controloption>Off</Controloption>
+      <Controloption Value="On" />
+      <Controloption Value="Off" />
     </Control>
   </Controls>
 </Lobby>