Add figure update

billsonnn · billsonnn · commit 2f3e86a24d4e · 2026-02-08T18:53:40.000-05:00
diff --git a/Turbo.PacketHandlers/Register/UpdateFigureDataMessageHandler.cs b/Turbo.PacketHandlers/Register/UpdateFigureDataMessageHandler.cs
@@ -1,18 +1,35 @@
 using System.Threading;
 using System.Threading.Tasks;
+using Orleans;
 using Turbo.Messages.Registry;
 using Turbo.Primitives.Messages.Incoming.Register;
+using Turbo.Primitives.Orleans;
+using Turbo.Primitives.Rooms.Enums;
 
 namespace Turbo.PacketHandlers.Register;
 
-public class UpdateFigureDataMessageHandler : IMessageHandler<UpdateFigureDataMessage>
+public class UpdateFigureDataMessageHandler(IGrainFactory grainFactory)
+    : IMessageHandler<UpdateFigureDataMessage>
 {
+    private readonly IGrainFactory _grainFactory = grainFactory;
+
     public async ValueTask HandleAsync(
         UpdateFigureDataMessage message,
         MessageContext ctx,
         CancellationToken ct
     )
     {
-        await ValueTask.CompletedTask.ConfigureAwait(false);
+        if (ctx.PlayerId < 0)
+            return;
+
+        var player = _grainFactory.GetPlayerGrain(ctx.PlayerId);
+
+        await player
+            .SetFigureAsync(
+                message.Figure,
+                AvatarGenderTypeExtensions.FromLegacyString(message.Gender),
+                ct
+            )
+            .ConfigureAwait(false);
     }
 }
diff --git a/Turbo.Players/Grains/PlayerGrain.cs b/Turbo.Players/Grains/PlayerGrain.cs
@@ -13,6 +13,7 @@
 using Turbo.Primitives.Orleans.Snapshots.Players;
 using Turbo.Primitives.Orleans.States.Players;
 using Turbo.Primitives.Players;
+using Turbo.Primitives.Rooms.Enums;
 
 namespace Turbo.Players.Grains;
 
@@ -36,6 +37,21 @@ public override async Task OnDeactivateAsync(DeactivationReason reason, Cancella
         await WriteToDatabaseAsync(ct);
     }
 
+    public async Task SetFigureAsync(string figure, AvatarGenderType gender, CancellationToken ct)
+    {
+        state.State.Figure = figure;
+        state.State.Gender = gender;
+        state.State.LastUpdated = DateTime.UtcNow;
+
+        await state.WriteStateAsync(ct);
+
+        var summary = await GetSummaryAsync(ct);
+
+        var playerPresence = _grainFactory.GetPlayerPresenceGrain((int)this.GetPrimaryKeyLong());
+
+        await playerPresence.OnFigureUpdatedAsync(summary, ct);
+    }
+
     private async Task HydrateAsync(CancellationToken ct)
     {
         if (state.State.IsLoaded)
@@ -53,6 +69,7 @@ await dbCtx
         state.State.Motto = entity.Motto ?? string.Empty;
         state.State.Figure = entity.Figure ?? string.Empty;
         state.State.Gender = entity.Gender;
+        state.State.AchievementScore = 0;
         state.State.CreatedAt = entity.CreatedAt;
         state.State.LastUpdated = DateTime.UtcNow;
         state.State.IsLoaded = true;
@@ -95,6 +112,7 @@ public Task<PlayerSummarySnapshot> GetSummaryAsync(CancellationToken ct) =>
                 Motto = state.State.Motto,
                 Figure = state.State.Figure,
                 Gender = state.State.Gender,
+                AchievementScore = state.State.AchievementScore,
                 CreatedAt = state.State.CreatedAt,
             }
         );
@@ -110,7 +128,7 @@ public Task<PlayerExtendedProfileSnapshot> GetExtendedProfileSnapshotAsync(Cance
                 Figure = s.Figure,
                 Motto = s.Motto,
                 CreationDate = s.CreatedAt.ToString("yyyy-MM-dd"),
-                AchievementScore = 0,
+                AchievementScore = s.AchievementScore,
                 FriendCount = 0,
                 IsFriend = false,
                 IsFriendRequestSent = false,
diff --git a/Turbo.Players/Grains/PlayerPresenceGrain.Avatar.cs b/Turbo.Players/Grains/PlayerPresenceGrain.Avatar.cs
@@ -0,0 +1,40 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Turbo.Primitives.Messages.Outgoing.Avatar;
+using Turbo.Primitives.Messages.Outgoing.Room.Engine;
+using Turbo.Primitives.Orleans;
+using Turbo.Primitives.Orleans.Snapshots.Players;
+
+namespace Turbo.Players.Grains;
+
+internal sealed partial class PlayerPresenceGrain
+{
+    public async Task OnFigureUpdatedAsync(PlayerSummarySnapshot snapshot, CancellationToken ct)
+    {
+        await SendComposerAsync(
+            new FigureUpdateEventMessageComposer
+            {
+                Figure = snapshot.Figure,
+                Gender = snapshot.Gender,
+            }
+        );
+
+        if (_state.ActiveRoomId > 0)
+        {
+            await SendComposerAsync(
+                new UserChangeMessageComposer
+                {
+                    ObjectId = -1,
+                    Figure = snapshot.Figure,
+                    Gender = snapshot.Gender,
+                    CustomInfo = snapshot.Motto,
+                    AchievementScore = snapshot.AchievementScore,
+                }
+            );
+
+            var room = _grainFactory.GetRoomGrain(_state.ActiveRoomId);
+
+            await room.UpdateAvatarWithPlayerAsync(snapshot, ct);
+        }
+    }
+}
diff --git a/Turbo.Primitives/Messages/Incoming/Register/UpdateFigureDataMessage.cs b/Turbo.Primitives/Messages/Incoming/Register/UpdateFigureDataMessage.cs
@@ -2,4 +2,8 @@
 
 namespace Turbo.Primitives.Messages.Incoming.Register;
 
-public record UpdateFigureDataMessage : IMessageEvent { }
+public record UpdateFigureDataMessage : IMessageEvent
+{
+    public required string Figure { get; init; }
+    public required string Gender { get; init; }
+}
diff --git a/Turbo.Primitives/Messages/Outgoing/Avatar/FigureUpdateEventMessageComposer.cs b/Turbo.Primitives/Messages/Outgoing/Avatar/FigureUpdateEventMessageComposer.cs
@@ -1,10 +1,15 @@
 using Orleans;
 using Turbo.Primitives.Networking;
+using Turbo.Primitives.Rooms.Enums;
 
 namespace Turbo.Primitives.Messages.Outgoing.Avatar;
 
 [GenerateSerializer, Immutable]
 public sealed record FigureUpdateEventMessageComposer : IComposer
 {
-    // TODO: add properties if/when identified
+    [Id(0)]
+    public required string Figure { get; init; }
+
+    [Id(1)]
+    public required AvatarGenderType Gender { get; init; }
 }
diff --git a/Turbo.Primitives/Messages/Outgoing/Room/Engine/UserChangeMessageComposer.cs b/Turbo.Primitives/Messages/Outgoing/Room/Engine/UserChangeMessageComposer.cs
@@ -1,10 +1,25 @@
 using Orleans;
 using Turbo.Primitives.Networking;
+using Turbo.Primitives.Rooms.Enums;
+using Turbo.Primitives.Rooms.Object;
 
 namespace Turbo.Primitives.Messages.Outgoing.Room.Engine;
 
 [GenerateSerializer, Immutable]
 public sealed record UserChangeMessageComposer : IComposer
 {
-    // TODO: add properties if/when identified
+    [Id(0)]
+    public required RoomObjectId ObjectId { get; init; }
+
+    [Id(1)]
+    public required string Figure { get; init; }
+
+    [Id(2)]
+    public required AvatarGenderType Gender { get; init; }
+
+    [Id(3)]
+    public required string CustomInfo { get; init; }
+
+    [Id(4)]
+    public required int AchievementScore { get; init; }
 }
diff --git a/Turbo.Primitives/Messages/Outgoing/Users/UserNameChangedMessageComposer.cs b/Turbo.Primitives/Messages/Outgoing/Users/UserNameChangedMessageComposer.cs
@@ -6,5 +6,12 @@ namespace Turbo.Primitives.Messages.Outgoing.Users;
 [GenerateSerializer, Immutable]
 public sealed record UserNameChangedMessageComposer : IComposer
 {
-    // TODO: add properties if/when identified
+    [Id(0)]
+    public required int WebId { get; init; }
+
+    [Id(1)]
+    public required int Id { get; init; }
+
+    [Id(2)]
+    public required string Name { get; init; }
 }
diff --git a/Turbo.Primitives/Orleans/Snapshots/Players/PlayerSummarySnapshot.cs b/Turbo.Primitives/Orleans/Snapshots/Players/PlayerSummarySnapshot.cs
@@ -24,5 +24,8 @@ public sealed record PlayerSummarySnapshot
     public required AvatarGenderType Gender { get; init; }
 
     [Id(5)]
+    public required int AchievementScore { get; init; }
+
+    [Id(6)]
     public required DateTime CreatedAt { get; init; }
 }
diff --git a/Turbo.Primitives/Orleans/States/Players/PlayerState.cs b/Turbo.Primitives/Orleans/States/Players/PlayerState.cs
@@ -20,11 +20,14 @@ public sealed class PlayerState
     public required AvatarGenderType Gender { get; set; } = AvatarGenderType.Male;
 
     [Id(4)]
-    public required DateTime CreatedAt { get; set; } = DateTime.UtcNow;
+    public required int AchievementScore { get; set; } = 0;
 
     [Id(5)]
-    public required DateTime LastUpdated { get; set; } = DateTime.UtcNow;
+    public required DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 
     [Id(6)]
+    public required DateTime LastUpdated { get; set; } = DateTime.UtcNow;
+
+    [Id(7)]
     public required bool IsLoaded { get; set; } = false;
 }
diff --git a/Turbo.Primitives/Players/Grains/IPlayerGrain.cs b/Turbo.Primitives/Players/Grains/IPlayerGrain.cs
@@ -2,11 +2,13 @@
 using System.Threading.Tasks;
 using Orleans;
 using Turbo.Primitives.Orleans.Snapshots.Players;
+using Turbo.Primitives.Rooms.Enums;
 
 namespace Turbo.Primitives.Grains.Players;
 
 public interface IPlayerGrain : IGrainWithIntegerKey
 {
+    public Task SetFigureAsync(string figure, AvatarGenderType gender, CancellationToken ct);
     public Task<PlayerSummarySnapshot> GetSummaryAsync(CancellationToken ct);
 
     public Task<PlayerExtendedProfileSnapshot> GetExtendedProfileSnapshotAsync(
diff --git a/Turbo.Primitives/Players/Grains/IPlayerPresenceGrain.Avatar.cs b/Turbo.Primitives/Players/Grains/IPlayerPresenceGrain.Avatar.cs
@@ -0,0 +1,10 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Turbo.Primitives.Orleans.Snapshots.Players;
+
+namespace Turbo.Primitives.Players.Grains;
+
+public partial interface IPlayerPresenceGrain
+{
+    public Task OnFigureUpdatedAsync(PlayerSummarySnapshot snapshot, CancellationToken ct);
+}
diff --git a/Turbo.Primitives/Rooms/Enums/AvatarGenderType.cs b/Turbo.Primitives/Rooms/Enums/AvatarGenderType.cs
@@ -18,13 +18,13 @@ public static string ToLegacyString(this AvatarGenderType gender) =>
             _ => throw new ArgumentOutOfRangeException(nameof(gender), gender, null),
         };
 
-    public static AvatarGenderType? FromLegacyString(string genderString) =>
+    public static AvatarGenderType FromLegacyString(string genderString) =>
         genderString switch
         {
             "M" => AvatarGenderType.Male,
             "Male" => AvatarGenderType.Male,
             "F" => AvatarGenderType.Female,
             "Female" => AvatarGenderType.Female,
-            _ => null,
+            _ => AvatarGenderType.Male,
         };
 }
diff --git a/Turbo.Primitives/Rooms/Grains/IRoomGrain.Avatar.cs b/Turbo.Primitives/Rooms/Grains/IRoomGrain.Avatar.cs
@@ -27,6 +27,10 @@ public Task<bool> WalkAvatarToAsync(
         int targetY,
         CancellationToken ct
     );
+    public Task<bool> UpdateAvatarWithPlayerAsync(
+        PlayerSummarySnapshot snapshot,
+        CancellationToken ct
+    );
     public Task<bool> SetAvatarDanceAsync(
         ActionContext ctx,
         AvatarDanceType danceType,
diff --git a/Turbo.Primitives/Rooms/Object/Avatars/IRoomAvatar.cs b/Turbo.Primitives/Rooms/Object/Avatars/IRoomAvatar.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Turbo.Primitives.Orleans.Snapshots.Players;
 using Turbo.Primitives.Rooms.Enums;
 using Turbo.Primitives.Rooms.Object.Logic.Avatars;
 using Turbo.Primitives.Rooms.Snapshots.Avatars;
diff --git a/Turbo.Primitives/Rooms/Object/Avatars/IRoomPlayer.cs b/Turbo.Primitives/Rooms/Object/Avatars/IRoomPlayer.cs
@@ -1,4 +1,6 @@
+using Turbo.Primitives.Orleans.Snapshots.Players;
 using Turbo.Primitives.Players;
+using Turbo.Primitives.Rooms.Enums;
 using Turbo.Primitives.Rooms.Object.Logic.Avatars;
 
 namespace Turbo.Primitives.Rooms.Object.Avatars;
@@ -7,4 +9,6 @@ public interface IRoomPlayer : IRoomAvatar<IRoomPlayer, IRoomPlayerLogic, IRoomP
 {
     new IRoomPlayerLogic Logic { get; }
     public PlayerId PlayerId { get; }
+    public AvatarGenderType Gender { get; }
+    public bool UpdateWithPlayer(PlayerSummarySnapshot snapshot);
 }
diff --git a/Turbo.Revisions/Revision20260112/Parsers/Register/UpdateFigureDataMessageParser.cs b/Turbo.Revisions/Revision20260112/Parsers/Register/UpdateFigureDataMessageParser.cs
@@ -6,5 +6,6 @@ namespace Turbo.Revisions.Revision20260112.Parsers.Register;
 
 internal class UpdateFigureDataMessageParser : IParser
 {
-    public IMessageEvent Parse(IClientPacket packet) => new UpdateFigureDataMessage();
+    public IMessageEvent Parse(IClientPacket packet) =>
+        new UpdateFigureDataMessage { Gender = packet.PopString(), Figure = packet.PopString() };
 }
diff --git a/Turbo.Revisions/Revision20260112/Serializers/Avatar/FigureUpdateEventMessageComposerSerializer.cs b/Turbo.Revisions/Revision20260112/Serializers/Avatar/FigureUpdateEventMessageComposerSerializer.cs
@@ -1,5 +1,6 @@
 using Turbo.Primitives.Messages.Outgoing.Avatar;
 using Turbo.Primitives.Packets;
+using Turbo.Primitives.Rooms.Enums;
 
 namespace Turbo.Revisions.Revision20260112.Serializers.Avatar;
 
@@ -11,6 +12,6 @@ protected override void Serialize(
         FigureUpdateEventMessageComposer message
     )
     {
-        //
+        packet.WriteString(message.Figure).WriteString(message.Gender.ToLegacyString());
     }
 }
diff --git a/Turbo.Revisions/Revision20260112/Serializers/Room/Engine/UserChangeMessageComposerSerializer.cs b/Turbo.Revisions/Revision20260112/Serializers/Room/Engine/UserChangeMessageComposerSerializer.cs
@@ -1,5 +1,6 @@
 using Turbo.Primitives.Messages.Outgoing.Room.Engine;
 using Turbo.Primitives.Packets;
+using Turbo.Primitives.Rooms.Enums;
 
 namespace Turbo.Revisions.Revision20260112.Serializers.Room.Engine;
 
@@ -8,6 +9,11 @@ internal class UserChangeMessageComposerSerializer(int header)
 {
     protected override void Serialize(IServerPacket packet, UserChangeMessageComposer message)
     {
-        //
+        packet
+            .WriteInteger(message.ObjectId)
+            .WriteString(message.Figure)
+            .WriteString(message.Gender.ToLegacyString())
+            .WriteString(message.CustomInfo)
+            .WriteInteger(message.AchievementScore);
     }
 }
diff --git a/Turbo.Revisions/Revision20260112/Serializers/Users/UserNameChangedMessageComposerSerializer.cs b/Turbo.Revisions/Revision20260112/Serializers/Users/UserNameChangedMessageComposerSerializer.cs
@@ -8,6 +8,6 @@ internal class UserNameChangedMessageComposerSerializer(int header)
 {
     protected override void Serialize(IServerPacket packet, UserNameChangedMessageComposer message)
     {
-        //
+        packet.WriteInteger(message.WebId).WriteInteger(message.Id).WriteString(message.Name);
     }
 }
diff --git a/Turbo.Rooms/Grains/Modules/RoomAvatarModule.cs b/Turbo.Rooms/Grains/Modules/RoomAvatarModule.cs
@@ -7,6 +7,7 @@
 using Turbo.Primitives;
 using Turbo.Primitives.Action;
 using Turbo.Primitives.Messages.Outgoing.Room.Action;
+using Turbo.Primitives.Messages.Outgoing.Room.Engine;
 using Turbo.Primitives.Orleans.Snapshots.Players;
 using Turbo.Primitives.Players;
 using Turbo.Primitives.Rooms.Enums;
@@ -220,6 +221,34 @@ public async Task ProcessNextAvatarStepAsync(IRoomAvatar avatar, CancellationTok
         }
     }
 
+    public Task<bool> UpdateAvatarWithPlayerAsync(
+        PlayerSummarySnapshot snapshot,
+        CancellationToken ct
+    )
+    {
+        if (
+            snapshot.PlayerId <= 0
+            || !_roomGrain._state.AvatarsByPlayerId.TryGetValue(snapshot.PlayerId, out var objectId)
+            || !_roomGrain._state.AvatarsByObjectId.TryGetValue(objectId, out var avatar)
+            || avatar is not IRoomPlayer avatarPlayer
+            || !avatarPlayer.UpdateWithPlayer(snapshot)
+        )
+            return Task.FromResult(false);
+
+        _ = _roomGrain.SendComposerToRoomAsync(
+            new UserChangeMessageComposer
+            {
+                ObjectId = avatarPlayer.ObjectId,
+                Figure = avatarPlayer.Figure,
+                Gender = avatarPlayer.Gender,
+                CustomInfo = avatarPlayer.Motto,
+                AchievementScore = snapshot.AchievementScore,
+            }
+        );
+
+        return Task.FromResult(true);
+    }
+
     public Task<bool> SetAvatarDanceAsync(
         RoomObjectId objectId,
         AvatarDanceType danceType,
diff --git a/Turbo.Rooms/Grains/RoomGrain.Avatar.cs b/Turbo.Rooms/Grains/RoomGrain.Avatar.cs
diff --git a/Turbo.Rooms/Object/Avatars/Player/RoomPlayerAvatar.cs b/Turbo.Rooms/Object/Avatars/Player/RoomPlayerAvatar.cs
diff --git a/Turbo.Rooms/Object/Avatars/RoomAvatar.cs b/Turbo.Rooms/Object/Avatars/RoomAvatar.cs
diff --git a/Turbo.Rooms/Providers/RoomAvatarProvider.cs b/Turbo.Rooms/Providers/RoomAvatarProvider.cs

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,12 @@ namespace Turbo.Primitives.Messages.Outgoing.Users;`
`6`	`6`	`[GenerateSerializer, Immutable]`
`7`	`7`	`public sealed record UserNameChangedMessageComposer : IComposer`
`8`	`8`	`{`
`9`		`- // TODO: add properties if/when identified`
	`9`	`+ [Id(0)]`
	`10`	`+ public required int WebId { get; init; }`
	`11`	`+`
	`12`	`+ [Id(1)]`
	`13`	`+ public required int Id { get; init; }`
	`14`	`+`
	`15`	`+ [Id(2)]`
	`16`	`+ public required string Name { get; init; }`
`10`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,8 @@ public sealed record PlayerSummarySnapshot`
`24`	`24`	`public required AvatarGenderType Gender { get; init; }`
`25`	`25`
`26`	`26`	`[Id(5)]`
	`27`	`+ public required int AchievementScore { get; init; }`
	`28`	`+`
	`29`	`+ [Id(6)]`
`27`	`30`	`public required DateTime CreatedAt { get; init; }`
`28`	`31`	`}`