Move teamMembers impl to Lua bindings

avoiding including UniverseClient.hpp and TeamClient.hpp in StarPlayer

1 files changed, 15 insertions, 1 deletions

diff --git a/source/game/scripting/StarPlayerLuaBindings.cpp b/source/game/scripting/StarPlayerLuaBindings.cpp
index 4343531..b0b44a8 100644
--- a/source/game/scripting/StarPlayerLuaBindings.cpp
+++ b/source/game/scripting/StarPlayerLuaBindings.cpp
@@ -11,6 +11,8 @@
 #include "StarStatistics.hpp"
 #include "StarPlayerUniverseMap.hpp"
 #include "StarJsonExtra.hpp"
+#include "StarUniverseClient.hpp"
+#include "StarTeamClient.hpp"
 
 namespace Star {
 
@@ -27,7 +29,19 @@ LuaCallbacks LuaBindings::makePlayerCallbacks(Player* player) {
     }
   });
 
-  callbacks.registerCallback("teamMembers", [player]() { return player->teamMembers(); });
+  callbacks.registerCallback("teamMembers", [player]() -> Maybe<JsonArray> {
+    if (auto client = player->universeClient()) {
+      return client->teamClient()->members().transformed([](TeamClient::Member& member) -> Json {
+        return JsonObject{
+          {"name", member.name},
+          {"uuid", member.uuid.hex()},
+          {"entity", member.entity},
+          {"healthPercentage", member.healthPercentage},
+          {"energyPercentage", member.energyPercentage}};
+      });
+    }
+    return {};
+  });
 
   callbacks.registerCallback(   "humanoidIdentity", [player]()         { return player->humanoid()->identity().toJson();  });
   callbacks.registerCallback("setHumanoidIdentity", [player](Json const& id) { player->setIdentity(HumanoidIdentity(id)); });