From de0bf03f4656a355d582058b429fa99c4de283ba Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Tue, 12 Apr 2022 20:52:53 -0700
Subject: [PATCH] fix: Simplifies expansion checks (#994)

---
 Distribution/Data/expansion.json              | 42 +++++++++----------
 Projects/Server/ExpansionInfo.cs              |  9 ++--
 .../Network/Packets/OutgoingAccountPackets.cs |  1 -
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Distribution/Data/expansion.json b/Distribution/Data/expansion.json
index e0b036f61..50ce99c51 100644
--- a/Distribution/Data/expansion.json
+++ b/Distribution/Data/expansion.json
@@ -335,9 +335,9 @@
     "ClientFlags": "Malas",
     "FeatureFlags": {
       "None": false,
-      "T2A": true,
-      "UOR": true,
-      "UOTD": true,
+      "T2A": false,
+      "UOR": false,
+      "UOTD": false,
       "LBR": true,
       "AOS": true,
       "SixthCharacterSlot": false,
@@ -401,9 +401,9 @@
     "ClientFlags": "Tokuno",
     "FeatureFlags": {
       "None": false,
-      "T2A": true,
-      "UOR": true,
-      "UOTD": true,
+      "T2A": false,
+      "UOR": false,
+      "UOTD": false,
       "LBR": true,
       "AOS": true,
       "SixthCharacterSlot": false,
@@ -467,9 +467,9 @@
     "ClientFlags": null,
     "FeatureFlags": {
       "None": false,
-      "T2A": true,
-      "UOR": true,
-      "UOTD": true,
+      "T2A": false,
+      "UOR": false,
+      "UOTD": false,
       "LBR": true,
       "AOS": true,
       "SixthCharacterSlot": false,
@@ -533,9 +533,9 @@
     "ClientFlags": "TerMur",
     "FeatureFlags": {
       "None": false,
-      "T2A": true,
-      "UOR": true,
-      "UOTD": true,
+      "T2A": false,
+      "UOR": false,
+      "UOTD": false,
       "LBR": true,
       "AOS": true,
       "SixthCharacterSlot": false,
@@ -599,9 +599,9 @@
     "ClientFlags": null,
     "FeatureFlags": {
       "None": false,
-      "T2A": true,
-      "UOR": true,
-      "UOTD": true,
+      "T2A": false,
+      "UOR": false,
+      "UOTD": false,
       "LBR": true,
       "AOS": true,
       "SixthCharacterSlot": false,
@@ -665,9 +665,9 @@
     "ClientFlags": null,
     "FeatureFlags": {
       "None": false,
-      "T2A": true,
-      "UOR": true,
-      "UOTD": true,
+      "T2A": false,
+      "UOR": false,
+      "UOTD": false,
       "LBR": true,
       "AOS": true,
       "SixthCharacterSlot": false,
@@ -731,9 +731,9 @@
     "ClientFlags": null,
     "FeatureFlags": {
       "None": false,
-      "T2A": true,
-      "UOR": true,
-      "UOTD": true,
+      "T2A": false,
+      "UOR": false,
+      "UOTD": false,
       "LBR": true,
       "AOS": true,
       "SixthCharacterSlot": false,
diff --git a/Projects/Server/ExpansionInfo.cs b/Projects/Server/ExpansionInfo.cs
index 18407c052..fbbbdd2bb 100644
--- a/Projects/Server/ExpansionInfo.cs
+++ b/Projects/Server/ExpansionInfo.cs
@@ -57,7 +57,7 @@ namespace Server
     {
         None = 0x00000000,
         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,
         LBR = 0x00000008,
         AOS = 0x00000010,
@@ -65,9 +65,9 @@ namespace Server
         SE = 0x00000040,
         ML = 0x00000080,
         EigthAge = 0x00000100,
-        NinthAge = 0x00000200, /* Crystal/Shadow Custom House Tiles */
+        NinthAge = 0x00000200, // Crystal/Shadow Custom House Tiles
         TenthAge = 0x00000400,
-        IncreasedStorage = 0x00000800, /* Increased Housing/Bank Storage */
+        IncreasedStorage = 0x00000800, // Increased Housing/Bank Storage
         SeventhCharacterSlot = 0x00001000,
         RoleplayFaces = 0x00002000,
         TrialAccount = 0x00004000,
@@ -86,7 +86,8 @@ namespace Server
         ExpansionUOR = ExpansionT2A | UOR,
         ExpansionUOTD = ExpansionUOR | UOTD,
         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,
         ExpansionML = ExpansionSE | ML | NinthAge,
         ExpansionSA = ExpansionML | SA | Gothic | Rustic,
diff --git a/Projects/Server/Network/Packets/OutgoingAccountPackets.cs b/Projects/Server/Network/Packets/OutgoingAccountPackets.cs
index d29a8cbe4..8e6e56d32 100644
--- a/Projects/Server/Network/Packets/OutgoingAccountPackets.cs
+++ b/Projects/Server/Network/Packets/OutgoingAccountPackets.cs
@@ -149,7 +149,6 @@ public static class OutgoingAccountPackets
         if (ns.Account.Limit >= 6)
         {
             flags |= FeatureFlags.LiveAccount;
-            flags &= ~FeatureFlags.UOTD;
 
             if (ns.Account.Limit > 6)
             {