#W# Era: Changed from UOR back to AOS.

Distribution/Configuration/expansion.json

@@ -1,14 +1,14 @@
 {
-  "Id": 2,
-  "Name": "Renaissance",
-  "ClientFlags": "Trammel",
+  "Id": 5,
+  "Name": "Age of Shadows",
+  "ClientFlags": "Malas",
   "SupportedFeatures": {
     "ExpansionT2A": true,
     "T2A": true,
     "UOR": true,
     "UOTD": false,
-    "LBR": false,
-    "AOS": false,
+    "LBR": true,
+    "AOS": true,
     "SixthCharacterSlot": false,
     "SE": false,
     "ML": false,
@@ -19,7 +19,7 @@
     "SeventhCharacterSlot": false,
     "RoleplayFaces": false,
     "TrialAccount": false,
-    "LiveAccount": false,
+    "LiveAccount": true,
     "SA": false,
     "HS": false,
     "Gothic": false,
@@ -40,7 +40,7 @@
     "ExpansionUOR": true,
     "ContextMenus": true,
     "SlotLimit": false,
-    "AOS": false,
+    "AOS": true,
     "SixthCharacterSlot": false,
     "SE": false,
     "ML": false,
@@ -53,8 +53,8 @@
     "NewFeluccaAreas": false
   },
   "HousingFlags": {
-    "AOS": false,
-    "HousingAOS": false,
+    "AOS": true,
+    "HousingAOS": true,
     "SE": false,
     "ML": false,
     "Crystal": false,
@@ -67,12 +67,12 @@
     "TOL": false,
     "EJ": false
   },
-  "MobileStatusVersion": 3,
+  "MobileStatusVersion": 6,
   "MapSelectionFlags": {
     "Felucca": true,
     "Trammel": true,
-    "Ilshenar": false,
-    "Malas": false,
+    "Ilshenar": true,
+    "Malas": true,
     "Tokuno": false,
     "TerMur": false
   }

Distribution/Configuration/modernuo.json

@@ -45,7 +45,9 @@
     "crashGuard.restartServer": "True",
     "crashGuard.saveBackup": "True",
     "ethics.enable": "False",
+    "factions.enabled": "False",
     "houseDecay.enable": "True",
+    "melee.enableInstaHit": "True",
     "movement.delay.runFoot": "200",
     "movement.delay.runMount": "100",
     "movement.delay.turn": "0",
@@ -72,6 +74,7 @@
     "network.sendBufferGrowthBudget": "268435456",
     "network.sendBufferMaxSize": "2097152",
     "network.sendBufferSize": "262144",
+    "opl.enable": "True",
     "pages.discordWebhookUrl": null,
     "pathfinding.enable": "False",
     "pathfinding.maxResidentChunks": "8192",
@@ -93,21 +96,18 @@
     "stamina.stonesPerOverweightLoss": "25",
     "stats.gainChanceMultiplier": "1",
     "stats.statMax": "100",
+    "t2aCraftMenus": "False",
     "testCenter.enable": "False",
     "timer.initialPoolCapacity": "1024",
     "timer.maxPoolCapacity": "16384",
     "uogateway.enabled": "True",
+    "vendor.isInvulnerable": "True",
     "vetRewards.enable": "False",
     "vetRewards.rewardInterval": "30.00:00:00",
     "vetRewards.skillCapRewards": "False",
     "visibleDamage": "True",
     "world.enableAutoRestart": "False",
     "world.savePath": "Saves",
-    "world.useMultithreadedSaves": "True",
-    "factions.enabled": "False",
-    "vendor.isInvulnerable": "True",
-    "melee.enableInstaHit": "True",
-    "t2aCraftMenus": "False",
-    "opl.enable": "False"
+    "world.useMultithreadedSaves": "True"
   }
 }

Distribution/Data/Professions/AOS/prof.txt

@@ -1,32 +1,32 @@
 Begin
-	Name			Thief
-	TrueName		"Thief"
+	Name			Paladin
+	TrueName		"Paladin"
 	NameId			1061177
 	DescId			1061227
 	Desc			5
 	TopLevel		true
 	Gump			5587
 	Type			Profession
-	Skill			Hiding		40
-	Skill			Stealing 		30
-	Skill			Lockpicking		30
+	Skill			Chivalry		50
+	Skill			Tactics 		50
+	Skill			Wrestling		0
 	Stat			Str			45
 	Stat			Dex			20
 	Stat			Int			15
 End
 
 Begin
-	Name			Bard
-	TrueName		"Bard"
+	Name			Necromancer
+	TrueName		"Necromancer"
 	NameId			1061178
 	DescId			1061228
 	Desc			4
 	TopLevel		true
 	Gump			5557
 	Type			Profession
-	Skill			Musicianship		40
-	Skill			Peacemaking 		30
-	Skill			Provocation 		30
+	Skill			Necromancy		50
+	Skill			Swordsmanship 		30
+	Skill			Tactics 		20
 	Stat			Str			25
 	Stat			Dex			20
 	Stat			Int			35
@@ -41,9 +41,9 @@ Begin
 	TopLevel		true
 	Gump			5577
 	Type			Profession
-	Skill			Tactics			30
-	Skill			Healing			30
-	Skill			Swordsmanship		40
+	Skill			Tactics			50
+	Skill			Healing			45
+	Skill			Swordsmanship		5
 	Stat			Str			35
 	Stat			Dex			35
 	Stat			Int			10

Projects/UOContent/Engines/Character Creation/CharacterCreation.cs

@@ -315,19 +315,6 @@ public static partial class CharacterCreation
             {
                 case "necromancer":
                     {
-                        if ((flags & ClientFlags.Malas) != 0 && availableMaps.Includes(MapSelectionFlags.Malas))
-                        {
-                            return new CityInfo("Umbra", "Mardoth's Tower", 2114, 1301, -50, Map.Malas);
-                        }
-
-                        /*
-                         * Unfortunately you are playing on a *NON-Age-Of-Shadows* game
-                         * installation and cannot be transported to Malas.
-                         * You will not be able to take your new player quest in Malas
-                         * without an AOS client.  You are now being taken to the city of
-                         * Haven on the Trammel facet.
-                         */
-                        Timer.StartTimer(BadStartMessageDelay, () => m.SendLocalizedMessage(1062205));
                         return GetStartingCities()[0];
                     }
                 case "paladin":