Merge pull request #117 from imayushsaini/api9

fixed default settings and config.json

bombsquad_server

@@ -548,12 +548,14 @@ class ServerManagerApp:
                 )
                 return
             except Exception as exc:
-
+                json_path = os.path.abspath(
+                    os.path.join(os.path.dirname(__file__), 'config.json')
+                    )
                 print(f'{Clr.RED}Error loading config file:\n{exc}.{Clr.RST}',
                       flush=True)
-                with open(self._ba_root_path + "/mods/defaults/config.toml", "r") as infile:
+                with open(self._ba_root_path + "/mods/defaults/config.json", "r") as infile:
                     default_file = infile.read()
-                with open(self._config_path, "w") as outfile:
+                with open(json_path, "w") as outfile:
                     outfile.write(default_file)
                 print("config reset done")
 

dist/ba_root/mods/defaults/config.json

@@ -0,0 +1,44 @@
+{
+   "party_name":"BombSquad Community Server",
+   "party_is_public":true,
+   "authenticate_clients":true,
+   "admins":[
+      "pb-yOuRAccOuNtIdHErE",
+      "pb-aNdMayBeAnotherHeRE"
+   ],
+   "enable_default_kick_voting":true,
+   "port":43210,
+   "max_party_size":6,
+   "session_max_players_override":8,
+   "session_type":"ffa",
+   "playlist_code":12345,
+   "playlist_shuffle":true,
+   "auto_balance_teams":true,
+   "enable_telnet":false,
+   "teams_series_length":7,
+   "ffa_series_length":24,
+   "stats_url":"https://discord.gg/ucyaesh",
+   "clean_exit_minutes":60,
+   "unclean_exit_minutes":90,
+   "idle_exit_minutes":20,
+   "show_tutorial":false,
+   "team_names":[
+      "ladoo",
+      "barfi"
+   ],
+   "team_colors":[
+      [
+         0.8,
+         0.0,
+         0.6
+      ],
+      [
+         0,
+         1,
+         0.8
+      ]
+   ],
+   "enable_queue":true,
+   "protocol_version":35,
+   "player_rejoin_cooldown":10.0
+}

dist/ba_root/mods/defaults/settings.json

@@ -1,141 +1,181 @@
 {
-    "whitelist": false,
-    "useV2Account": false,
   "Anti-IdRevealer": false,
   "ChatCommands": {
     "BrodcastCommand": true
   },
-    "textonmap": {
+  "HostDeviceName": "v1.4",
-        "top watermark": "Welcome to server \nIP @IP PORT @PORT",
+  "HostName": "BCSv2",
-        "bottom left watermark": "Owner : <owner-name> \nEditor : <bablu>\nScripts : BCS1.7.13",
+  "KickVoteMsgType": "chat",
-        "center highlights":{
+  "ScoreScreenAnnouncement": {
-            "color":[1,0,0],
-            "randomColor":true,
-            "msg":[
-                "type end to start end vote",
-                "start msg with prefix .(dot) to send in game popup msg",
-                "start msg with prefix ,(comma) to send msg to teammates",
-                "BombSquad Community Server - BCS"
-                ]
-        }
-    },
-    "ScoreScreenAnnouncement":{
     "enable": true,
-        "msg": ["click stats button to join discord", "watch hey smoothy youtube channel","download new mods from discord", "use /ping all to check others ping.",
+    "msg": [
-    "start msg with prefix ,(comma) to send msg to teammates", "start msg with prefix .(dot) to send in game popup msg","click stats button for leaderboard","get notification when friends join this server, checkout leaderboard",
+      "click stats button to join discord",
-"abusers, spammers will get auto ban", "doesnt matter who starts fight, if you abuse- you will get ban too."]
+      "watch hey smoothy youtube channel",
+      "downlaod new mods from discord"
+    ]
   },
-    "statsResetAfterDays":31,
+  "ShowKickVoteStarterName": true,
-    "leaderboard":{
+  "StumbledScoreScreen": true,
-        "enable":true,
+  "WarnCooldownMinutes": 30,
-        "barsBehindName":true
+  "afk_remover": {
+    "enable": false,
+    "ingame_idle_time_in_secs": 60,
+    "kick_idle_from_lobby": true,
+    "lobby_idle_time_in_secs": 10
   },
-    "autoNightMode":{
+  "afterWarnKickMsg": "Enough warnings, Goodbye have a nice day :)",
-        "enable":true,
+  "allowInGameChat": true,
-        "startTime":"18:30",
+  "allowTeamChat": true,
-        "endTime":"06:00",
+  "allowVotes": true,
-        "fireflies":true,
+  "autoNightMode": {
-        "fireflies_random_color":false
+    "enable": true,
-    },
+    "endTime": "06:00",
-    "colorfullMap":true,
+    "fireflies": true,
-    "playlists":{
+    "fireflies_random_color": false,
-        "team":12345,
+    "startTime": "18:30"
-        "ffa":412175,
-        "elim":412172,
-        "soccer":412160,
-        "smash":412151,
-        "ffasmash":412179,
-        "epic":412173
-    },
-    "coopModeWithLessPlayers":{
-        "enable":false,
-        "minPlayerToExitCoop":0
-    },
-    "mikirogQuickTurn":{
-        "enable":false
-    },
-    "colorful_explosions":{
-        "enable":true
   },
+  "autoTeamBalance": true,
   "ballistica_web": {
-        "enable":true,
+    "enable": true,
-         "server_password":"dfgeh54rhbrthsdfhfdh"
+    "server_password": "my_secerT_password_very_hard",
+    "discord_link": "https://discord.gg/ucyaesh"
   },
-    "character_chooser":{
+  "character_chooser": {
-        "enable":true
+    "enable": true
+  },
+  "colorful_explosions": {
+    "enable": true
+  },
+  "colorfullMap": true,
+  "contributeData": true,
+  "coopModeWithLessPlayers": {
+    "enable": false,
+    "minPlayerToExitCoop": 3
   },
   "custom_characters": {
-        "enable":true
+    "enable": true
-    },
-    "StumbledScoreScreen":true,
-    "elPatronPowerups":{
-        "enable":true,
-        "settings":{"Powers Gravity": true,
-            "Tank Shield PTG": 96,
-            "Healing Damage PTG": 72,
-            "Powerup Style": "Auto",
-            "Powerup Scale": 1.0,
-            "Powerup Name": true,
-            "Powerup With Shield": true,
-            "Powerup Time": false},
-        "Quantity":{ "Shield": 2,
-             "Punch": 3, "Mine Bombs": 2,
-            "Impact Bombs": 3, "Ice Bombs": 3, "Triple": 3,
-            "Sticky Bombs": 3, "Curse": 1, "Health": 1,
-            "Speed": 2, "Healing Damage": 1, "Goodbye": 2,
-            "Ice Man": 1,"Tank Shield": 1, "Impairment Bombs": 2,
-            "Fire Bombs": 3, "Fly Bombs": 3}
-    },
-    "discordbot":{
-        "enable":false,
-        "token":"<secret-token-here>",
-        "liveChat":true,
-        "liveStatsChannelID":925440043672285205,
-        "logsChannelID":925440079843958834
   },
   "discordWebHook": {
     "enable": false,
     "webhookURL": "https://discord.com/api/webhooks/82649239/e7s0zyBJIuczXL7_CGSO5WM"
   },
-    "afk_remover":{
+  "discordbot": {
-        "enable":true,
+    "enable": false,
-        "ingame_idle_time_in_secs":60,
+    "liveChat": true,
-        "kick_idle_from_lobby":true,
+    "liveStatsChannelID": 925440043672285200,
-        "lobby_idle_time_in_secs":10
+    "logsChannelID": 925440079843958800,
+    "token": "<secret-token-here>"
   },
-    "playermod": {
+  "elPatronPowerups": {
-        "default_boxing_gloves": true,
+    "Quantity": {
-        "default_shield" : false,
+      "Curse": 1,
-        "default_bomb" : "normal",
+      "Fire Bombs": 3,
-        "default_bomb_count" : 1
+      "Fly Bombs": 3,
+      "Goodbye": 2,
+      "Healing Damage": 1,
+      "Health": 1,
+      "Ice Bombs": 3,
+      "Ice Man": 1,
+      "Impact Bombs": 3,
+      "Impairment Bombs": 2,
+      "Mine Bombs": 2,
+      "Punch": 3,
+      "Shield": 2,
+      "Speed": 2,
+      "Sticky Bombs": 3,
+      "Tank Shield": 1,
+      "Triple": 3
     },
-    "allowTeamChat":true,
+    "enable": false,
-    "allowVotes":true,
+    "settings": {
-    "allowInGameChat":true,
+      "Healing Damage PTG": 72,
-    "sameCharacterForTeam":false,
+      "Powers Gravity": true,
-    "newResultBoard":true,
+      "Powerup Name": true,
-    "HostDeviceName":"v1.4",
+      "Powerup Scale": 1,
-    "HostName":"BCS",
+      "Powerup Style": "Auto",
-    "ShowKickVoteStarterName":true,
+      "Powerup Time": false,
-    "autoTeamBalance": true,
+      "Powerup With Shield": true,
-    "KickVoteMsgType":"chat",
+      "Powerups": {
-    "minAgeToChatInHours":78,
+        "Curse": 1,
-    "minAgeToJoinInHours":24,
+        "Fire Bombs": 3,
-    "maxWarnCount":2,
+        "Fly Bombs": 3,
-    "WarnCooldownMinutes":30,
+        "Goodbye": 2,
-    "maxAccountPerIP":1,
+        "Healing Damage": 1,
-    "maxPlayersPerDevice":1,
+        "Health": 1,
-    "warnMsg":"WARNING !!!",
+        "Ice Bombs": 3,
-    "afterWarnKickMsg":"Enough warnings, Goodbye have a nice day :)",
+        "Ice Man": 1,
-    "firstTimeJoinMsg":"Welcome to the server,we r saving all your account details and chats",
+        "Impact Bombs": 3,
-    "regularWelcomeMsg":"Welcome Back",
+        "Impairment Bombs": 2,
-    "contributeData": true,
+        "Mine Bombs": 2,
-    "enabletags": true,
+        "Punch": 3,
+        "Shield": 2,
+        "Speed": 2,
+        "Sticky Bombs": 3,
+        "Tank Shield": 1,
+        "Triple": 3
+      },
+      "Tank Shield PTG": 96
+    }
+  },
+  "enableHitTexts": true,
+  "enableTagAnimation": true,
+  "enableTop5effects": true,
+  "enableeffects": true,
   "enablehptag": true,
   "enablerank": true,
   "enablestats": true,
-    "enableHitTexts": true,
+  "enabletags": true,
-    "enableeffects": true,
+  "firstTimeJoinMsg": "Welcome to the server,we r saving all your account details and chats",
-    "enableTop5effects": true,
+  "leaderboard": {
-    "enableTagAnimation":true
+    "barsBehindName": true,
+    "enable": true
+  },
+  "maxAccountPerIP": 3,
+  "maxPlayersPerDevice": 2,
+  "maxWarnCount": 2,
+  "mikirogQuickTurn": {
+    "enable": false
+  },
+  "minAgeToChatInHours": 78,
+  "minAgeToJoinInHours": 24,
+  "newResultBoard": true,
+  "playermod": {
+    "default_bomb": "normal",
+    "default_bomb_count": 1,
+    "default_boxing_gloves": true,
+    "default_shield": false
+  },
+  "playlists": {
+    "elim": 412172,
+    "epic": 412173,
+    "ffa": 412175,
+    "ffasmash": 412179,
+    "smash": 412151,
+    "soccer": 412160,
+    "team": 12345
+  },
+  "regularWelcomeMsg": "Welcome Back",
+  "sameCharacterForTeam": false,
+  "statsResetAfterDays": 31,
+  "textonmap": {
+    "bottom left watermark": "Owner : <owner-name> \nEditor : <bablu>\nScripts : BCS1.7.39",
+    "center highlights": {
+      "color": [
+        1,
+        0,
+        0
+      ],
+      "msg": [
+        "type end to start end vote",
+        "start msg with prefix .(dot) to send in game popup msg",
+        "start msg with prefix ,(comma) to send msg to teammates",
+        "BombSquad Community Server - BCS"
+      ],
+      "randomColor": true
+    },
+    "top watermark": "Welcome to server \nIP @IP PORT @PORT"
+  },
+  "useV2Account": false,
+  "warnMsg": "WARNING !!!",
+  "whitelist": false
 }

dist/ba_root/mods/plugins/bombsquad_service.py

@@ -100,7 +100,7 @@ class BsDataThread(object):
             teams = session.sessionteams
             for team in teams:
                 data[str(team.id)] = {'name': team.name if isinstance(team.name,
-                                                                      str) else team.name,
+                                                                      str) else team.name.evaluate(),
                                       'color': list(team.color),
                                       'score': team.customdata['score'],
                                       'players': []