Updates movement packets & Fastwalk (#324)
- [X] Updates Movement packets
- [X] Adds OSI fastwalk packets. These aren't used on OSi anymore.
- [X] Adds new movement handling, but looks like the client doesn't use it. (Also leaving the 0x4000 Character List Flag off)
- [X] Adds time sync request handler, but also looks like the client doesn't use it.
- [X] Adds time sync response for time sync, just in case, but it isn't used, so not sure about the arguments.
- [X] Reimplements RunUO's fastwalk to use a circular array on the netstate instead of every mobile
- [X] Removes ClearFastwalkStack from RunUO implementation. This shouldn't be needed anymore
Changed fastwalk settings:
```cs
public static int WalkFootDelay { get; set; } = 440;
public static int RunFootDelay { get; set; } = 220;
public static int WalkMountDelay { get; set; } = 220;
public static int RunMountDelay { get; set; } = 110;
public static bool EnableFastwalkPrevention { get; set; } = true;
public static AccessLevel FastwalkExemptionLevel { get; set; } = AccessLevel.Counselor;
// If this is changed during runtime, then the steps array needs resizing.
public static int MaxSteps { get; private set; } = 4;
```
modernuo.json
```json
{
"settings": {
"movement.delay.runFoot": "220",
"movement.delay.runMount": "110",
"movement.delay.walkFoot": "440",
"movement.delay.walkMount": "220",
"movement.enableFastWalkPrevention": "True",
"movement.fastwalkExemptionLevel": "Counselor",
"movement.maxSteps": "4"
}
}
```
Notes about OSI fastwalk:
While it does work, I can't find a benefit in using it because of the variable speeds. If players moved at a single speed then we could refill the stack every X milliseconds with 6 keys and use a naive token bucket implementation.
Unfortunately variable speeds mount/run/walk/etc means we would have to use a leaky bucket algorithm.
If we are using a leaky bucket algorithm with a variable leak, then we don't need to send tokens because we are already tracking it on the server side.
ModernUO vs OSI Fastwalk:
When the fastwalk was implemented on OSI, it used up to 6 tokens. These tokens were probably distributed every 600-750 milliseconds. To get the same effect, the new fastwalk settings might need to be adjusted. I would tweak them and feel free to let me know what worked for you!
Bumps release version
This commit is contained in:
parent
b6cd408623
commit
351611a23a
25 changed files with 781 additions and 490 deletions
|
|
@ -34,6 +34,7 @@ using Server.Spells.Spellweaving;
|
|||
using Server.Targeting;
|
||||
using Server.Utilities;
|
||||
using BaseQuestGump = Server.Engines.MLQuests.Gumps.BaseQuestGump;
|
||||
using CalcMoves = Server.Movement.Movement;
|
||||
using QuestOfferGump = Server.Engines.MLQuests.Gumps.QuestOfferGump;
|
||||
using RankDefinition = Server.Guilds.RankDefinition;
|
||||
|
||||
|
|
@ -96,9 +97,6 @@ namespace Server.Mobiles
|
|||
{
|
||||
private static bool m_NoRecursion;
|
||||
|
||||
private static readonly bool FastwalkPrevention = true; // Is fastwalk prevention enabled?
|
||||
private static readonly int FastwalkThreshold = 400; // Fastwalk prevention will become active after 0.4 seconds
|
||||
|
||||
private static readonly Point3D[] m_TrammelDeathDestinations =
|
||||
{
|
||||
new Point3D(1481, 1612, 20),
|
||||
|
|
@ -166,7 +164,6 @@ namespace Server.Mobiles
|
|||
private RankDefinition m_GuildRank;
|
||||
|
||||
private int m_HairModID = -1, m_HairModHue;
|
||||
private bool m_HasMoved;
|
||||
|
||||
public DateTime m_hontime;
|
||||
|
||||
|
|
@ -188,7 +185,7 @@ namespace Server.Mobiles
|
|||
|
||||
private DateTime m_NextJustAward;
|
||||
|
||||
private long m_NextMovementTime;
|
||||
private int m_NextMovementTime;
|
||||
private int m_NextProtectionCheck = 10;
|
||||
private DateTime m_NextSmithBulkOrder;
|
||||
private DateTime m_NextTailorBulkOrder;
|
||||
|
|
@ -715,8 +712,6 @@ namespace Server.Mobiles
|
|||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public SolenFriendship SolenFriendship { get; set; }
|
||||
|
||||
public virtual bool UsesFastwalkPrevention => AccessLevel < AccessLevel.Counselor;
|
||||
|
||||
public Type EnemyOfOneType
|
||||
{
|
||||
get => m_EnemyOfOneType;
|
||||
|
|
@ -1031,11 +1026,6 @@ namespace Server.Mobiles
|
|||
|
||||
public static void Initialize()
|
||||
{
|
||||
if (FastwalkPrevention)
|
||||
{
|
||||
IncomingPackets.RegisterThrottler(0x02, MovementThrottle_Callback);
|
||||
}
|
||||
|
||||
EventSink.Login += OnLogin;
|
||||
EventSink.Logout += OnLogout;
|
||||
EventSink.Connected += EventSink_Connected;
|
||||
|
|
@ -4264,59 +4254,30 @@ namespace Server.Mobiles
|
|||
SentHonorContext?.Cancel();
|
||||
}
|
||||
|
||||
public override int ComputeMovementSpeed(Direction dir, bool checkTurning)
|
||||
public override int ComputeMovementSpeed(Direction dir, bool checkTurning = true)
|
||||
{
|
||||
if (checkTurning && (dir & Direction.Mask) != (Direction & Direction.Mask))
|
||||
{
|
||||
return RunMount; // We are NOT actually moving (just a direction change)
|
||||
return CalcMoves.RunMountDelay; // We are NOT actually moving (just a direction change)
|
||||
}
|
||||
|
||||
var context = TransformationSpellHelper.GetContext(this);
|
||||
|
||||
if (context?.Type == typeof(ReaperFormSpell))
|
||||
{
|
||||
return WalkFoot;
|
||||
return CalcMoves.WalkFootDelay;
|
||||
}
|
||||
|
||||
var running = (dir & Direction.Running) != 0;
|
||||
|
||||
var onHorse = Mount != null;
|
||||
|
||||
var animalContext = AnimalForm.GetContext(this);
|
||||
|
||||
if (onHorse || animalContext?.SpeedBoost == true)
|
||||
if (onHorse || AnimalForm.GetContext(this)?.SpeedBoost == true)
|
||||
{
|
||||
return running ? RunMount : WalkMount;
|
||||
return running ? CalcMoves.RunMountDelay : CalcMoves.WalkMountDelay;
|
||||
}
|
||||
|
||||
return running ? RunFoot : WalkFoot;
|
||||
}
|
||||
|
||||
public static TimeSpan MovementThrottle_Callback(NetState ns)
|
||||
{
|
||||
if (!(ns.Mobile is PlayerMobile pm) || !pm.UsesFastwalkPrevention)
|
||||
{
|
||||
return TimeSpan.Zero;
|
||||
}
|
||||
|
||||
if (!pm.m_HasMoved)
|
||||
{
|
||||
// has not yet moved
|
||||
pm.m_NextMovementTime = Core.TickCount;
|
||||
pm.m_HasMoved = true;
|
||||
return TimeSpan.Zero;
|
||||
}
|
||||
|
||||
var ts = pm.m_NextMovementTime - Core.TickCount;
|
||||
|
||||
if (ts < 0)
|
||||
{
|
||||
// been a while since we've last moved
|
||||
pm.m_NextMovementTime = Core.TickCount;
|
||||
return TimeSpan.Zero;
|
||||
}
|
||||
|
||||
return ts < FastwalkThreshold ? TimeSpan.Zero : TimeSpan.FromTicks(ts);
|
||||
return running ? CalcMoves.RunFootDelay : CalcMoves.WalkFootDelay;
|
||||
}
|
||||
|
||||
private void DeltaEnemies(Type oldType, Type newType)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue