Feature/offlevel party

docs/Packets/C1-11-ObjectHitExtended_by-server.md

@@ -16,6 +16,8 @@ The damage is shown at the object which received the hit.
 | 1 | 1 |    Byte   |   16   | Packet header - length of the packet |
 | 2 | 1 |    Byte   | 0x11  | Packet header - packet type identifier |
 | 3 << 0 | 4 bit | DamageKind |  | Kind |
+| 3 << 4 | 1 bit | Boolean |  | IsRageFighterStreakHit |
+| 3 << 5 | 1 bit | Boolean |  | IsRageFighterStreakFinalHit |
 | 3 << 6 | 1 bit | Boolean |  | IsDoubleDamage |
 | 3 << 7 | 1 bit | Boolean |  | IsTripleDamage |
 | 4 | 2 | ShortLittleEndian |  | ObjectId |
@@ -34,7 +36,7 @@ Defines the kind of the damage.
 | 1 | IgnoreDefenseCyan | Cyan color, usually used by ignore defense damage. |
 | 2 | ExcellentLightGreen | Light green color, usually used by excellent damage. |
 | 3 | CriticalBlue | Blue color, usually used by critical damage. |
-| 4 | LightPink | Light pink color. |
+| 4 | ReflectedLightPink | Light pink color, usually used by reflected damage. |
 | 5 | PoisonDarkGreen | Dark green color, usually used by poison damage. |
-| 6 | ReflectedDarkPink | Dark pink color, usually used by reflected damage. |
+| 6 | DarkPink | Dark pink color. |
 | 7 | White | White color. |

docs/Packets/C1-11-ObjectHit_by-server.md

@@ -19,6 +19,8 @@ The damage is shown at the object which received the hit.
 | 3 | 2 | ShortBigEndian |  | ObjectId |
 | 5 | 2 | ShortBigEndian |  | HealthDamage |
 | 7 << 0 | 4 bit | DamageKind |  | Kind |
+| 7 << 4 | 1 bit | Boolean |  | IsRageFighterStreakHit |
+| 7 << 5 | 1 bit | Boolean |  | IsRageFighterStreakFinalHit |
 | 7 << 6 | 1 bit | Boolean |  | IsDoubleDamage |
 | 7 << 7 | 1 bit | Boolean |  | IsTripleDamage |
 | 8 | 2 | ShortBigEndian |  | ShieldDamage |
@@ -33,7 +35,7 @@ Defines the kind of the damage.
 | 1 | IgnoreDefenseCyan | Cyan color, usually used by ignore defense damage. |
 | 2 | ExcellentLightGreen | Light green color, usually used by excellent damage. |
 | 3 | CriticalBlue | Blue color, usually used by critical damage. |
-| 4 | LightPink | Light pink color. |
+| 4 | ReflectedLightPink | Light pink color, usually used by reflected damage. |
 | 5 | PoisonDarkGreen | Dark green color, usually used by poison damage. |
-| 6 | ReflectedDarkPink | Dark pink color, usually used by reflected damage. |
+| 6 | DarkPink | Dark pink color. |
 | 7 | White | White color. |

docs/Packets/C1-D2-05-CashShopStorageListRequest_by-client.md

@@ -13,7 +13,7 @@ In case of opening, the server returns if the cash shop is available. If the pla
 | Index | Length | Data Type | Value | Description |
 |-------|--------|-----------|-------|-------------|
 | 0 | 1 |   Byte   | 0xC1  | [Packet type](PacketTypes.md) |
-| 1 | 1 |    Byte   |   8   | Packet header - length of the packet |
+| 1 | 1 |    Byte   |   10   | Packet header - length of the packet |
 | 2 | 1 |    Byte   | 0xD2  | Packet header - packet type identifier |
 | 3 | 1 |    Byte   | 0x05  | Packet header - sub packet type identifier |
 | 4 | 4 | IntegerLittleEndian |  | PageIndex |

docs/Packets/C1-D2-0B-CashShopStorageItemConsumeRequest_by-client.md

@@ -13,7 +13,7 @@ The item is applied or added to the inventory.
 | Index | Length | Data Type | Value | Description |
 |-------|--------|-----------|-------|-------------|
 | 0 | 1 |   Byte   | 0xC1  | [Packet type](PacketTypes.md) |
-| 1 | 1 |    Byte   |   5   | Packet header - length of the packet |
+| 1 | 1 |    Byte   |   15   | Packet header - length of the packet |
 | 2 | 1 |    Byte   | 0xD2  | Packet header - packet type identifier |
 | 3 | 1 |    Byte   | 0x0B  | Packet header - sub packet type identifier |
 | 4 | 4 | IntegerLittleEndian |  | BaseItemCode |

src/DataModel/Configuration/MonsterDefinition.cs

@@ -1,4 +1,4 @@
-// <copyright file="MonsterDefinition.cs" company="MUnique">
+// <copyright file="MonsterDefinition.cs" company="MUnique">
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // </copyright>
 

src/GameLogic/AttackableExtensions.cs

@@ -239,7 +239,9 @@ public static async ValueTask<HitInfo> CalculateDamageAsync(this IAttacker attac
         if (soulBarrierManaToll > 0 && defender.Attributes[Stats.CurrentMana] > soulBarrierManaToll)
         {
             manaToll = soulBarrierManaToll;
-            dmg -= (int)(dmg * defender.Attributes[Stats.SoulBarrierReceiveDecrement]);
+            float soulBarrierReduction = defender.Attributes[Stats.SoulBarrierReceiveDecrement];
+            soulBarrierReduction = Math.Clamp(soulBarrierReduction, 0f, 0.9f);
+            dmg -= (int)(dmg * soulBarrierReduction);
         }
 
         dmg += (int)attacker.Attributes[Stats.FinalDamageBonus];

src/GameLogic/GameContext.cs

@@ -1,4 +1,4 @@
-// <copyright file="GameContext.cs" company="MUnique">
+// <copyright file="GameContext.cs" company="MUnique">
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // </copyright>
 
@@ -80,6 +80,7 @@ public GameContext(GameConfiguration configuration, IPersistenceContextProvider
             this.DropGenerator = dropGenerator;
             this.ConfigurationChangeMediator = changeMediator;
             this.ItemPowerUpFactory = new ItemPowerUpFactory(loggerFactory.CreateLogger<ItemPowerUpFactory>());
+            this.PartyManager = new PartyManager(configuration.MaximumPartySize, loggerFactory.CreateLogger<Party>());
             this._recoverTimer = new Timer(this.RecoverTimerElapsed, null, this.Configuration.RecoveryInterval, this.Configuration.RecoveryInterval);
             this._tasksTimer = new Timer(this.ExecutePeriodicTasks, null, 1000, 1000);
             this.FeaturePlugIns = new FeaturePlugInContainer(this.PlugInManager);
@@ -148,16 +149,17 @@ public GameContext(GameConfiguration configuration, IPersistenceContextProvider
     /// <summary>
     /// Gets the players by character name dictionary.
     /// </summary>
-    public ConcurrentDictionary<string, Player> PlayersByCharacterName { get; } = new(StringComparer.OrdinalIgnoreCase);
+    public ConcurrentDictionary<string, Player> PlayersByCharacterName { get; } = new ConcurrentDictionary<string, Player>(StringComparer.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public DuelRoomManager DuelRoomManager { get; set; }
 
-    /// <summary>
-    /// Gets the state of the active self defenses.
-    /// </summary>
+    /// <inheritdoc />
     public ConcurrentDictionary<(Player Attacker, Player Defender), DateTime> SelfDefenseState { get; } = new();
 
+    /// <inheritdoc />
+    public IPartyManager PartyManager { get; }
+
     /// <inheritdoc />
     public ILoggerFactory LoggerFactory { get; }
 

src/GameLogic/IGameContext.cs

@@ -1,4 +1,4 @@
-// <copyright file="IGameContext.cs" company="MUnique">
+// <copyright file="IGameContext.cs" company="MUnique">
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // </copyright>
 
@@ -112,6 +112,11 @@ public interface IGameContext
     /// </summary>
     ConcurrentDictionary<(Player Attacker, Player Defender), DateTime> SelfDefenseState { get; }
 
+    /// <summary>
+    /// Gets the party manager which handles party creation and persistence.
+    /// </summary>
+    IPartyManager PartyManager { get; }
+
     /// <summary>
     /// Gets the initialized maps which are hosted on this context.
     /// </summary>

src/GameLogic/IPartyManager.cs

@@ -0,0 +1,39 @@
+// <copyright file="IPartyManager.cs" company="MUnique">
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+// </copyright>
+
+namespace MUnique.OpenMU.GameLogic;
+
+/// <summary>
+/// Manages party creation and tracks party membership for member reconnection.
+/// </summary>
+public interface IPartyManager
+{
+    /// <summary>
+    /// Creates a new party with the configured maximum party size.
+    /// </summary>
+    /// <returns>The newly created party.</returns>
+    Party CreateParty();
+
+    /// <summary>
+    /// Called when a party member reconnects. Restores the live player into their previous party,
+    /// replacing the <see cref="OfflinePartyMember"/> snapshot that was created on disconnect.
+    /// </summary>
+    /// <param name="member">The reconnected member.</param>
+    ValueTask OnMemberReconnectedAsync(IPartyMember member);
+
+    /// <summary>
+    /// Registers that a character belongs to a party. Called by <see cref="Party"/> internally
+    /// when members are added, replaced, or removed.
+    /// </summary>
+    /// <param name="characterName">The character name.</param>
+    /// <param name="party">The party.</param>
+    internal void TrackMembership(string characterName, Party party);
+
+    /// <summary>
+    /// Removes the party tracking for a character. Called by <see cref="Party"/> internally
+    /// when members leave or are replaced.
+    /// </summary>
+    /// <param name="characterName">The character name.</param>
+    internal void UntrackMembership(string characterName);
+}

src/GameLogic/IPartyMember.cs

@@ -1,4 +1,4 @@
-// <copyright file="IPartyMember.cs" company="MUnique">
+// <copyright file="IPartyMember.cs" company="MUnique">
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // </copyright>
 
@@ -33,4 +33,9 @@ public interface IPartyMember : IWorldObserver, IObservable, IIdentifiable, ILoc
     /// Gets the name.
     /// </summary>
     string Name { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether the member is currently connected to the game.
+    /// </summary>
+    bool IsConnected { get; }
 }

src/GameLogic/MUnique.OpenMU.GameLogic.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>

src/GameLogic/MapInitializer.cs

@@ -1,4 +1,4 @@
-// <copyright file="MapInitializer.cs" company="MUnique">
+// <copyright file="MapInitializer.cs" company="MUnique">
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // </copyright>
 

src/GameLogic/NPC/BasicMonsterIntelligence.cs

@@ -28,9 +28,6 @@ public class BasicMonsterIntelligence : INpcIntelligence, IDisposable
     /// <summary>
     /// Gets or sets a value indicating whether this instance can walk on safezone.
     /// </summary>
-    /// <value>
-    ///   <c>true</c> if this instance can walk on safezone; otherwise, <c>false</c>.
-    /// </value>
     public bool CanWalkOnSafezone { get; protected set; }
 
     /// <inheritdoc/>
@@ -91,6 +88,13 @@ public virtual bool CanWalkOn(Point target)
         return this.Monster.CurrentMap.Terrain.AIgrid[target.X, target.Y] == 1;
     }
 
+    /// <summary>
+    /// Determines whether the specified player is being targeted by this monster.
+    /// </summary>
+    /// <param name="player">The player to check.</param>
+    /// <returns>True if the player is the current target; otherwise, false.</returns>
+    public bool IsTargetingPlayer(Player player) => this.CurrentTarget == player;
+
     /// <summary>
     /// Called when the intelligence starts.
     /// </summary>
@@ -129,30 +133,28 @@ protected virtual void Dispose(bool managed)
         var possibleTargets = tempObservers.OfType<IAttackable>()
             .Where(a => a.IsActive() && !a.IsAtSafezone() && a is not Player { IsInvisible: true })
             .ToList();
+
+        // Also consider summoned monsters belonging to players in range.
         var summons = possibleTargets.OfType<Player>()
             .Select(p => p.Summon?.Item1)
             .Where(s => s is not null)
             .Cast<IAttackable>()
             .WhereActive()
             .ToList();
-        possibleTargets.AddRange(summons);
-        var closestTarget = possibleTargets.MinBy(a => a.GetDistanceTo(this.Npc));
 
-        return closestTarget;
+        possibleTargets.AddRange(summons);
 
         // todo: check the walk distance
+        return possibleTargets.MinBy(a => a.GetDistanceTo(this.Npc));
     }
 
     /// <summary>
-    /// Determines whether this instance can attack.
+    /// Determines whether this instance can attack this tick.
     /// </summary>
-    /// <returns>
-    ///   <c>true</c> if this instance can attack; otherwise, <c>false</c>.
-    /// </returns>
     protected virtual ValueTask<bool> CanAttackAsync() => ValueTask.FromResult(true);
 
     /// <summary>
-    /// Handles the tick without having a target.
+    /// Handles the tick when no target is available, moves the monster randomly.
     /// </summary>
     protected virtual async ValueTask TickWithoutTargetAsync()
     {
@@ -161,19 +163,15 @@ protected virtual async ValueTask TickWithoutTargetAsync()
             return;
         }
 
-        // we move around randomly, so the monster does not look dead when watched from distance.
         if (await this.IsObservedByAttackerAsync().ConfigureAwait(false))
         {
             await this.Monster.RandomMoveAsync().ConfigureAwait(false);
         }
     }
 
     /// <summary>
-    /// Determines whether the handled monster is observed by an attacker.
+    /// Determines whether the handled monster is observed by any attacker.
     /// </summary>
-    /// <returns>
-    ///   <c>true</c> if the handled monster is observed by an attacker; otherwise, <c>false</c>.
-    /// </returns>
     protected async ValueTask<bool> IsObservedByAttackerAsync()
     {
         using var readerLock = await this.Monster.ObserverLock.ReaderLockAsync();
@@ -197,7 +195,7 @@ private async void SafeTick()
         }
         catch (OperationCanceledException)
         {
-            // can be ignored.
+            // expected during shutdown.
         }
         catch (Exception ex)
         {
@@ -228,36 +226,19 @@ private async ValueTask TickAsync()
             return;
         }
 
-        var target = this.CurrentTarget;
-        if (target != null)
-        {
-            // Old Target out of Range?
-            if (!target.IsAlive
-                || target is Player { IsInvisible: true }
-                || target.IsTeleporting
-                || target.IsAtSafezone()
-                || !target.IsInRange(this.Monster.Position, this.Npc.Definition.ViewRange)
-                || (target is IWorldObserver && !await this.IsTargetInObserversAsync(target).ConfigureAwait(false)))
-            {
-                target = this.CurrentTarget = await this.SearchNextTargetAsync().ConfigureAwait(false);
-            }
-        }
-        else
-        {
-            target = this.CurrentTarget = await this.SearchNextTargetAsync().ConfigureAwait(false);
-        }
+        this.CurrentTarget = await this.ResolveTargetAsync().ConfigureAwait(false);
 
-        // no target?
-        if (target is null)
+        if (this.CurrentTarget is null)
         {
             await this.TickWithoutTargetAsync().ConfigureAwait(false);
             return;
         }
 
-        // Target in Attack Range?
-        if (target.IsInRange(this.Monster.Position, this.Monster.Definition.AttackRange) && !this.Monster.IsAtSafezone())
+        // Target in attack range — attack.
+        if (this.CurrentTarget.IsInRange(this.Monster.Position, this.Monster.Definition.AttackRange)
+            && !this.Monster.IsAtSafezone())
         {
-            await this.Monster.AttackAsync(target).ConfigureAwait(false);  // yes, attack
+            await this.Monster.AttackAsync(this.CurrentTarget).ConfigureAwait(false);
             return;
         }
 
@@ -266,18 +247,51 @@ private async ValueTask TickAsync()
             return;
         }
 
-        // Target in View Range?
-        if (target.IsInRange(this.Monster.Position, this.Monster.Definition.ViewRange + 1))
+        // Target visible but outside attack range, walk toward it.
+        if (this.CurrentTarget.IsInRange(this.Monster.Position, this.Monster.Definition.ViewRange + 1))
         {
-            // no, walk to the target
-            var walkTarget = this.Monster.CurrentMap!.Terrain.GetRandomCoordinate(target.Position, this.Monster.Definition.AttackRange);
+            var walkTarget = this.Monster.CurrentMap!.Terrain.GetRandomCoordinate(this.CurrentTarget.Position, this.Monster.Definition.AttackRange);
             if (await this.Monster.WalkToAsync(walkTarget).ConfigureAwait(false))
             {
                 return;
             }
         }
 
-        // we move around randomly, so the monster does not look dead when watched from distance.
+        // Nothing else to do, wander randomly.
         await this.Monster.RandomMoveAsync().ConfigureAwait(false);
     }
+
+    /// <summary>
+    /// Returns the current target if still valid, otherwise searches for a new one.
+    /// </summary>
+    private async ValueTask<IAttackable?> ResolveTargetAsync()
+    {
+        if (this.CurrentTarget is not null && this.IsCurrentTargetValid())
+        {
+            // Double-check the target is still within the observer list (needed for
+            // players who have moved out of view range server-side).
+            if (!await this.IsTargetInObserversAsync(this.CurrentTarget).ConfigureAwait(false)
+                && this.CurrentTarget is IWorldObserver)
+            {
+                return await this.SearchNextTargetAsync().ConfigureAwait(false);
+            }
+
+            return this.CurrentTarget;
+        }
+
+        return await this.SearchNextTargetAsync().ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Returns <c>true</c> if the current target is still a valid attack candidate.
+    /// </summary>
+    private bool IsCurrentTargetValid()
+    {
+        return this.CurrentTarget is not null
+               && this.CurrentTarget.IsAlive
+               && this.CurrentTarget is not Player { IsInvisible: true }
+               && !this.CurrentTarget.IsTeleporting
+               && !this.CurrentTarget.IsAtSafezone()
+               && this.CurrentTarget.IsInRange(this.Monster.Position, this.Npc.Definition.ViewRange);
+    }
 }