Add motto changing, dancing

billsonnn · billsonnn · commit c9c03ba02c91 · 2026-02-08T20:39:36.000-05:00
diff --git a/Turbo.PacketHandlers/Room/Avatar/ChangeMottoMessageHandler.cs b/Turbo.PacketHandlers/Room/Avatar/ChangeMottoMessageHandler.cs
@@ -1,18 +1,28 @@
 using System.Threading;
 using System.Threading.Tasks;
+using Orleans;
 using Turbo.Messages.Registry;
 using Turbo.Primitives.Messages.Incoming.Room.Avatar;
+using Turbo.Primitives.Orleans;
 
 namespace Turbo.PacketHandlers.Room.Avatar;
 
-public class ChangeMottoMessageHandler : IMessageHandler<ChangeMottoMessage>
+public class ChangeMottoMessageHandler(IGrainFactory grainFactory)
+    : IMessageHandler<ChangeMottoMessage>
 {
+    private readonly IGrainFactory _grainFactory = grainFactory;
+
     public async ValueTask HandleAsync(
         ChangeMottoMessage message,
         MessageContext ctx,
         CancellationToken ct
     )
     {
-        await ValueTask.CompletedTask.ConfigureAwait(false);
+        if (ctx.PlayerId < 0)
+            return;
+
+        var player = _grainFactory.GetPlayerGrain(ctx.PlayerId);
+
+        await player.SetMottoAsync(message.Text, ct).ConfigureAwait(false);
     }
 }
diff --git a/Turbo.PacketHandlers/Room/Engine/GetHeightMapMessageHandler.cs b/Turbo.PacketHandlers/Room/Engine/GetHeightMapMessageHandler.cs
@@ -15,10 +15,5 @@ public async ValueTask HandleAsync(
         GetHeightMapMessage message,
         MessageContext ctx,
         CancellationToken ct
-    )
-    {
-        await _roomService
-            .EnterPendingRoomForPlayerIdAsync(ctx.AsActionContext(), ctx.PlayerId, ct)
-            .ConfigureAwait(false);
-    }
+    ) { }
 }
diff --git a/Turbo.Players/Grains/PlayerGrain.cs b/Turbo.Players/Grains/PlayerGrain.cs
@@ -50,6 +50,24 @@ public async Task SetFigureAsync(string figure, AvatarGenderType gender, Cancell
         var playerPresence = _grainFactory.GetPlayerPresenceGrain((int)this.GetPrimaryKeyLong());
 
         await playerPresence.OnFigureUpdatedAsync(summary, ct);
+
+        await WriteToDatabaseAsync(ct);
+    }
+
+    public async Task SetMottoAsync(string text, CancellationToken ct)
+    {
+        state.State.Motto = text;
+        state.State.LastUpdated = DateTime.UtcNow;
+
+        await state.WriteStateAsync(ct);
+
+        var summary = await GetSummaryAsync(ct);
+
+        var playerPresence = _grainFactory.GetPlayerPresenceGrain((int)this.GetPrimaryKeyLong());
+
+        await playerPresence.OnPlayerUpdatedAsync(summary, ct);
+
+        await WriteToDatabaseAsync(ct);
     }
 
     private async Task HydrateAsync(CancellationToken ct)
diff --git a/Turbo.Players/Grains/PlayerPresenceGrain.Avatar.cs b/Turbo.Players/Grains/PlayerPresenceGrain.Avatar.cs
@@ -9,16 +9,8 @@ namespace Turbo.Players.Grains;
 
 internal sealed partial class PlayerPresenceGrain
 {
-    public async Task OnFigureUpdatedAsync(PlayerSummarySnapshot snapshot, CancellationToken ct)
+    public async Task OnPlayerUpdatedAsync(PlayerSummarySnapshot snapshot, CancellationToken ct)
     {
-        await SendComposerAsync(
-            new FigureUpdateEventMessageComposer
-            {
-                Figure = snapshot.Figure,
-                Gender = snapshot.Gender,
-            }
-        );
-
         if (_state.ActiveRoomId > 0)
         {
             await SendComposerAsync(
@@ -37,4 +29,17 @@ await SendComposerAsync(
             await room.UpdateAvatarWithPlayerAsync(snapshot, ct);
         }
     }
+
+    public async Task OnFigureUpdatedAsync(PlayerSummarySnapshot snapshot, CancellationToken ct)
+    {
+        await SendComposerAsync(
+            new FigureUpdateEventMessageComposer
+            {
+                Figure = snapshot.Figure,
+                Gender = snapshot.Gender,
+            }
+        );
+
+        await OnPlayerUpdatedAsync(snapshot, ct);
+    }
 }
diff --git a/Turbo.Primitives/Messages/Incoming/Room/Avatar/ChangeMottoMessage.cs b/Turbo.Primitives/Messages/Incoming/Room/Avatar/ChangeMottoMessage.cs
@@ -2,4 +2,7 @@
 
 namespace Turbo.Primitives.Messages.Incoming.Room.Avatar;
 
-public record ChangeMottoMessage : IMessageEvent { }
+public record ChangeMottoMessage : IMessageEvent
+{
+    public required string Text { get; init; }
+}
diff --git a/Turbo.Primitives/Players/Grains/IPlayerGrain.cs b/Turbo.Primitives/Players/Grains/IPlayerGrain.cs
@@ -9,6 +9,7 @@ namespace Turbo.Primitives.Grains.Players;
 public interface IPlayerGrain : IGrainWithIntegerKey
 {
     public Task SetFigureAsync(string figure, AvatarGenderType gender, CancellationToken ct);
+    public Task SetMottoAsync(string text, 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
@@ -6,5 +6,6 @@ namespace Turbo.Primitives.Players.Grains;
 
 public partial interface IPlayerPresenceGrain
 {
+    public Task OnPlayerUpdatedAsync(PlayerSummarySnapshot snapshot, CancellationToken ct);
     public Task OnFigureUpdatedAsync(PlayerSummarySnapshot snapshot, CancellationToken ct);
 }
diff --git a/Turbo.Primitives/Players/Grains/IPlayerWalletGrain.cs b/Turbo.Primitives/Players/Grains/IPlayerWalletGrain.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
 using Orleans;
-using Turbo.Primitives.Orleans.Snapshots.Players;
 using Turbo.Primitives.Players.Wallet;
 
 namespace Turbo.Primitives.Players.Grains;
diff --git a/Turbo.Primitives/Rooms/Object/Avatars/IRoomAvatar.cs b/Turbo.Primitives/Rooms/Object/Avatars/IRoomAvatar.cs
@@ -1,5 +1,4 @@
 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;
@@ -26,8 +25,6 @@ public interface IRoomAvatar : IRoomObject
     public Rotation HeadRotation { get; }
     public Dictionary<AvatarStatusType, string> Statuses { get; }
 
-    public AvatarDanceType DanceType { get; }
-
     public Altitude PostureOffset { get; set; }
     public int GoalTileId { get; }
     public int NextTileId { get; set; }
@@ -43,7 +40,6 @@ public interface IRoomAvatar : IRoomObject
     public void SetHeight(Altitude z);
     public void SetBodyRotation(Rotation rot);
     public void SetHeadRotation(Rotation rot);
-    public bool SetDance(AvatarDanceType danceType = AvatarDanceType.None);
     public void Sit(bool flag = true, Altitude? height = null, Rotation? rot = null);
     public void Lay(bool flag = true, Altitude? height = null, Rotation? rot = null);
 
diff --git a/Turbo.Primitives/Rooms/Object/Avatars/IRoomPlayer.cs b/Turbo.Primitives/Rooms/Object/Avatars/IRoomPlayer.cs
@@ -10,5 +10,7 @@ public interface IRoomPlayer : IRoomAvatar<IRoomPlayer, IRoomPlayerLogic, IRoomP
     new IRoomPlayerLogic Logic { get; }
     public PlayerId PlayerId { get; }
     public AvatarGenderType Gender { get; }
+    public AvatarDanceType DanceType { get; }
     public bool UpdateWithPlayer(PlayerSummarySnapshot snapshot);
+    public bool SetDance(AvatarDanceType danceType = AvatarDanceType.None);
 }
diff --git a/Turbo.Primitives/Rooms/Snapshots/Avatars/RoomPlayerAvatarSnapshot.cs b/Turbo.Primitives/Rooms/Snapshots/Avatars/RoomPlayerAvatarSnapshot.cs
@@ -10,20 +10,23 @@ public sealed record RoomPlayerAvatarSnapshot : RoomAvatarSnapshot
     public required AvatarGenderType Gender { get; init; }
 
     [Id(13)]
-    public required int GroupId { get; init; }
+    public required AvatarDanceType DanceType { get; init; }
 
     [Id(14)]
-    public required int GroupStatus { get; init; }
+    public required int GroupId { get; init; }
 
     [Id(15)]
-    public required string GroupName { get; init; }
+    public required int GroupStatus { get; init; }
 
     [Id(16)]
-    public required string SwimFigure { get; init; }
+    public required string GroupName { get; init; }
 
     [Id(17)]
-    public required int ActivityPoints { get; init; }
+    public required string SwimFigure { get; init; }
 
     [Id(18)]
+    public required int ActivityPoints { get; init; }
+
+    [Id(19)]
     public required bool IsModerator { get; init; }
 }
diff --git a/Turbo.Revisions/Revision20260112/Parsers/Room/Avatar/ChangeMottoMessageParser.cs b/Turbo.Revisions/Revision20260112/Parsers/Room/Avatar/ChangeMottoMessageParser.cs
@@ -6,5 +6,6 @@ namespace Turbo.Revisions.Revision20260112.Parsers.Room.Avatar;
 
 internal class ChangeMottoMessageParser : IParser
 {
-    public IMessageEvent Parse(IClientPacket packet) => new ChangeMottoMessage();
+    public IMessageEvent Parse(IClientPacket packet) =>
+        new ChangeMottoMessage { Text = packet.PopString() };
 }
diff --git a/Turbo.Rooms/Grains/Modules/RoomAvatarModule.cs b/Turbo.Rooms/Grains/Modules/RoomAvatarModule.cs
@@ -258,12 +258,13 @@ CancellationToken ct
         if (
             objectId <= 0
             || !_roomGrain._state.AvatarsByObjectId.TryGetValue(objectId.Value, out var avatar)
-            || !avatar.SetDance(danceType)
+            || avatar is not IRoomPlayer player
+            || !player.SetDance(danceType)
         )
             return Task.FromResult(false);
 
         _ = _roomGrain.SendComposerToRoomAsync(
-            new DanceMessageComposer { ObjectId = avatar.ObjectId, DanceType = avatar.DanceType }
+            new DanceMessageComposer { ObjectId = avatar.ObjectId, DanceType = player.DanceType }
         );
 
         return Task.FromResult(true);
diff --git a/Turbo.Rooms/Object/Avatars/Player/RoomPlayerAvatar.cs b/Turbo.Rooms/Object/Avatars/Player/RoomPlayerAvatar.cs
@@ -16,6 +16,7 @@ public sealed class RoomPlayerAvatar
 
     public required PlayerId PlayerId { get; init; }
     public AvatarGenderType Gender { get; private set; } = AvatarGenderType.Male;
+    public AvatarDanceType DanceType { get; private set; } = AvatarDanceType.None;
 
     public int GroupId { get; init; } = -1;
     public int GroupStatus { get; init; } = -1;
@@ -34,6 +35,24 @@ public bool UpdateWithPlayer(PlayerSummarySnapshot snapshot)
         return true;
     }
 
+    public bool SetDance(AvatarDanceType danceType = AvatarDanceType.None)
+    {
+        if (DanceType == danceType)
+            return false;
+
+        if (HasStatus(AvatarStatusType.Sit, AvatarStatusType.Lay))
+            return false;
+
+        // check if dance valid
+        // check if dance is hc only / validate hc
+
+        DanceType = danceType;
+
+        _snapshot = null;
+
+        return true;
+    }
+
     protected override RoomPlayerAvatarSnapshot BuildSnapshot()
     {
         var statusString = new StringBuilder("/");
@@ -56,6 +75,7 @@ protected override RoomPlayerAvatarSnapshot BuildSnapshot()
             HeadRotation = HeadRotation,
             Status = statusString.ToString(),
             Gender = Gender,
+            DanceType = DanceType,
             GroupId = GroupId,
             GroupStatus = GroupStatus,
             GroupName = GroupName,
diff --git a/Turbo.Rooms/Object/Avatars/RoomAvatar.cs b/Turbo.Rooms/Object/Avatars/RoomAvatar.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Turbo.Primitives.Orleans.Snapshots.Players;
 using Turbo.Primitives.Rooms.Enums;
 using Turbo.Primitives.Rooms.Object;
 using Turbo.Primitives.Rooms.Object.Avatars;
@@ -26,7 +25,6 @@ public abstract class RoomAvatar<TSelf, TLogic, TContext>
     public string Figure { get; protected set; } = string.Empty;
 
     public Rotation HeadRotation { get; protected set; }
-    public AvatarDanceType DanceType { get; private set; } = AvatarDanceType.None;
     public Dictionary<AvatarStatusType, string> Statuses { get; } = [];
 
     public Altitude PostureOffset { get; set; } = Altitude.Zero;
@@ -42,7 +40,7 @@ public abstract class RoomAvatar<TSelf, TLogic, TContext>
 
     private int _goalTries = 0;
 
-    private RoomAvatarSnapshot? _snapshot;
+    protected RoomAvatarSnapshot? _snapshot;
 
     public bool SetGoalTileId(int tileId)
     {
@@ -108,22 +106,6 @@ public void SetHeadRotation(Rotation rot)
         MarkDirty();
     }
 
-    public bool SetDance(AvatarDanceType danceType = AvatarDanceType.None)
-    {
-        if (DanceType == danceType)
-            return false;
-
-        if (HasStatus(AvatarStatusType.Sit, AvatarStatusType.Lay))
-            return false;
-
-        // check if dance valid
-        // check if dance is hc only / validate hc
-
-        DanceType = danceType;
-
-        return true;
-    }
-
     public void Sit(bool flag = true, Altitude? height = null, Rotation? rot = null)
     {
         var finalHeight = height ?? Altitude.FromValue(0.5);
diff --git a/Turbo.Rooms/RoomService.cs b/Turbo.Rooms/RoomService.cs

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,28 @@`
`1`	`1`	`using System.Threading;`
`2`	`2`	`using System.Threading.Tasks;`
	`3`	`+using Orleans;`
`3`	`4`	`using Turbo.Messages.Registry;`
`4`	`5`	`using Turbo.Primitives.Messages.Incoming.Room.Avatar;`
	`6`	`+using Turbo.Primitives.Orleans;`
`5`	`7`
`6`	`8`	`namespace Turbo.PacketHandlers.Room.Avatar;`
`7`	`9`
`8`		`-public class ChangeMottoMessageHandler : IMessageHandler<ChangeMottoMessage>`
	`10`	`+public class ChangeMottoMessageHandler(IGrainFactory grainFactory)`
	`11`	`+ : IMessageHandler<ChangeMottoMessage>`
`9`	`12`	`{`
	`13`	`+ private readonly IGrainFactory _grainFactory = grainFactory;`
	`14`	`+`
`10`	`15`	`public async ValueTask HandleAsync(`
`11`	`16`	`ChangeMottoMessage message,`
`12`	`17`	`MessageContext ctx,`
`13`	`18`	`CancellationToken ct`
`14`	`19`	`)`
`15`	`20`	`{`
`16`		`- await ValueTask.CompletedTask.ConfigureAwait(false);`
	`21`	`+ if (ctx.PlayerId < 0)`
	`22`	`+ return;`
	`23`	`+`
	`24`	`+ var player = _grainFactory.GetPlayerGrain(ctx.PlayerId);`
	`25`	`+`
	`26`	`+ await player.SetMottoAsync(message.Text, ct).ConfigureAwait(false);`
`17`	`27`	`}`
`18`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,16 +9,8 @@ namespace Turbo.Players.Grains;`
`9`	`9`
`10`	`10`	`internal sealed partial class PlayerPresenceGrain`
`11`	`11`	`{`
`12`		`- public async Task OnFigureUpdatedAsync(PlayerSummarySnapshot snapshot, CancellationToken ct)`
	`12`	`+ public async Task OnPlayerUpdatedAsync(PlayerSummarySnapshot snapshot, CancellationToken ct)`
`13`	`13`	`{`
`14`		`- await SendComposerAsync(`
`15`		`- new FigureUpdateEventMessageComposer`
`16`		`- {`
`17`		`- Figure = snapshot.Figure,`
`18`		`- Gender = snapshot.Gender,`
`19`		`- }`
`20`		`- );`
`21`		`-`
`22`	`14`	`if (_state.ActiveRoomId > 0)`
`23`	`15`	`{`
`24`	`16`	`await SendComposerAsync(`
`@@ -37,4 +29,17 @@ await SendComposerAsync(`
`37`	`29`	`await room.UpdateAvatarWithPlayerAsync(snapshot, ct);`
`38`	`30`	`}`
`39`	`31`	`}`
	`32`	`+`
	`33`	`+ public async Task OnFigureUpdatedAsync(PlayerSummarySnapshot snapshot, CancellationToken ct)`
	`34`	`+ {`
	`35`	`+ await SendComposerAsync(`
	`36`	`+ new FigureUpdateEventMessageComposer`
	`37`	`+ {`
	`38`	`+ Figure = snapshot.Figure,`
	`39`	`+ Gender = snapshot.Gender,`
	`40`	`+ }`
	`41`	`+ );`
	`42`	`+`
	`43`	`+ await OnPlayerUpdatedAsync(snapshot, ct);`
	`44`	`+ }`
`40`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace Turbo.Primitives.Grains.Players;`
`9`	`9`	`public interface IPlayerGrain : IGrainWithIntegerKey`
`10`	`10`	`{`
`11`	`11`	`public Task SetFigureAsync(string figure, AvatarGenderType gender, CancellationToken ct);`
	`12`	`+ public Task SetMottoAsync(string text, CancellationToken ct);`
`12`	`13`	`public Task<PlayerSummarySnapshot> GetSummaryAsync(CancellationToken ct);`
`13`	`14`
`14`	`15`	`public Task<PlayerExtendedProfileSnapshot> GetExtendedProfileSnapshotAsync(`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,6 @@ namespace Turbo.Primitives.Players.Grains;`
`6`	`6`
`7`	`7`	`public partial interface IPlayerPresenceGrain`
`8`	`8`	`{`
	`9`	`+ public Task OnPlayerUpdatedAsync(PlayerSummarySnapshot snapshot, CancellationToken ct);`
`9`	`10`	`public Task OnFigureUpdatedAsync(PlayerSummarySnapshot snapshot, CancellationToken ct);`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,7 @@ public interface IRoomPlayer : IRoomAvatar<IRoomPlayer, IRoomPlayerLogic, IRoomP`
`10`	`10`	`new IRoomPlayerLogic Logic { get; }`
`11`	`11`	`public PlayerId PlayerId { get; }`
`12`	`12`	`public AvatarGenderType Gender { get; }`
	`13`	`+ public AvatarDanceType DanceType { get; }`
`13`	`14`	`public bool UpdateWithPlayer(PlayerSummarySnapshot snapshot);`
	`15`	`+ public bool SetDance(AvatarDanceType danceType = AvatarDanceType.None);`
`14`	`16`	`}`