JewelRuby

Maple2.Database/Storage/Game/GameStorage.Guild.cs

@@ -2,6 +2,7 @@
 using Maple2.Model.Enum;
 using Maple2.Model.Game;
 using Maple2.Tools.Extensions;
+using Microsoft.EntityFrameworkCore;
 using Z.EntityFramework.Plus;
 
 namespace Maple2.Database.Storage;
@@ -42,6 +43,140 @@ public IList<GuildMember> GetGuildMembers(IPlayerInfoProvider provider, long gui
                 .ToList();
         }
 
+
+        public IList<Guild> SearchGuilds(IPlayerInfoProvider provider, string guildName = "", GuildFocus? focus = null, int limit = 50) {
+            IQueryable<Model.Guild> query = Context.Guild;
+            if (!string.IsNullOrWhiteSpace(guildName)) {
+                query = query.Where(guild => EF.Functions.Like(guild.Name, $"%{guildName}%"));
+            }
+            if (focus.HasValue && (int) focus.Value != 0) {
+                query = query.Where(guild => guild.Focus == focus.Value);
+            }
+
+            List<long> guildIds = query.OrderBy(guild => guild.Name)
+                .Take(limit)
+                .Select(guild => guild.Id)
+                .ToList();
+
+            var result = new List<Guild>();
+            foreach (long id in guildIds) {
+                Guild? guild = LoadGuild(id, string.Empty);
+                if (guild == null) {
+                    continue;
+                }
+
+                foreach (GuildMember member in GetGuildMembers(provider, id)) {
+                    guild.Members.TryAdd(member.CharacterId, member);
+                    guild.AchievementInfo += member.Info.AchievementInfo;
+                }
+                result.Add(guild);
+            }
+
+            return result;
+        }
+
+        public GuildApplication? CreateGuildApplication(IPlayerInfoProvider provider, long guildId, long applicantId) {
+            Guild? guild = LoadGuild(guildId, string.Empty);
+            PlayerInfo? applicant = provider.GetPlayerInfo(applicantId);
+            if (guild == null || applicant == null) {
+                return null;
+            }
+
+            if (Context.GuildApplication.Any(app => app.GuildId == guildId && app.ApplicantId == applicantId)) {
+                Model.GuildApplication existing = Context.GuildApplication.First(app => app.GuildId == guildId && app.ApplicantId == applicantId);
+                return new GuildApplication {
+                    Id = existing.Id,
+                    Guild = guild,
+                    Applicant = applicant,
+                    CreationTime = existing.CreationTime.ToEpochSeconds(),
+                };
+            }
+
+            var app = new Model.GuildApplication {
+                GuildId = guildId,
+                ApplicantId = applicantId,
+            };
+            Context.GuildApplication.Add(app);
+            if (!SaveChanges()) {
+                return null;
+            }
+
+            return new GuildApplication {
+                Id = app.Id,
+                Guild = guild,
+                Applicant = applicant,
+                CreationTime = app.CreationTime.ToEpochSeconds(),
+            };
+        }
+
+        public GuildApplication? GetGuildApplication(IPlayerInfoProvider provider, long applicationId) {
+            Model.GuildApplication? app = Context.GuildApplication.FirstOrDefault(app => app.Id == applicationId);
+            if (app == null) {
+                return null;
+            }
+
+            Guild? guild = LoadGuild(app.GuildId, string.Empty);
+            PlayerInfo? applicant = provider.GetPlayerInfo(app.ApplicantId);
+            if (guild == null || applicant == null) {
+                return null;
+            }
+
+            return new GuildApplication {
+                Id = app.Id,
+                Guild = guild,
+                Applicant = applicant,
+                CreationTime = app.CreationTime.ToEpochSeconds(),
+            };
+        }
+
+        public IList<GuildApplication> GetGuildApplications(IPlayerInfoProvider provider, long guildId) {
+            List<Model.GuildApplication> applications = Context.GuildApplication.Where(app => app.GuildId == guildId)
+                .OrderByDescending(app => app.CreationTime)
+                .ToList();
+
+            return applications
+                .Select(app => {
+                    Guild? guild = LoadGuild(app.GuildId, string.Empty);
+                    PlayerInfo? applicant = provider.GetPlayerInfo(app.ApplicantId);
+                    if (guild == null || applicant == null) {
+                        return null;
+                    }
+
+                    return new GuildApplication {
+                        Id = app.Id,
+                        Guild = guild,
+                        Applicant = applicant,
+                        CreationTime = app.CreationTime.ToEpochSeconds(),
+                    };
+                })
+                .WhereNotNull()
+                .ToList();
+        }
+
+        public IList<GuildApplication> GetGuildApplicationsByApplicant(IPlayerInfoProvider provider, long applicantId) {
+            List<Model.GuildApplication> applications = Context.GuildApplication.Where(app => app.ApplicantId == applicantId)
+                .OrderByDescending(app => app.CreationTime)
+                .ToList();
+
+            return applications
+                .Select(app => {
+                    Guild? guild = LoadGuild(app.GuildId, string.Empty);
+                    PlayerInfo? applicant = provider.GetPlayerInfo(app.ApplicantId);
+                    if (guild == null || applicant == null) {
+                        return null;
+                    }
+
+                    return new GuildApplication {
+                        Id = app.Id,
+                        Guild = guild,
+                        Applicant = applicant,
+                        CreationTime = app.CreationTime.ToEpochSeconds(),
+                    };
+                })
+                .WhereNotNull()
+                .ToList();
+        }
+
         public Guild? CreateGuild(string name, long leaderId) {
             BeginTransaction();
 
@@ -155,20 +290,18 @@ public bool DeleteGuildApplications(long characterId) {
         public bool SaveGuildMembers(long guildId, ICollection<GuildMember> members) {
             Dictionary<long, GuildMember> saveMembers = members
                 .ToDictionary(member => member.CharacterId, member => member);
-            IEnumerable<Model.GuildMember> existingMembers = Context.GuildMember
+            HashSet<long> existingMembers = Context.GuildMember
                 .Where(member => member.GuildId == guildId)
-                .Select(member => new Model.GuildMember {
-                    CharacterId = member.CharacterId,
-                });
+                .Select(member => member.CharacterId)
+                .ToHashSet();
 
-            foreach (Model.GuildMember member in existingMembers) {
-                if (saveMembers.Remove(member.CharacterId, out GuildMember? gameMember)) {
+            foreach ((long characterId, GuildMember gameMember) in saveMembers) {
+                if (existingMembers.Contains(characterId)) {
                     Context.GuildMember.Update(gameMember);
                 } else {
-                    Context.GuildMember.Remove(member);
+                    Context.GuildMember.Add(gameMember);
                 }
             }
-            Context.GuildMember.AddRange(saveMembers.Values.Select<GuildMember, Model.GuildMember>(member => member));
 
             return SaveChanges();
         }

Maple2.Database/Storage/Game/GameStorage.User.cs

@@ -582,9 +582,9 @@ public Account CreateAccount(Account account, string password) {
             model.Password = BCrypt.Net.BCrypt.HashPassword(password, 13);
 #if DEBUG
             model.Currency = new AccountCurrency {
-                Meret = 9_999_999,
+                Meret = 1_000_00,
             };
-            model.Permissions = AdminPermissions.Admin.ToString();
+//            model.Permissions = AdminPermissions.Admin.ToString();
 #endif
             Context.Account.Add(model);
             Context.SaveChanges(); // Exception if failed.
@@ -609,7 +609,7 @@ public Account CreateAccount(Account account, string password) {
             model.Channel = -1;
 #if DEBUG
             model.Currency = new CharacterCurrency {
-                Meso = 999999999,
+                Meso = 500000,
             };
 #endif
             Context.Character.Add(model);

Maple2.Model/Enum/GameEventUserValueType.cs

@@ -6,14 +6,10 @@ public enum GameEventUserValueType {
     // Attendance Event
     AttendanceActive = 100, //?? maybe. String is "True"
     AttendanceCompletedTimestamp = 101,
-    AttendanceRewardsClaimed = 102, // Also used for Cash Attendance and DT Attendance
+    AttendanceRewardsClaimed = 102,
     AttendanceEarlyParticipationRemaining = 103,
-    AttendanceNear = 105,
     AttendanceAccumulatedTime = 106,
 
-    // ReturnUser
-    ReturnUser = 320, // IsReturnUser
-
     // DTReward
     DTRewardStartTime = 700, // start time
     DTRewardCurrentTime = 701, // current item accumulated time
@@ -29,22 +25,10 @@ public enum GameEventUserValueType {
     GalleryCardFlipCount = 1600,
     GalleryClaimReward = 1601,
 
-    // Snowman Event
-    SnowflakeCount = 1700,
-    DailyCompleteCount = 1701,
-    AccumCompleteCount = 1702,
-    AccumCompleteRewardReceived = 1703,
-
     // Rock Paper Scissors Event
     RPSDailyMatches = 1800,
     RPSRewardsClaimed = 1801,
 
-    // Couple Dance
-    CoupleDanceBannerOpen = 2100,
-    CoupleDanceRewardState = 2101, // completed/bonus/received flags
-
-    CollectItemGroup = 2200, // Meta Badge event. Serves as a flag for tiers
-
     // Bingo - TODO: These are not the actual confirmed values. Just using it as a way to store this data for now.
     BingoUid = 4000,
     BingoRewardsClaimed = 4001,

Maple2.Model/Game/Dungeon/DungeonUserRecord.cs

@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using Maple2.Model.Enum;
 using Maple2.PacketLib.Tools;
+using Maple2.Tools.Extensions;
 
 namespace Maple2.Model.Game.Dungeon;
 
@@ -86,5 +87,23 @@ public void WriteTo(IByteWriter writer) {
             writer.WriteBool(item.Unknown2);
             writer.WriteBool(item.Unknown3);
         }
+
+        // Party meter / performance details.
+        // Keep this block after the reward data to preserve the packet layout that already works
+        // for the personal reward/result UI, while still exposing dungeon accumulation records
+        // to clients that read the extended statistics section.
+        writer.WriteInt(AccumulationRecords.Count);
+        foreach ((DungeonAccumulationRecordType type, int value) in AccumulationRecords.OrderBy(entry => (int) entry.Key)) {
+            writer.Write<DungeonAccumulationRecordType>(type);
+            writer.WriteInt(value);
+        }
+
+        writer.WriteInt(Missions.Count);
+        foreach (DungeonMission mission in Missions.Values.OrderBy(mission => mission.Id)) {
+            writer.WriteClass<DungeonMission>(mission);
+        }
+
+        writer.Write<DungeonBonusFlag>(Flag);
+        writer.WriteInt(Round);
     }
 }

Maple2.Model/Game/Market/SoldUgcMarketItem.cs

@@ -10,21 +10,25 @@ public class SoldUgcMarketItem : IByteSerializable {
     public required string Name { get; init; }
     public long SoldTime { get; init; }
     public long AccountId { get; init; }
-
+    public int Count { get; init; } = 1;
 
     public void WriteTo(IByteWriter writer) {
         writer.WriteLong(Id);
-        writer.WriteLong();
+        writer.WriteLong(); 
         writer.WriteUnicodeString(Name);
-        writer.WriteInt();
-        writer.WriteInt();
-        writer.WriteLong();
-        writer.WriteLong();
-        writer.WriteUnicodeString();
-        writer.WriteUnicodeString();
-        writer.WriteInt();
+
+        writer.WriteInt(Count);  
+        writer.WriteInt();      
+
+        writer.WriteLong(); 
+        writer.WriteLong(); 
+        writer.WriteUnicodeString(); 
+        writer.WriteUnicodeString(); 
+        writer.WriteInt(); 
+
         writer.WriteLong(Price);
         writer.WriteLong(SoldTime);
         writer.WriteLong(Profit);
     }
 }
+

Maple2.Model/Game/Shop/RestrictedBuyData.cs

@@ -49,9 +49,11 @@ public readonly struct BuyTimeOfDay {
     public int EndTimeOfDay { get; } // time end in seconds. ex 10600 = 2:56 AM
 
     [JsonConstructor]
-    public BuyTimeOfDay(int startTime, int endTime) {
-        StartTimeOfDay = startTime;
-        EndTimeOfDay = endTime;
+    // System.Text.Json requires every parameter on the [JsonConstructor] to bind to a
+    // property/field on the type. Parameter names must match property names (case-insensitive).
+    public BuyTimeOfDay(int startTimeOfDay, int endTimeOfDay) {
+        StartTimeOfDay = startTimeOfDay;
+        EndTimeOfDay = endTimeOfDay;
     }
 
     public BuyTimeOfDay Clone() {

Maple2.Model/Metadata/Constants.cs

@@ -123,7 +123,7 @@ public static class Constant {
 
     public const bool DebugTriggers = false; // Set to true to enable debug triggers. (It'll write triggers to files and load triggers from files instead of DB)
 
-    public const bool AllowUnicodeInNames = false; // Allow Unicode characters in character and guild names
+    public const bool AllowUnicodeInNames = true; // Allow Unicode characters in character and guild names
 
     public static IReadOnlyDictionary<string, int> ContentRewards { get; } = new Dictionary<string, int> {
         { "miniGame", 1005 },

Maple2.Server.Core/Formulas/BonusAttack.cs

@@ -9,11 +9,10 @@ public static double Coefficient(int rightHandRarity, int leftHandRarity, JobCod
         }
 
         double weaponBonusAttackCoefficient = RarityMultiplier(rightHandRarity);
-        if (leftHandRarity == 0) {
-            return weaponBonusAttackCoefficient;
+        if (leftHandRarity > 0) {
+            weaponBonusAttackCoefficient = 0.5 * (weaponBonusAttackCoefficient + RarityMultiplier(leftHandRarity));
         }
 
-        weaponBonusAttackCoefficient = 0.5 * (weaponBonusAttackCoefficient + RarityMultiplier(leftHandRarity));
         return 4.96 * weaponBonusAttackCoefficient * JobBonusMultiplier(jobCode);
     }
 

Maple2.Server.Core/Network/Session.cs

@@ -37,7 +37,6 @@ public abstract class Session : IDisposable {
 
     private bool disposed;
     private int disconnecting; // 0 = not disconnecting, 1 = disconnect in progress/already triggered (reentrancy guard)
-    private volatile bool sendFailed; // set on first SendRaw failure to stop send queue drain
     private readonly uint siv;
     private readonly uint riv;
 
@@ -336,7 +335,6 @@ private void SendRaw(ByteWriter packet) {
             // Use async write with timeout to prevent indefinite blocking
             Task writeTask = networkStream.WriteAsync(packet.Buffer, 0, packet.Length);
             if (!writeTask.Wait(SEND_TIMEOUT_MS)) {
-                sendFailed = true;
                 Logger.Warning("SendRaw timeout after {Timeout}ms, disconnecting account={AccountId} char={CharacterId}",
                     SEND_TIMEOUT_MS, AccountId, CharacterId);
 
@@ -358,12 +356,10 @@ private void SendRaw(ByteWriter packet) {
                 throw writeTask.Exception?.GetBaseException() ?? new Exception("Write task faulted");
             }
         } catch (Exception ex) when (ex.InnerException is IOException or SocketException || ex is IOException or SocketException) {
-            // Connection was closed by the client or is no longer valid
-            sendFailed = true;
+            // Expected when client closes the connection (e.g., during migration)
             Logger.Debug("SendRaw connection closed account={AccountId} char={CharacterId}", AccountId, CharacterId);
             Disconnect();
         } catch (Exception ex) {
-            sendFailed = true;
             Logger.Warning(ex, "[LIFECYCLE] SendRaw write failed account={AccountId} char={CharacterId}", AccountId, CharacterId);
             Disconnect();
         }
@@ -372,7 +368,7 @@ private void SendRaw(ByteWriter packet) {
     private void SendWorker() {
         try {
             foreach ((byte[] packet, int length) in sendQueue.GetConsumingEnumerable()) {
-                if (disposed || sendFailed) break;
+                if (disposed) break;
 
                 // Encrypt outside lock, then send with timeout
                 PoolByteWriter encryptedPacket;