Move rank info

Kaioru · Aug 28, 2024 · fe33306 · fe33306
1 parent 2a6668c
commit fe33306
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 29 deletions.
diff --git a/src/common/Edelstein.Common.Gameplay.Login/Handling/Pipes/UserOnPacketSelectWorld.cs b/src/common/Edelstein.Common.Gameplay.Login/Handling/Pipes/UserOnPacketSelectWorld.cs
@@ -1,13 +1,11 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Edelstein.Protocol.Gameplay.Contracts.Packets.Shared;
 using Edelstein.Protocol.Gameplay.Handling;
 using Edelstein.Protocol.Gameplay.Login;
 using Edelstein.Protocol.Gameplay.Login.Contracts.Packets;
 using Edelstein.Protocol.Gameplay.Login.Contracts.Packets.Recv;
 using Edelstein.Protocol.Gameplay.Login.Contracts.Packets.Send;
-using Edelstein.Protocol.Gameplay.Login.Contracts.Packets.Shared;
 using Edelstein.Protocol.Utilities.Pipelines;
 
 namespace Edelstein.Common.Gameplay.Login.Handling.Pipes;

diff --git a/src/protocol/Edelstein.Protocol.Gameplay.Login/Contracts/Packets/Send/SelectWorldResult.cs b/src/protocol/Edelstein.Protocol.Gameplay.Login/Contracts/Packets/Send/SelectWorldResult.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using BinarySerialization;
 using Edelstein.Protocol.Gameplay.Contracts.Packets.Shared;
-using Edelstein.Protocol.Gameplay.Login.Contracts.Packets.Shared;
 using Edelstein.Protocol.Network.Packets;
 
 namespace Edelstein.Protocol.Gameplay.Login.Contracts.Packets.Send;
@@ -50,5 +49,20 @@ public record SelectWorldResultSuccessInfoCharacter : StructuredBasePacket
 
     [FieldOrder(5)] 
     [SerializeWhen(nameof(IsRanked), true)]
-    public StructuredRankInfo RankInfo { get; init; } = new();
+    public SelectWorldResultSuccessInfoCharacterRank Rank { get; init; } = new();
+}
+
+public record SelectWorldResultSuccessInfoCharacterRank : StructuredBasePacket
+{
+    [FieldOrder(0)]
+    public int WorldRank { get; init; }
+
+    [FieldOrder(1)]
+    public int WorldRankGap { get; init; }
+
+    [FieldOrder(2)]
+    public int JobRank { get; init; }
+
+    [FieldOrder(3)]
+    public int JobRankGap { get; init; }
 }
diff --git a/...protocol/Edelstein.Protocol.Gameplay.Login/Contracts/Packets/Shared/StructuredRankInfo.cs b/...protocol/Edelstein.Protocol.Gameplay.Login/Contracts/Packets/Shared/StructuredRankInfo.cs
diff --git a/src/protocol/Edelstein.Protocol.Gameplay/Contracts/Packets/Shared/StructuredAvatarLook.cs b/src/protocol/Edelstein.Protocol.Gameplay/Contracts/Packets/Shared/StructuredAvatarLook.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using BinarySerialization;
 using Edelstein.Protocol.Network.Packets;
 

diff --git a/src/protocol/Edelstein.Protocol.Gameplay/Contracts/Packets/Shared/StructuredCharacterStat.cs b/src/protocol/Edelstein.Protocol.Gameplay/Contracts/Packets/Shared/StructuredCharacterStat.cs
@@ -1,5 +1,4 @@
-using System;
-using BinarySerialization;
+using BinarySerialization;
 using Edelstein.Protocol.Network.Packets;
 
 namespace Edelstein.Protocol.Gameplay.Contracts.Packets.Shared;