Add 2 expressions for current player ping & username

4ian · Jun 18, 2024 · 1c90c59 · 1c90c59
1 parent 8ba41e0
commit 1c90c59
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 0 deletions.
diff --git a/Extensions/Multiplayer/JsExtension.js b/Extensions/Multiplayer/JsExtension.js
@@ -456,6 +456,29 @@ module.exports = {
       .addIncludeFile('Extensions/Multiplayer/multiplayertools.js')
       .setFunctionName('gdjs.multiplayer.getPlayerUsername');
 
+    extension
+      .addStrExpression(
+        'CurrentPlayerUsername',
+        _('Current player username in lobby'),
+        _('Get the username of the current player in the lobby.'),
+        _('Lobbies'),
+        'JsPlatform/Extensions/multiplayer.svg'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/P2P/A_peer.js')
+      .addIncludeFile('Extensions/P2P/B_p2ptools.js')
+      .addIncludeFile(
+        'Extensions/PlayerAuthentication/playerauthenticationcomponents.js'
+      )
+      .addIncludeFile(
+        'Extensions/PlayerAuthentication/playerauthenticationtools.js'
+      )
+      .addIncludeFile('Extensions/Multiplayer/multiplayercomponents.js')
+      .addIncludeFile('Extensions/Multiplayer/messageManager.js')
+      .addIncludeFile('Extensions/Multiplayer/multiplayerVariablesManager.js')
+      .addIncludeFile('Extensions/Multiplayer/multiplayertools.js')
+      .setFunctionName('gdjs.multiplayer.getCurrentPlayerUsername');
+
     extension
       .addExpression(
         'PlayerPing',
@@ -485,6 +508,29 @@ module.exports = {
       .addIncludeFile('Extensions/Multiplayer/multiplayertools.js')
       .setFunctionName('gdjs.multiplayerMessageManager.getPlayerPing');
 
+    extension
+      .addExpression(
+        'CurrentPlayerPing',
+        _('Current player ping in lobby'),
+        _('Get the ping of the current player in the lobby.'),
+        _('Lobbies'),
+        'JsPlatform/Extensions/multiplayer.svg'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/P2P/A_peer.js')
+      .addIncludeFile('Extensions/P2P/B_p2ptools.js')
+      .addIncludeFile(
+        'Extensions/PlayerAuthentication/playerauthenticationcomponents.js'
+      )
+      .addIncludeFile(
+        'Extensions/PlayerAuthentication/playerauthenticationtools.js'
+      )
+      .addIncludeFile('Extensions/Multiplayer/multiplayercomponents.js')
+      .addIncludeFile('Extensions/Multiplayer/messageManager.js')
+      .addIncludeFile('Extensions/Multiplayer/multiplayerVariablesManager.js')
+      .addIncludeFile('Extensions/Multiplayer/multiplayertools.js')
+      .setFunctionName('gdjs.multiplayerMessageManager.getCurrentPlayerPing');
+
     extension
       .addExpressionAndConditionAndAction(
         'number',

diff --git a/Extensions/Multiplayer/messageManager.ts b/Extensions/Multiplayer/messageManager.ts
@@ -1943,6 +1943,11 @@ namespace gdjs {
       return _playersPings[playerNumber] || 0;
     };
 
+    const getCurrentPlayerPing = () => {
+      const currentPlayerNumber = gdjs.multiplayer.getCurrentPlayerNumber();
+      return getPlayerPing(currentPlayerNumber);
+    };
+
     const markPlayerAsDisconnected = (playerNumber: number) => {
       logger.info(`Marking player ${playerNumber} as disconnected.`);
       _playerNumbersWhoJustLeft.push(playerNumber);
@@ -2130,6 +2135,7 @@ namespace gdjs {
       handleHeartbeatsReceived,
       // Connection/Disonnection.
       getPlayerPing,
+      getCurrentPlayerPing,
       updatePlayersPingsForTests,
       handleDisconnectedPeers,
       clearDisconnectedPeers,

diff --git a/Extensions/Multiplayer/multiplayertools.ts b/Extensions/Multiplayer/multiplayertools.ts
@@ -229,6 +229,14 @@ namespace gdjs {
         : `Player ${playerNumber}`;
     };
 
+    /**
+     * Returns the player username of the current player in the lobby.
+     */
+    export const getCurrentPlayerUsername = () => {
+      const currentPlayerNumber = getCurrentPlayerNumber();
+      return getPlayerUsername(currentPlayerNumber);
+    };
+
     const handleLeavingPlayer = (runtimeScene: gdjs.RuntimeScene) => {
       const disconnectedPlayers = gdjs.multiplayerMessageManager.getDisconnectedPlayers();
       if (disconnectedPlayers.length > 0) {