diff --git a/bombsquad_server b/bombsquad_server index 91d2901..1f72e7f 100644 --- a/bombsquad_server +++ b/bombsquad_server @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.9 +#!/usr/bin/env -S python3.10 -O # Released under the MIT License. See LICENSE for details. # diff --git a/dist/ba_root/mods/.idea/.gitignore b/dist/ba_root/mods/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/dist/ba_root/mods/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/dist/ba_root/mods/.idea/inspectionProfiles/profiles_settings.xml b/dist/ba_root/mods/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/dist/ba_root/mods/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/dist/ba_root/mods/.idea/misc.xml b/dist/ba_root/mods/.idea/misc.xml new file mode 100644 index 0000000..fa2a2fb --- /dev/null +++ b/dist/ba_root/mods/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/dist/ba_root/mods/.idea/mods.iml b/dist/ba_root/mods/.idea/mods.iml new file mode 100644 index 0000000..8b8c395 --- /dev/null +++ b/dist/ba_root/mods/.idea/mods.iml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/dist/ba_root/mods/.idea/modules.xml b/dist/ba_root/mods/.idea/modules.xml new file mode 100644 index 0000000..51a65ae --- /dev/null +++ b/dist/ba_root/mods/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/dist/ba_root/mods/.idea/vcs.xml b/dist/ba_root/mods/.idea/vcs.xml new file mode 100644 index 0000000..c2365ab --- /dev/null +++ b/dist/ba_root/mods/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/dist/ba_root/mods/chatHandle/ChatCommands/commands/Management.py b/dist/ba_root/mods/chatHandle/ChatCommands/commands/Management.py index df3bad7..975bd7d 100644 --- a/dist/ba_root/mods/chatHandle/ChatCommands/commands/Management.py +++ b/dist/ba_root/mods/chatHandle/ChatCommands/commands/Management.py @@ -301,7 +301,7 @@ def add_role_to_player(arguments): session = _ba.get_foreground_host_session() for i in session.sessionplayers: if i.inputdevice.client_id== int(arguments[1]): - roles=pdata.add_player_role(arguments[0],i.get_account_id()) + roles=pdata.add_player_role(arguments[0],i.get_v1_account_id()) except: return @@ -312,7 +312,7 @@ def remove_role_from_player(arguments): session = _ba.get_foreground_host_session() for i in session.sessionplayers: if i.inputdevice.client_id== int(arguments[1]): - roles=pdata.remove_player_role(arguments[0],i.get_account_id()) + roles=pdata.remove_player_role(arguments[0],i.get_v1_account_id()) except: return @@ -323,7 +323,7 @@ def get_roles_of_player(arguments,clientid): reply="" for i in session.sessionplayers: if i.inputdevice.client_id== int(arguments[0]): - roles=pdata.get_player_roles(i.get_account_id()) + roles=pdata.get_player_roles(i.get_v1_account_id()) print(roles) for role in roles: reply=reply+role+"," @@ -341,7 +341,7 @@ def set_custom_tag(arguments): session = _ba.get_foreground_host_session() for i in session.sessionplayers: if i.inputdevice.client_id== int(arguments[1]): - roles=pdata.set_tag(arguments[0],i.get_account_id()) + roles=pdata.set_tag(arguments[0],i.get_v1_account_id()) except: return def set_custom_effect(arguments): @@ -349,7 +349,7 @@ def set_custom_effect(arguments): session = _ba.get_foreground_host_session() for i in session.sessionplayers: if i.inputdevice.client_id== int(arguments[1]): - roles=pdata.set_effect(arguments[0],i.get_account_id()) + roles=pdata.set_effect(arguments[0],i.get_v1_account_id()) except: return diff --git a/dist/ba_root/mods/chatHandle/ChatCommands/commands/NormalCommands.py b/dist/ba_root/mods/chatHandle/ChatCommands/commands/NormalCommands.py index b16042b..180be9b 100644 --- a/dist/ba_root/mods/chatHandle/ChatCommands/commands/NormalCommands.py +++ b/dist/ba_root/mods/chatHandle/ChatCommands/commands/NormalCommands.py @@ -80,7 +80,7 @@ def accountid_request(arguments, clientid, accountid): player = session.sessionplayers[int(arguments[0])] name = player.getname(full=True, icon=True) - accountid = player.get_account_id() + accountid = player.get_v1_account_id() send(f" {name}'s account id is '{accountid}' ", clientid) except: diff --git a/dist/ba_root/mods/features/afk_check.py b/dist/ba_root/mods/features/afk_check.py index 9a588d4..ad64e9d 100644 --- a/dist/ba_root/mods/features/afk_check.py +++ b/dist/ba_root/mods/features/afk_check.py @@ -18,7 +18,7 @@ class checkIdle(object): last_input=int(player.inputdevice.get_last_input_time()) afk_time=int((current-last_input)/1000) if afk_time in range(INGAME_TIME,INGAME_TIME+20): - self.warn_player(player.get_account_id(),"Press any button within "+str(INGAME_TIME+20-afk_time)+" secs") + self.warn_player(player.get_v1_account_id(),"Press any button within "+str(INGAME_TIME+20-afk_time)+" secs") if afk_time > INGAME_TIME+20: player.remove_from_game() if LOBBY_KICK: diff --git a/dist/ba_root/mods/features/team_balancer.py b/dist/ba_root/mods/features/team_balancer.py index b9764e8..ff2c335 100644 --- a/dist/ba_root/mods/features/team_balancer.py +++ b/dist/ba_root/mods/features/team_balancer.py @@ -42,8 +42,8 @@ def movePlayers(fromTeam,toTeam,count): toTeam=session.sessionteams[toTeam] for i in range(0,count): player=fromTeam.players.pop() - print("moved"+player.get_account_id()) - broadCastShiftMsg(player.get_account_id()) + print("moved"+player.get_v1_account_id()) + broadCastShiftMsg(player.get_v1_account_id()) player.setdata(team=toTeam,character=player.character,color=toTeam.color,highlight=player.highlight) iconinfo=player.get_icon_info() player.set_icon_info(iconinfo['texture'],iconinfo['tint_texture'],toTeam.color,player.highlight) diff --git a/dist/ba_root/mods/plugins/bcs_plugin.py b/dist/ba_root/mods/plugins/bcs_plugin.py index fd95ada..aee1a93 100644 --- a/dist/ba_root/mods/plugins/bcs_plugin.py +++ b/dist/ba_root/mods/plugins/bcs_plugin.py @@ -97,7 +97,7 @@ class BsDataThread(object): 'device_id':player.inputdevice.get_account_name(True), 'inGame':player.in_game, 'character':player.character, - 'account_id':player.get_account_id() + 'account_id':player.get_v1_account_id() } data[team.id]['players'].append(teamplayer) diff --git a/dist/ba_root/mods/spazmod/effects.py b/dist/ba_root/mods/spazmod/effects.py index 2ea1aa1..ddb5de7 100644 --- a/dist/ba_root/mods/spazmod/effects.py +++ b/dist/ba_root/mods/spazmod/effects.py @@ -160,7 +160,7 @@ class Effect(ba.Actor): if (c.activityplayer) and (c.activityplayer.node.playerID == node_id): profiles = c.inputdevice.get_player_profiles() clID = c.inputdevice.client_id - cl_str = c.get_account_id() + cl_str = c.get_v1_account_id() try: if cl_str in custom_effects: diff --git a/dist/ba_root/mods/spazmod/hitmessage.py b/dist/ba_root/mods/spazmod/hitmessage.py index abf3c1e..c1e03ba 100644 --- a/dist/ba_root/mods/spazmod/hitmessage.py +++ b/dist/ba_root/mods/spazmod/hitmessage.py @@ -20,7 +20,7 @@ def handle_hit(msg, hp, dmg, hit_by, msg_pos): hit_by_account_id = None for c in _ba.get_foreground_host_session().sessionplayers: if (c.activityplayer) and (c.activityplayer.node.playerID == hit_by_id): - hit_by_account_id = c.get_account_id() + hit_by_account_id = c.get_v1_account_id() if hit_by_account_id in damage_data: damage_data[hit_by_account_id] += float(dmg) else: damage_data[hit_by_account_id] = float(dmg) #Send Screen Texts in enabled diff --git a/dist/ba_root/mods/spazmod/tag.py b/dist/ba_root/mods/spazmod/tag.py index 544882c..447db86 100644 --- a/dist/ba_root/mods/spazmod/tag.py +++ b/dist/ba_root/mods/spazmod/tag.py @@ -3,7 +3,7 @@ from playersData import pdata import ba, setting def addtag(node,player): session_player=player.sessionplayer - account_id=session_player.get_account_id() + account_id=session_player.get_v1_account_id() customtag_=pdata.get_custom() customtag=customtag_['customtag'] roles=pdata.get_roles() @@ -25,7 +25,7 @@ def addtag(node,player): from stats import mystats def addrank(node,player): session_player=player.sessionplayer - account_id=session_player.get_account_id() + account_id=session_player.get_v1_account_id() rank=mystats.getRank(account_id) if rank: diff --git a/dist/ba_root/mods/stats/mystats.py b/dist/ba_root/mods/stats/mystats.py index e6eda33..092d27e 100644 --- a/dist/ba_root/mods/stats/mystats.py +++ b/dist/ba_root/mods/stats/mystats.py @@ -217,7 +217,7 @@ def update(score_set): account_scores = {} for p_entry in score_set.get_records().values(): - account_id = p_entry.player.get_account_id() + account_id = p_entry.player.get_v1_account_id() if account_id is not None: account_kills.setdefault(account_id, 0) # make sure exists account_kills[account_id] += p_entry.accum_kill_count diff --git a/dist/bombsquad_headless b/dist/bombsquad_headless index f62f0b0..b28e827 100644 Binary files a/dist/bombsquad_headless and b/dist/bombsquad_headless differ