@quenty/teamutils 10.15.0 → 10.15.1-canary.534.c6c59e8.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [10.15.1-canary.534.c6c59e8.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/teamutils@10.15.0...@quenty/teamutils@10.15.1-canary.534.c6c59e8.0) (2025-02-18)
+
+
+### Features
+
+* Add RxTeamUtils.observePlayerTeam(player) and RxTeamUtils.observePlayerTeamColor(player) ([046d6cd](https://github.com/Quenty/NevermoreEngine/commit/046d6cd192234c7165a1b4820aa68efad484ce4c))
+
+
+
+
+
 # [10.15.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/teamutils@10.14.0...@quenty/teamutils@10.15.0) (2024-12-15)
 
 **Note:** Version bump only for package @quenty/teamutils

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/teamutils",
-  "version": "10.15.0",
+  "version": "10.15.1-canary.534.c6c59e8.0",
   "description": "Team utility methods",
   "keywords": [
     "Roblox",
@@ -28,11 +28,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@quenty/brio": "^14.15.0",
-    "@quenty/instanceutils": "^13.15.0",
-    "@quenty/loader": "^10.7.1",
-    "@quenty/maid": "^3.4.0",
-    "@quenty/rx": "^13.15.0"
+    "@quenty/brio": "14.15.1-canary.534.c6c59e8.0",
+    "@quenty/instanceutils": "13.15.1-canary.534.c6c59e8.0",
+    "@quenty/loader": "10.7.2-canary.534.c6c59e8.0",
+    "@quenty/maid": "3.4.0",
+    "@quenty/rx": "13.15.1-canary.534.c6c59e8.0"
   },
-  "gitHead": "0a20ace4dc7d38f8c889bf73b716b33e8a767c54"
+  "gitHead": "c6c59e8e4b98466955aafe50473027d316ab4ac7"
 }

package/src/Shared/RxTeamUtils.lua

@@ -12,9 +12,38 @@ local Observable = require("Observable")
 local Maid = require("Maid")
 local Brio = require("Brio")
 local RxBrioUtils = require("RxBrioUtils")
+local RxInstanceUtils = require("RxInstanceUtils")
+local Rx = require("Rx")
 
 local RxTeamUtils = {}
 
+function RxTeamUtils.observePlayerTeam(player)
+	return Rx.combineLatest({
+		team = RxInstanceUtils.observeProperty(player, "Team");
+		neutral = RxInstanceUtils.observeProperty(player, "Neutral")
+	}):Pipe({
+		Rx.map(function(state)
+			if state.neutral then
+				return nil
+			end
+
+			return state.team
+		end)
+	})
+end
+
+function RxTeamUtils.observePlayerTeamColor(player)
+	return RxTeamUtils.observePlayerTeam(player):Pipe({
+		Rx.switchMap(function(team)
+			if team then
+				return RxInstanceUtils.observeProperty(team, "TeamColor")
+			else
+				return Rx.of(nil)
+			end
+		end)
+	})
+end
+
 --[=[
 	Observes all players on a taem.
 

package/src/Shared/TeamUtils.lua

@@ -6,13 +6,21 @@
 local TeamUtils = {}
 
 function TeamUtils.areTeamMates(playerA, playerB)
-	if playerA.Neutral or playerB.Neutral then
+	local teamA = TeamUtils.getTeam(playerA)
+	local teamB = TeamUtils.getTeam(playerB)
+	if not teamA or not teamB then
 		return false
 	end
-	if not playerA.Team or not playerB.Team then
-		return false
+
+	return teamA == teamB
+end
+
+function TeamUtils.getTeam(player)
+	if player.Neutral then
+		return nil
 	end
-	return playerA.Team == playerB.Team
+
+	return player.Team
 end
 
 return TeamUtils