warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Simplifies expansion checks (#994)

Browse source
This commit is contained in:
Kamron Batman 2022-04-12 20:52:53 -07:00 • committed by GitHub
parent f91ebe8183
commit de0bf03f46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Distribution/Data/expansion.json
View file

@ -335,9 +335,9 @@
"ClientFlags": "Malas", "ClientFlags": "Malas",
"FeatureFlags": { "FeatureFlags": {
"None": false, "None": false,
"T2A": true, "T2A": false,
"UOR": true, "UOR": false,
"UOTD": true, "UOTD": false,
"LBR": true, "LBR": true,
"AOS": true, "AOS": true,
"SixthCharacterSlot": false, "SixthCharacterSlot": false,
@ -401,9 +401,9 @@
"ClientFlags": "Tokuno", "ClientFlags": "Tokuno",
"FeatureFlags": { "FeatureFlags": {
"None": false, "None": false,
"T2A": true, "T2A": false,
"UOR": true, "UOR": false,
"UOTD": true, "UOTD": false,
"LBR": true, "LBR": true,
"AOS": true, "AOS": true,
"SixthCharacterSlot": false, "SixthCharacterSlot": false,
@ -467,9 +467,9 @@
"ClientFlags": null, "ClientFlags": null,
"FeatureFlags": { "FeatureFlags": {
"None": false, "None": false,
"T2A": true, "T2A": false,
"UOR": true, "UOR": false,
"UOTD": true, "UOTD": false,
"LBR": true, "LBR": true,
"AOS": true, "AOS": true,
"SixthCharacterSlot": false, "SixthCharacterSlot": false,
@ -533,9 +533,9 @@
"ClientFlags": "TerMur", "ClientFlags": "TerMur",
"FeatureFlags": { "FeatureFlags": {
"None": false, "None": false,
"T2A": true, "T2A": false,
"UOR": true, "UOR": false,
"UOTD": true, "UOTD": false,
"LBR": true, "LBR": true,
"AOS": true, "AOS": true,
"SixthCharacterSlot": false, "SixthCharacterSlot": false,
@ -599,9 +599,9 @@
"ClientFlags": null, "ClientFlags": null,
"FeatureFlags": { "FeatureFlags": {
"None": false, "None": false,
"T2A": true, "T2A": false,
"UOR": true, "UOR": false,
"UOTD": true, "UOTD": false,
"LBR": true, "LBR": true,
"AOS": true, "AOS": true,
"SixthCharacterSlot": false, "SixthCharacterSlot": false,
@ -665,9 +665,9 @@
"ClientFlags": null, "ClientFlags": null,
"FeatureFlags": { "FeatureFlags": {
"None": false, "None": false,
"T2A": true, "T2A": false,
"UOR": true, "UOR": false,
"UOTD": true, "UOTD": false,
"LBR": true, "LBR": true,
"AOS": true, "AOS": true,
"SixthCharacterSlot": false, "SixthCharacterSlot": false,
@ -731,9 +731,9 @@
"ClientFlags": null, "ClientFlags": null,
"FeatureFlags": { "FeatureFlags": {
"None": false, "None": false,
"T2A": true, "T2A": false,
"UOR": true, "UOR": false,
"UOTD": true, "UOTD": false,
"LBR": true, "LBR": true,
"AOS": true, "AOS": true,
"SixthCharacterSlot": false, "SixthCharacterSlot": false,

9
Projects/Server/ExpansionInfo.cs
View file

@ -57,7 +57,7 @@ namespace Server
{ {
None = 0x00000000, None = 0x00000000,
T2A = 0x00000001, T2A = 0x00000001,
UOR = 0x00000002, UOR = 0x00000002, // In later clients, the T2A/UOR flags are negative feature flags to disable body replacement of Pre-AOS graphics.
UOTD = 0x00000004, UOTD = 0x00000004,
LBR = 0x00000008, LBR = 0x00000008,
AOS = 0x00000010, AOS = 0x00000010,
@ -65,9 +65,9 @@ namespace Server
SE = 0x00000040, SE = 0x00000040,
ML = 0x00000080, ML = 0x00000080,
EigthAge = 0x00000100, EigthAge = 0x00000100,
NinthAge = 0x00000200, /* Crystal/Shadow Custom House Tiles */ NinthAge = 0x00000200, // Crystal/Shadow Custom House Tiles
TenthAge = 0x00000400, TenthAge = 0x00000400,
IncreasedStorage = 0x00000800, /* Increased Housing/Bank Storage */ IncreasedStorage = 0x00000800, // Increased Housing/Bank Storage
SeventhCharacterSlot = 0x00001000, SeventhCharacterSlot = 0x00001000,
RoleplayFaces = 0x00002000, RoleplayFaces = 0x00002000,
TrialAccount = 0x00004000, TrialAccount = 0x00004000,
@ -86,7 +86,8 @@ namespace Server
ExpansionUOR = ExpansionT2A | UOR, ExpansionUOR = ExpansionT2A | UOR,
ExpansionUOTD = ExpansionUOR | UOTD, ExpansionUOTD = ExpansionUOR | UOTD,
ExpansionLBR = ExpansionUOTD | LBR, ExpansionLBR = ExpansionUOTD | LBR,
ExpansionAOS = ExpansionLBR | AOS | LiveAccount, // In later clients, the AOS+ expansions include the Publish 16 LBR flag, but not the previous expansions.
ExpansionAOS = LBR | AOS | LiveAccount,
ExpansionSE = ExpansionAOS | SE, ExpansionSE = ExpansionAOS | SE,
ExpansionML = ExpansionSE | ML | NinthAge, ExpansionML = ExpansionSE | ML | NinthAge,
ExpansionSA = ExpansionML | SA | Gothic | Rustic, ExpansionSA = ExpansionML | SA | Gothic | Rustic,

1
Projects/Server/Network/Packets/OutgoingAccountPackets.cs
View file

@ -149,7 +149,6 @@ public static class OutgoingAccountPackets
if (ns.Account.Limit >= 6) if (ns.Account.Limit >= 6)
{ {
flags |= FeatureFlags.LiveAccount; flags |= FeatureFlags.LiveAccount;
flags &= ~FeatureFlags.UOTD;
if (ns.Account.Limit > 6) if (ns.Account.Limit > 6)
{ {