Minor changes

GameServerLib/Chatbox/Commands/ReloadScriptsCommand.cs

@@ -14,7 +14,7 @@ public ReloadScriptsCommand(ChatCommandManager chatCommandManager, Game game)
 
         public override void Execute(Peer peer, bool hasReceivedArguments, string arguments = "")
         {
-            if (Game.LoadScripts())
+            if (Game.LoadScripts(true))
             {
                 ChatCommandManager.SendDebugMsgFormatted(DebugMsgType.INFO, "Scripts reloaded.");
             }

GameServerLib/Content/CharData.cs

@@ -115,7 +115,7 @@ public void Load(string name)
             HpRegenPerLevel = file.GetFloat("Data", "HPRegenPerLevel", HpRegenPerLevel);
             MpRegenPerLevel = file.GetFloat("Data", "MPRegenPerLevel", MpRegenPerLevel);
             AttackSpeedPerLevel = file.GetFloat("Data", "AttackSpeedPerLevel", AttackSpeedPerLevel);
-            IsMelee = file.GetString("Data", "IsMelee", IsMelee ? "Yes" : "No").ToLower().Equals("yes");
+            IsMelee = file.GetString("Data", "IsMelee", IsMelee ? "Yes" : "No").ToLowerInvariant().Equals("yes");
             PathfindingCollisionRadius =
                 file.GetFloat("Data", "PathfindingCollisionRadius", PathfindingCollisionRadius);
             GameplayCollisionRadius = file.GetFloat("Data", "GameplayCollisionRadius", GameplayCollisionRadius);

GameServerLib/Content/ContentFile.cs

@@ -94,9 +94,10 @@ public int[] GetIntArray(string section, string name, int[] defaultValue)
                 {
                     for (var i = 0; i < defaultValue.Length; i++)
                     {
-                        float value;
-                        if (float.TryParse(list[i], NumberStyles.Any, CultureInfo.InvariantCulture, out value))
+                        if (float.TryParse(list[i], NumberStyles.Any, CultureInfo.InvariantCulture, out var value))
+                        {
                             defaultValue[i] = (int)value;
+                        }
                     }
                 }
             }

GameServerLib/Content/ContentManager.cs

@@ -175,6 +175,7 @@ public static ContentManager LoadGameMode(Game game, string gameModeName, string
                 }
             }
 
+            // Read non-zipped data
             foreach (var file in Directory.GetFiles(contentPath, "*.*", SearchOption.AllDirectories))
             {
                 var relativePath = file.Replace(contentPath, "").Replace(gameModeName, "").Substring(2)

GameServerLib/Content/ItemManager.cs

@@ -47,7 +47,7 @@ public void LoadItems(ContentManager contentManager)
             var iniParser = new FileIniDataParser();
             foreach (var content in contentManager.Content)
             {
-                if (!content.Key.StartsWith("DATA/Items"))
+                if (!content.Key.StartsWith("DATA/Items") || !content.Key.EndsWith(".ini"))
                 {
                     continue;
                 }

GameServerLib/Game.cs

@@ -130,8 +130,10 @@ public void Initialize(Address address, string blowfishKey, Config config)
             _logger.Info("Game is ready.");
         }
 
-        public bool LoadScripts()
+        public bool LoadScripts(bool doReloadContent = false)
         {
+            // todo: use the optional arg to *actually* reload the scripts
+            // current code only takes what was loaded in the startup and loads them back in, so it does nothing
             var scripts = new Dictionary<string, byte[]>();
             foreach (var contentData in Config.ContentManager.Content)
             {
@@ -143,7 +145,7 @@ public bool LoadScripts()
                 scripts.Add(contentData.Key, contentData.Value);
             }
 
-            return ScriptEngine.LoadFromFiles(scripts);
+            return ScriptEngine.LoadFromData(scripts);
         }
 
         public void NetLoop()

GameServerLib/Scripting/CSharp/CSharpScriptEngine.cs

@@ -22,7 +22,7 @@ public CSharpScriptEngine()
         }
 
         //Takes about 300 milliseconds for a single script
-        public bool LoadFromFiles(Dictionary<string, byte[]> scriptFiles)
+        public bool LoadFromData(Dictionary<string, byte[]> scriptFiles)
         {
             bool compiledSuccessfully;
             var treeList = new List<SyntaxTree>();