Speed hack improvements): implement walk and attack speedhack anti-cheat checks

.gitignore

@@ -274,6 +274,7 @@ paket-files/
 
 # VS Code
 .vscode/
+*.lscache
 
 # CodeRush
 .cr/
@@ -319,3 +320,6 @@ src/AdminPanel/wwwroot/content/js/app.js.map
 
 # Mac OS filesystem files
 .DS_Store
+
+# AI
+.opencode/

docs/Packets/C1-F6-0C-QuestProgressExtended_by-server.md → docs/Packets/C2-F6-0C-QuestProgressExtended_by-server.md

@@ -1,4 +1,4 @@
-# C1 F6 0C - QuestProgressExtended (by server)
+# C2 F6 0C - QuestProgressExtended (by server)
 
 ## Is sent when
 
@@ -12,10 +12,10 @@ The client shows the quest progress accordingly.
 
 | Index | Length | Data Type | Value | Description |
 |-------|--------|-----------|-------|-------------|
-| 0 | 1 |   Byte   | 0xC1  | [Packet type](PacketTypes.md) |
-| 1 | 1 |    Byte   |   272   | Packet header - length of the packet |
-| 2 | 1 |    Byte   | 0xF6  | Packet header - packet type identifier |
-| 3 | 1 |    Byte   | 0x0C  | Packet header - sub packet type identifier |
+| 0 | 1 |   Byte   | 0xC2  | [Packet type](PacketTypes.md) |
+| 1 | 2 |    Short   |   272   | Packet header - length of the packet |
+| 3 | 1 |    Byte   | 0xF6  | Packet header - packet type identifier |
+| 4 | 1 |    Byte   | 0x0C  | Packet header - sub packet type identifier |
 | 5 | 1 | Byte |  | ConditionCount |
 | 6 | 1 | Byte |  | RewardCount |
 | 7 | 1 | Byte |  | RandomRewardCount |

docs/Packets/ServerToClient.md

@@ -234,7 +234,7 @@
   * [C1 F6 0A - AvailableQuests (by server)](C1-F6-0A-AvailableQuests_by-server.md)
   * [C1 F6 0B - QuestStepInfo (by server)](C1-F6-0B-QuestStepInfo_by-server.md)
   * [C1 F6 0C - QuestProgress (by server)](C1-F6-0C-QuestProgress_by-server.md)
-  * [C1 F6 0C - QuestProgressExtended (by server)](C1-F6-0C-QuestProgressExtended_by-server.md)
+  * [C2 F6 0C - QuestProgressExtended (by server)](C2-F6-0C-QuestProgressExtended_by-server.md)
   * [C1 F6 0D - QuestCompletionResponse (by server)](C1-F6-0D-QuestCompletionResponse_by-server.md)
   * [C1 F6 0F - QuestCancelled (by server)](C1-F6-0F-QuestCancelled_by-server.md)
   * [C1 F6 1A - QuestStateList (by server)](C1-F6-1A-QuestStateList_by-server.md)

src/AttributeSystem/ComposableAttribute.cs

@@ -68,18 +68,10 @@ private float GetAndCacheValue()
         var maxValues = this.Elements.Where(e => e.AggregateType == AggregateType.Maximum).MaxBy(e => e.Value)?.Value ?? 0;
         rawValues += maxValues;
 
-        if (multiValues == 0 && this.Elements.All(e => e.AggregateType != AggregateType.Multiplicate))
-        {
-            multiValues = 1;
-        }
-        else if (rawValues == 0 && multiValues != 0 && this.Elements.All(e => e.AggregateType != AggregateType.AddRaw))
+        if (this.Elements.All(e => e.AggregateType == AggregateType.Multiplicate))
         {
             rawValues = 1;
         }
-        else
-        {
-            // nothing to do
-        }
 
         var newValue = (rawValues * multiValues) + finalValues;
         if (this._maximumValue.HasValue)

src/Dapr/GameServer.Host/Layout/NavMenu.razor

@@ -1,25 +1,25 @@
 @using MUnique.OpenMU.DataModel.Configuration
 @using MUnique.OpenMU.Persistence;
 
-<nav>
-    <div>
-        <a href="">OpenMU</a>
-        <button @onclick="ToggleNavMenu">
-            <span></span>
+<nav class="rounded-bottom shadow-lg">
+    <div class="top-row ps-4 navbar navbar-dark">
+        <a class="navbar-brand" href="">OpenMU</a>
+        <button class="navbar-toggler" @onclick="ToggleNavMenu">
+            <span class="navbar-toggler-icon"></span>
         </button>
     </div>
 
     <!-- Hiding it programmatically is not a good idea here, because we want to hide it based on the width of the device/window. -->
     <div class="@NavMenuCssClass">
-        <ul>
+        <ul class="nav flex-column">
 
-            <li>
-                <NavLink href="" Match="NavLinkMatch.All">
+            <li class="nav-item px-3">
+                <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
                     <span class="oi oi-home" aria-hidden="true"></span> Home
                 </NavLink>
             </li>
-            <li>
-                <NavLink href="maps">
+            <li class="nav-item px-3">
+                <NavLink class="nav-link" href="maps">
                     <span class="oi oi-project" aria-hidden="true"></span> Maps
                 </NavLink>
             </li>

src/Dapr/GameServer.Host/Layout/ReconnectModal.razor.css

@@ -21,7 +21,7 @@
 
 
 #components-reconnect-modal {
-    background-color: white;
+    background-color: var(--omu-bg);
     width: 20rem;
     margin: 20vh auto;
     padding: 2rem;
@@ -90,18 +90,18 @@
 
 #components-reconnect-modal button {
     border: 0;
-    background-color: #6b9ed2;
+    background-color: var(--omu-link-primary);
     color: white;
     padding: 4px 24px;
     border-radius: 4px;
 }
 
     #components-reconnect-modal button:hover {
-        background-color: #3b6ea2;
+        background-color: var(--omu-link-primary-border);
     }
 
     #components-reconnect-modal button:active {
-        background-color: #6b9ed2;
+        background-color: var(--omu-link-primary);
     }
 
 .components-rejoining-animation {

src/Dapr/GameServer.Host/Layout/Routes.razor

@@ -1,8 +1,8 @@
 <Router AppAssembly="@typeof(Program).Assembly" NotFoundPage="@typeof(Pages.NotFound)">
   <Found Context="routeData">
-    <CascadingBlazoredModal>
+    <ModalContainer>
       <RouteView RouteData="routeData" DefaultLayout="@typeof(Layout.MainLayout)"/>
       <FocusOnNavigate RouteData="routeData" Selector="h1"/>
-    </CascadingBlazoredModal>
+    </ModalContainer>
   </Found>
 </Router>

src/Dapr/GameServer.Host/_Imports.razor

@@ -9,15 +9,13 @@
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
 
-@using Blazored
-@using Blazored.Modal
-@using Blazored.Modal.Services
 @using Blazored.Toast
 @using Blazored.Toast.Services
 
 @using BlazorInputFile
 
 @using MUnique.OpenMU.Web.Shared
 @using MUnique.OpenMU.Web.Shared.Components
+@using MUnique.OpenMU.Web.Shared.Components.Modal
 @using MUnique.OpenMU.Web.Shared.Components.Form
 @using MUnique.OpenMU.Web.Shared.Services

src/DataModel/Configuration/Gate.cs

@@ -1,4 +1,4 @@
-// <copyright file="Gate.cs" company="MUnique">
+// <copyright file="Gate.cs" company="MUnique">
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // </copyright>
 
@@ -10,7 +10,7 @@ namespace MUnique.OpenMU.DataModel.Configuration;
 /// Defines a gate through which a player can exit or enter to other maps.
 /// </summary>
 [Cloneable]
-public partial class Gate
+public partial class Gate : IMapArea
 {
     /// <summary>
     /// Gets or sets the upper left corner, x-coordinate.

src/DataModel/Configuration/IMapArea.cs

@@ -0,0 +1,31 @@
+// <copyright file="IMapArea.cs" company="MUnique">
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+// </copyright>
+
+namespace MUnique.OpenMU.DataModel.Configuration;
+
+/// <summary>
+/// Represents a rectangular area on a map, defined by two corner coordinates.
+/// </summary>
+public interface IMapArea
+{
+    /// <summary>
+    /// Gets or sets the upper-left corner X coordinate.
+    /// </summary>
+    byte X1 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the upper-left corner Y coordinate.
+    /// </summary>
+    byte Y1 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the bottom-right corner X coordinate.
+    /// </summary>
+    byte X2 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the bottom-right corner Y coordinate.
+    /// </summary>
+    byte Y2 { get; set; }
+}

src/DataModel/Configuration/MonsterSpawnArea.cs

@@ -1,4 +1,4 @@
-// <copyright file="MonsterSpawnArea.cs" company="MUnique">
+// <copyright file="MonsterSpawnArea.cs" company="MUnique">
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // </copyright>
 
@@ -65,10 +65,10 @@ public enum SpawnTrigger
 }
 
 /// <summary>
-/// Defines an monster spawn area.
+/// Defines a monster spawn area.
 /// </summary>
 [Cloneable]
-public partial class MonsterSpawnArea
+public partial class MonsterSpawnArea : IMapArea
 {
     /// <summary>
     /// Gets or sets the monster definition.

src/Directory.Packages.props

@@ -6,7 +6,6 @@
     <PackageVersion Include="BCrypt.Net-Next" Version="4.0.3" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
     <PackageVersion Include="BlazorInputFile" Version="0.2.0" />
-    <PackageVersion Include="Blazored.Modal" Version="7.3.1" />
     <PackageVersion Include="Blazored.Toast" Version="4.2.1" />
     <PackageVersion Include="BuildWebCompiler2022" Version="1.14.15" />
     <PackageVersion Include="DG.AdvancedDataGridView" Version="1.2.30115.18" />

src/GameLogic/AttackableExtensions.cs

@@ -20,6 +20,7 @@ namespace MUnique.OpenMU.GameLogic;
 public static class AttackableExtensions
 {
     private const short ExplosionMagicEffectNumber = 75;   // 0x4B
+    private const short StunnedMagicEffectNumber = 61;     // 0x3D
 
     private static readonly IDictionary<AttributeDefinition, AttributeDefinition> ReductionModifiers =
         new Dictionary<AttributeDefinition, AttributeDefinition>
@@ -345,7 +346,7 @@ public static async ValueTask ApplyMagicEffectAsync(this IAttackable target, IAt
         }
 
         float chance = target is Player ? skillEntry.PowerUpChancePvp!.Value : skillEntry.PowerUpChance!.Value;
-        if (!Rand.NextRandomBool(Convert.ToDouble(chance)))
+        if (!Rand.NextRandomBool(chance))
         {
             return;
         }
@@ -613,6 +614,20 @@ public static double CalculateBaseExperience(this IAttackable killedObject, floa
         return Math.Max(tempExperience, 0) * 1.25;
     }
 
+    /// <summary>
+    /// Applies the mace mastery stun effect to the specified attackable.
+    /// </summary>
+    /// <param name="attacker">The attacker.</param>
+    /// <param name="attackable">The attackable.</param>
+    /// <returns>A task representing the asynchronous operation.</returns>
+    public static async ValueTask ApplyMaceMasteryStunEffectAsync(this Player attacker, IAttackable attackable)
+    {
+        var stunEffectDefinition = attacker.GameContext.Configuration.MagicEffects.First(m => m.Number == StunnedMagicEffectNumber);
+        var powerUp = attackable.Attributes.CreateElement(stunEffectDefinition.PowerUpDefinitions.First(pu => pu.TargetAttribute == Stats.IsStunned));
+        var magicEffect = new MagicEffect(TimeSpan.FromSeconds(2), stunEffectDefinition, [new MagicEffect.ElementWithTarget(powerUp, Stats.IsStunned)]);
+        await attackable.MagicEffectList.AddEffectAsync(magicEffect).ConfigureAwait(false);
+    }
+
     private static bool IsAttackSuccessfulTo(this IAttacker attacker, IAttackable defender)
     {
         var hitChance = attacker.GetHitChanceTo(defender);
@@ -879,8 +894,8 @@ private static async ValueTask ApplyMagicEffectAsync(this IAttackable target, IA
         }
         else if (magicEffectDefinition.PowerUpDefinitions.Any(e => e.TargetAttribute == Stats.IsStunned))
         {
-            var stunChancePowerUp = powerUps.FirstOrDefault(p => p.Target == Stats.StunChance);
-            if (stunChancePowerUp.Boost is null || !Rand.NextRandomBool(Convert.ToDouble(stunChancePowerUp.Boost.Value)))
+            var stunChancePowerUp = powerUps.FirstOrDefault(p => p.Target == Stats.MasteryStunChance);
+            if (stunChancePowerUp.Boost is null || !Rand.NextRandomBool(stunChancePowerUp.Boost.Value))
             {
                 return;
             }

src/GameLogic/Attributes/PowerUpWrapper.cs

@@ -14,6 +14,8 @@ public sealed class PowerUpWrapper : IElement, IDisposable
 {
     private readonly IElement _element;
 
+    private readonly AggregateType? _aggregateType;
+
     private ComposableAttribute? _parentAttribute;
 
     /// <summary>
@@ -22,7 +24,8 @@ public sealed class PowerUpWrapper : IElement, IDisposable
     /// <param name="element">The element.</param>
     /// <param name="targetAttribute">The target attribute.</param>
     /// <param name="attributeHolder">The attribute holder.</param>
-    public PowerUpWrapper(IElement element, AttributeDefinition targetAttribute, AttributeSystem attributeHolder)
+    /// <param name="aggregateType">The aggregate type that should override the <paramref name="element"/>'s.</param>
+    public PowerUpWrapper(IElement element, AttributeDefinition targetAttribute, AttributeSystem attributeHolder, AggregateType? aggregateType = null)
     {
         this._parentAttribute = attributeHolder.GetComposableAttribute(targetAttribute);
         if (this._parentAttribute is null)
@@ -31,6 +34,7 @@ public PowerUpWrapper(IElement element, AttributeDefinition targetAttribute, Att
         }
 
         this._element = element;
+        this._aggregateType = aggregateType;
         this._parentAttribute.AddElement(this);
         this._element.ValueChanged += this.OnValueChanged;
     }
@@ -42,33 +46,36 @@ public PowerUpWrapper(IElement element, AttributeDefinition targetAttribute, Att
     public float Value => this._element.Value;
 
     /// <inheritdoc/>
-    public AggregateType AggregateType => this._element.AggregateType;
+    public AggregateType AggregateType => this._aggregateType ?? this._element.AggregateType;
 
     /// <summary>
     /// Creates elements by a <see cref="PowerUpDefinition"/>.
     /// </summary>
     /// <param name="powerUpDef">The power up definition.</param>
     /// <param name="attributeHolder">The attribute holder.</param>
+    /// <param name="aggregateType">The specific aggregate type. If not specified, the aggregate type of the <paramref name="powerUpDef"/>'s constant value will be used.</param>
     /// <returns>The elements which represent the power-up.</returns>
-    public static IEnumerable<PowerUpWrapper> CreateByPowerUpDefinition(PowerUpDefinition powerUpDef, AttributeSystem attributeHolder)
+    public static IEnumerable<PowerUpWrapper> CreateByPowerUpDefinition(PowerUpDefinition powerUpDef, AttributeSystem attributeHolder, AggregateType? aggregateType = null)
     {
         if (powerUpDef.Boost?.ConstantValue != null)
         {
             yield return new PowerUpWrapper(
                 powerUpDef.Boost.ConstantValue,
                 powerUpDef.TargetAttribute ?? throw Error.NotInitializedProperty(powerUpDef, nameof(PowerUpDefinition.TargetAttribute)),
-                attributeHolder);
+                attributeHolder,
+                aggregateType);
         }
 
         if (powerUpDef.Boost?.RelatedValues != null)
         {
             foreach (var relationship in powerUpDef.Boost.RelatedValues)
             {
-                var aggregateType = powerUpDef.Boost?.ConstantValue.AggregateType ?? AggregateType.AddRaw;
+                var aggregType = powerUpDef.Boost?.ConstantValue.AggregateType ?? AggregateType.AddRaw;
                 yield return new PowerUpWrapper(
-                    attributeHolder.CreateRelatedAttribute(relationship, attributeHolder, aggregateType),
+                    attributeHolder.CreateRelatedAttribute(relationship, attributeHolder, aggregType),
                     powerUpDef.TargetAttribute ?? throw Error.NotInitializedProperty(powerUpDef, nameof(PowerUpDefinition.TargetAttribute)),
-                    attributeHolder);
+                    attributeHolder,
+                    aggregateType);
             }
         }
     }
@@ -88,7 +95,7 @@ public void Dispose()
     /// <inheritdoc/>
     public override string? ToString()
     {
-        return $"{this._parentAttribute?.Definition.Designation}: {this._element}";
+        return $"{this._parentAttribute?.Definition.Designation}: {this._element}{(this._aggregateType is { } aggreg ? $"->({aggreg})" : string.Empty)}";
     }
 
     private void OnValueChanged(object? sender, EventArgs eventArgs)