Merge pull request #97 from Dankrushen/master

Merge Changes with main Branch

README.md

@@ -26,7 +26,7 @@ The latest release can be found here: [Release link](https://github.com/Grover-c
 3. For each instance with a unique config, create a new directory in the servers directory and place each config.txt in there, so for example for two unique configs:
 * servers/FirstServer/config.txt
 * servers/SecondServer/config.txt
-4. If your config is not in its default location due to a different OS and such, make a new file next to MultiAdmin.exe called spc_multiadmin.cfg and place the follwing setting like so:
+4. If your config is not in its default location due to a different OS and such, make a new file next to MultiAdmin.exe called scp_multiadmin.cfg and place the follwing setting like so:
 - cfg_loc=%appdata%\SCP Secret Laboratory\config.txt
 
 ## MultiAdmin Commands
@@ -101,25 +101,35 @@ Example:
 - max_players (default 20, max amount of players per server)
 - no_scp079_first (default true, computer will never be the first scp in a game)
 - nuke_disable_cooldown stop the nuke from being spammed, will stop the nuke arm switch from being disabled until this has elapsed. Default = 0
+- 173_door_starting_cooldown time (in seconds) before SCP-173's door can be opened
 - SCP106_cleanup use this to stop ragdolls spawning in the pocket dimension [currently items still spawn]
 - SCP049_HP use this to set the starting HP for the class. Default = 1200
 - SCP049-2_HP use this to set the starting HP for the class. Default = 400
 - SCP079_HP use this to set the starting HP for the class. Default = 100
+- SCP096_HP use this to set the starting HP for the class. Default = 2000
 - SCP106_HP use this to set the starting HP for the class. Default = 700
 - SCP173_HP use this to set the starting HP for the class. Default = 2000
 - SCP457_HP use this to set the starting HP for the class. Default = 700
 - CLASSD_HP use this to set the starting HP for the class. Default = 100
-- NTFSCIENTIST_HP use this to set the starting HP for the class. Default = 100
+- NTFSCIENTIST_HP use this to set the starting HP for the class. Default = 120
 - SCIENTIST_HP use this to set the starting HP for the class. Default = 100
 - CI_HP use this to set the starting HP for the class. Default = 120
 - NTFL_HP use this to set the starting HP for the class. Default = 120
 - NTFC_HP use this to set the starting HP for the class. Default = 150
 - NTFG_HP use this to set the starting HP for the class. Default = 100
 - SCP049_DISABLE disable this scp, default: no
-- SCP079_DISABLE disable this scp, default: no
+- SCP079_DISABLE disable this scp, default: yes
+- SCP096_DISABLE disable this scp, default: yes
 - SCP106_DISABLE disable this scp, default: no
 - SCP173_DISABLE disable this scp, default: no
-- SCP457_DISABLE disable this scp, default: no
+- SCP457_DISABLE disable this scp, default: yes
+- FORCE_DISABLE_ENABLE overrides game's default ban value with chosen values (USE OF THIS IS NOT RECOMMENDED)
+- SCP049_AMOUNT max amount of this scp that can be spawned in randomly, default: 1
+- SCP079_AMOUNT max amount of this scp that can be spawned in randomly, default: 1
+- SCP096_AMOUNT max amount of this scp that can be spawned in randomly, default: 1
+- SCP106_AMOUNT max amount of this scp that can be spawned in randomly, default: 1
+- SCP173_AMOUNT max amount of this scp that can be spawned in randomly, default: 1
+- SCP457_AMOUNT max amount of this scp that can be spawned in randomly, default: 1
 ##
 
 Place any suggestions/problems in issues!

config_template.txt

@@ -9,7 +9,7 @@ map_seed = -1; (-1 = random)
 intercom_cooldown = 120;
 intercom_max_speech_time = 20;
 auto_round_restart_time = 10;
-friendly_fire = true;
+friendly_fire = false;
 
 ///////////////////////////////////
 
@@ -26,14 +26,16 @@ NO_SCP079_FIRST = true;
 SCP049_HP = 1200;
 SCP049-2_HP = 400;
 SCP079_HP = 100;
+SCP096_HP = 2000;
 SCP106_HP = 700;
-SCP457_HP = 700;
 SCP173_HP = 2000;
-max_players = 30;
-
+SCP457_HP = 700;
+max_players = 25;
 
 // server_name can stuff up the cfg reader depending on its contents, so keep it down the bottom.
 server_ip = auto;
-administrator_password = pwd;
-server_name = servername;
-
+server_name = [nick]'s game;
+ban_database_folder = [appdata]/SCP Secret Laboratory/Bans;
+administrator_password = none;
+port_queue = 7777,7778,7779,7780,7781,7782,7783,7784;
+serverinfo_pastebin_id = 7wV681fT;

mutliadmin/MultiAdmin/Program.cs

@@ -189,4 +189,4 @@ public static void Main(string[] args)
             }
         }
     }
-}
+}

mutliadmin/MultiAdmin/Server.cs

@@ -386,4 +386,4 @@ public void SendMessage(string message)
         }
 
     }
-}
+}