351611a23a
- [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
339 lines
10 KiB
C#
339 lines
10 KiB
C#
using System;
|
|
|
|
namespace Server
|
|
{
|
|
public enum Expansion
|
|
{
|
|
None,
|
|
T2A,
|
|
UOR,
|
|
UOTD,
|
|
LBR,
|
|
AOS,
|
|
SE,
|
|
ML,
|
|
SA,
|
|
HS,
|
|
TOL,
|
|
EJ
|
|
}
|
|
|
|
[Flags]
|
|
public enum ClientFlags
|
|
{
|
|
None = 0x00000000,
|
|
Felucca = 0x00000001,
|
|
Trammel = 0x00000002,
|
|
Ilshenar = 0x00000004,
|
|
Malas = 0x00000008,
|
|
Tokuno = 0x00000010,
|
|
TerMur = 0x00000020,
|
|
Unk1 = 0x00000040,
|
|
Unk2 = 0x00000080,
|
|
UOTD = 0x00000100
|
|
}
|
|
|
|
[Flags]
|
|
public enum FeatureFlags
|
|
{
|
|
None = 0x00000000,
|
|
T2A = 0x00000001,
|
|
UOR = 0x00000002,
|
|
UOTD = 0x00000004,
|
|
LBR = 0x00000008,
|
|
AOS = 0x00000010,
|
|
SixthCharacterSlot = 0x00000020,
|
|
SE = 0x00000040,
|
|
ML = 0x00000080,
|
|
EigthAge = 0x00000100,
|
|
NinthAge = 0x00000200, /* Crystal/Shadow Custom House Tiles */
|
|
TenthAge = 0x00000400,
|
|
IncreasedStorage = 0x00000800, /* Increased Housing/Bank Storage */
|
|
SeventhCharacterSlot = 0x00001000,
|
|
RoleplayFaces = 0x00002000,
|
|
TrialAccount = 0x00004000,
|
|
LiveAccount = 0x00008000,
|
|
SA = 0x00010000,
|
|
HS = 0x00020000,
|
|
Gothic = 0x00040000,
|
|
Rustic = 0x00080000,
|
|
Jungle = 0x00100000,
|
|
Shadowguard = 0x00200000,
|
|
TOL = 0x00400000,
|
|
EJ = 0x00800000,
|
|
|
|
ExpansionNone = None,
|
|
ExpansionT2A = T2A,
|
|
ExpansionUOR = ExpansionT2A | UOR,
|
|
ExpansionUOTD = ExpansionUOR | UOTD,
|
|
ExpansionLBR = ExpansionUOTD | LBR,
|
|
ExpansionAOS = ExpansionLBR | AOS | LiveAccount,
|
|
ExpansionSE = ExpansionAOS | SE,
|
|
ExpansionML = ExpansionSE | ML | NinthAge,
|
|
ExpansionSA = ExpansionML | SA | Gothic | Rustic,
|
|
ExpansionHS = ExpansionSA | HS,
|
|
ExpansionTOL = ExpansionHS | TOL | Jungle | Shadowguard,
|
|
ExpansionEJ = ExpansionTOL | EJ
|
|
}
|
|
|
|
[Flags]
|
|
public enum CharacterListFlags
|
|
{
|
|
None = 0x00000000,
|
|
Unk1 = 0x00000001,
|
|
OverwriteConfigButton = 0x00000002,
|
|
OneCharacterSlot = 0x00000004,
|
|
ContextMenus = 0x00000008,
|
|
SlotLimit = 0x00000010,
|
|
AOS = 0x00000020,
|
|
SixthCharacterSlot = 0x00000040,
|
|
SE = 0x00000080,
|
|
ML = 0x00000100,
|
|
Unk2 = 0x00000200,
|
|
UO3DClientType = 0x00000400,
|
|
Unk3 = 0x00000800,
|
|
SeventhCharacterSlot = 0x00001000,
|
|
Unk4 = 0x00002000,
|
|
NewMovementSystem = 0x00004000, // Doesn't seem to be used on OSI
|
|
NewFeluccaAreas = 0x00008000,
|
|
|
|
ExpansionNone = ContextMenus,
|
|
ExpansionT2A = ContextMenus,
|
|
ExpansionUOR = ContextMenus,
|
|
ExpansionUOTD = ContextMenus,
|
|
ExpansionLBR = ContextMenus,
|
|
ExpansionAOS = ContextMenus | AOS,
|
|
ExpansionSE = ExpansionAOS | SE,
|
|
ExpansionML = ExpansionSE | ML,
|
|
ExpansionSA = ExpansionML,
|
|
ExpansionHS = ExpansionSA,
|
|
ExpansionTOL = ExpansionHS,
|
|
ExpansionEJ = ExpansionTOL
|
|
}
|
|
|
|
[Flags]
|
|
public enum HousingFlags
|
|
{
|
|
None = 0x0,
|
|
AOS = 0x10,
|
|
SE = 0x40,
|
|
ML = 0x80,
|
|
Crystal = 0x200,
|
|
SA = 0x10000,
|
|
HS = 0x20000,
|
|
Gothic = 0x40000,
|
|
Rustic = 0x80000,
|
|
Jungle = 0x100000,
|
|
Shadowguard = 0x200000,
|
|
TOL = 0x400000,
|
|
EJ = 0x800000,
|
|
|
|
HousingAOS = AOS,
|
|
HousingSE = HousingAOS | SE,
|
|
HousingML = HousingSE | ML | Crystal,
|
|
HousingSA = HousingML | SA | Gothic | Rustic,
|
|
HousingHS = HousingSA | HS,
|
|
HousingTOL = HousingHS | TOL | Jungle | Shadowguard,
|
|
HousingEJ = HousingTOL | EJ
|
|
}
|
|
|
|
public class ExpansionInfo
|
|
{
|
|
static ExpansionInfo()
|
|
{
|
|
Table = new[]
|
|
{
|
|
new ExpansionInfo(
|
|
0,
|
|
"None",
|
|
ClientFlags.None,
|
|
FeatureFlags.ExpansionNone,
|
|
CharacterListFlags.ExpansionNone,
|
|
HousingFlags.None
|
|
),
|
|
new ExpansionInfo(
|
|
1,
|
|
"The Second Age",
|
|
ClientFlags.Felucca,
|
|
FeatureFlags.ExpansionT2A,
|
|
CharacterListFlags.ExpansionT2A,
|
|
HousingFlags.None
|
|
),
|
|
new ExpansionInfo(
|
|
2,
|
|
"Renaissance",
|
|
ClientFlags.Trammel,
|
|
FeatureFlags.ExpansionUOR,
|
|
CharacterListFlags.ExpansionUOR,
|
|
HousingFlags.None
|
|
),
|
|
new ExpansionInfo(
|
|
3,
|
|
"Third Dawn",
|
|
ClientFlags.Ilshenar,
|
|
FeatureFlags.ExpansionUOTD,
|
|
CharacterListFlags.ExpansionUOTD,
|
|
HousingFlags.None
|
|
),
|
|
new ExpansionInfo(
|
|
4,
|
|
"Blackthorn's Revenge",
|
|
ClientFlags.Ilshenar,
|
|
FeatureFlags.ExpansionLBR,
|
|
CharacterListFlags.ExpansionLBR,
|
|
HousingFlags.None
|
|
),
|
|
new ExpansionInfo(
|
|
5,
|
|
"Age of Shadows",
|
|
ClientFlags.Malas,
|
|
FeatureFlags.ExpansionAOS,
|
|
CharacterListFlags.ExpansionAOS,
|
|
HousingFlags.HousingAOS
|
|
),
|
|
new ExpansionInfo(
|
|
6,
|
|
"Samurai Empire",
|
|
ClientFlags.Tokuno,
|
|
FeatureFlags.ExpansionSE,
|
|
CharacterListFlags.ExpansionSE,
|
|
HousingFlags.HousingSE
|
|
),
|
|
new ExpansionInfo(
|
|
7,
|
|
"Mondain's Legacy",
|
|
new ClientVersion("5.0.0a"),
|
|
FeatureFlags.ExpansionML,
|
|
CharacterListFlags.ExpansionML,
|
|
HousingFlags.HousingML
|
|
),
|
|
new ExpansionInfo(
|
|
8,
|
|
"Stygian Abyss",
|
|
ClientFlags.TerMur,
|
|
FeatureFlags.ExpansionSA,
|
|
CharacterListFlags.ExpansionSA,
|
|
HousingFlags.HousingSA
|
|
),
|
|
new ExpansionInfo(
|
|
9,
|
|
"High Seas",
|
|
new ClientVersion("7.0.9.0"),
|
|
FeatureFlags.ExpansionHS,
|
|
CharacterListFlags.ExpansionHS,
|
|
HousingFlags.HousingHS
|
|
),
|
|
new ExpansionInfo(
|
|
10,
|
|
"Time of Legends",
|
|
new ClientVersion("7.0.45.65"),
|
|
FeatureFlags.ExpansionTOL,
|
|
CharacterListFlags.ExpansionTOL,
|
|
HousingFlags.HousingTOL
|
|
),
|
|
new ExpansionInfo(
|
|
11,
|
|
"Endless Journey",
|
|
new ClientVersion("7.0.61.0"),
|
|
FeatureFlags.ExpansionEJ,
|
|
CharacterListFlags.ExpansionEJ,
|
|
HousingFlags.HousingEJ
|
|
)
|
|
};
|
|
}
|
|
|
|
public ExpansionInfo(
|
|
int id,
|
|
string name,
|
|
ClientFlags clientFlags,
|
|
FeatureFlags supportedFeatures,
|
|
CharacterListFlags charListFlags,
|
|
HousingFlags customHousingFlag
|
|
)
|
|
: this(id, name, supportedFeatures, charListFlags, customHousingFlag) =>
|
|
ClientFlags = clientFlags;
|
|
|
|
public ExpansionInfo(
|
|
int id,
|
|
string name,
|
|
ClientVersion requiredClient,
|
|
FeatureFlags supportedFeatures,
|
|
CharacterListFlags charListFlags,
|
|
HousingFlags customHousingFlag
|
|
)
|
|
: this(id, name, supportedFeatures, charListFlags, customHousingFlag) =>
|
|
RequiredClient = requiredClient;
|
|
|
|
private ExpansionInfo(
|
|
int id,
|
|
string name,
|
|
FeatureFlags supportedFeatures,
|
|
CharacterListFlags charListFlags,
|
|
HousingFlags customHousingFlag
|
|
)
|
|
{
|
|
ID = id;
|
|
Name = name;
|
|
|
|
SupportedFeatures = supportedFeatures;
|
|
CharacterListFlags = charListFlags;
|
|
CustomHousingFlag = customHousingFlag;
|
|
}
|
|
|
|
public static ExpansionInfo CoreExpansion => GetInfo(Core.Expansion);
|
|
|
|
public static ExpansionInfo[] Table { get; }
|
|
|
|
public int ID { get; }
|
|
public string Name { get; set; }
|
|
|
|
public ClientFlags ClientFlags { get; set; }
|
|
public FeatureFlags SupportedFeatures { get; set; }
|
|
public CharacterListFlags CharacterListFlags { get; set; }
|
|
public ClientVersion RequiredClient { get; set; }
|
|
public HousingFlags CustomHousingFlag { get; set; }
|
|
|
|
public static FeatureFlags GetFeatures(Expansion ex)
|
|
{
|
|
var info = GetInfo(ex);
|
|
|
|
if (info != null)
|
|
{
|
|
return info.SupportedFeatures;
|
|
}
|
|
|
|
return ex switch
|
|
{
|
|
Expansion.None => FeatureFlags.ExpansionNone,
|
|
Expansion.T2A => FeatureFlags.ExpansionT2A,
|
|
Expansion.UOR => FeatureFlags.ExpansionUOR,
|
|
Expansion.UOTD => FeatureFlags.ExpansionUOTD,
|
|
Expansion.LBR => FeatureFlags.ExpansionLBR,
|
|
Expansion.AOS => FeatureFlags.ExpansionAOS,
|
|
Expansion.SE => FeatureFlags.ExpansionSE,
|
|
Expansion.ML => FeatureFlags.ExpansionML,
|
|
Expansion.SA => FeatureFlags.ExpansionSA,
|
|
Expansion.HS => FeatureFlags.ExpansionHS,
|
|
Expansion.TOL => FeatureFlags.ExpansionTOL,
|
|
Expansion.EJ => FeatureFlags.EJ,
|
|
_ => FeatureFlags.ExpansionNone
|
|
};
|
|
}
|
|
|
|
public static ExpansionInfo GetInfo(Expansion ex) => GetInfo((int)ex);
|
|
|
|
public static ExpansionInfo GetInfo(int ex)
|
|
{
|
|
var v = ex;
|
|
|
|
if (v < 0 || v >= Table.Length)
|
|
{
|
|
v = 0;
|
|
}
|
|
|
|
return Table[v];
|
|
}
|
|
|
|
public override string ToString() => Name;
|
|
}
|
|
}
|