#W# Progress Save: Working on CharacterCreation.

.gitignore

@@ -45,3 +45,5 @@
 # Ignore everything under tools/ except the operator scripts checked in below.
 /tools/*
 !/tools/Export-IpBlocklist.ps1
+
+*.bak

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

@@ -80,39 +80,30 @@ public static partial class CharacterCreation
 
     public static readonly CityInfo[] OldHavenStartingCities =
     [
-        new("Haven", "The Bountiful Harvest Inn", 3677, 2625, 0, Map.Underworld),
+        //new("Haven", "The Bountiful Harvest Inn", 3677, 2625, 0, Map.Veridia),
-        new("Britain", "Sweet Dreams Inn", 1075074, 1496, 1628, 10, Map.Underworld),
+        //new("Bastion", "Sweet Dreams Inn", 1075074, 2782, 1940, 1, Map.Veridia),
-        new("Magincia", "The Great Horns Tavern", 1075077, 3734, 2222, 20, Map.Underworld),
+        //new("Magincia", "The Great Horns Tavern", 1075077, 3734, 2222, 20, Map.Veridia),
-    ];
-
-    public static readonly CityInfo[] VeridiaStartingCities =
-    [
-        new("Yew", "The Empath Abbey", 1075072, 633, 858, 0, Map.Veridia),
-        new("Minoc", "The Barnacle", 1075073, 2476, 413, 15, Map.Veridia),
-        new("Britain", "Sweet Dreams Inn", 1075074, 1496, 1628, 10, Map.Veridia),
-        new("Moonglow", "The Scholars Inn", 1075075, 4408, 1168, 0, Map.Veridia),
-        new("Trinsic", "The Traveler's Inn", 1075076, 1845, 2745, 0, Map.Veridia),
-        new("Magincia", "The Great Horns Tavern", 1075077, 3734, 2222, 20, Map.Veridia),
-        new("Jhelom", "The Mercenary Inn", 1075078, 1374, 3826, 0, Map.Veridia),
-        new("Skara Brae", "The Falconer's Inn", 1075079, 618, 2234, 0, Map.Veridia),
-        new("Vesper", "The Ironwood Inn", 1075080, 2771, 976, 0, Map.Veridia)
     ];
 
     public static readonly CityInfo[] UnderworldStartingCities =
     [
-        new("Yew", "The Empath Abbey", 1075072, 633, 858, 0, Map.Underworld),
+    ];
-        new("Minoc", "The Barnacle", 1075073, 2476, 413, 15, Map.Underworld),
+
-        new("Moonglow", "The Scholars Inn", 1075075, 4408, 1168, 0, Map.Underworld),
+    public static readonly CityInfo[] VeridiaStartingCities =
-        new("Trinsic", "The Traveler's Inn", 1075076, 1845, 2745, 0, Map.Underworld),
+    [
-        new("Jhelom", "The Mercenary Inn", 1075078, 1374, 3826, 0, Map.Underworld),
+        new("Mireport", "The Empath Abbey", 1075072, 367, 1353, 0, Map.Veridia),
-        new("Skara Brae", "The Falconer's Inn", 1075079, 618, 2234, 0, Map.Underworld),
+        new("Watchpass", "The Barnacle", 1075073, 4569, 538, 0, Map.Veridia),
-        new("Vesper", "The Ironwood Inn", 1075080, 2771, 976, 0, Map.Underworld),
+        //new("Fairwinds", "The Scholars Inn", 1075075, 4367, 1055, 0, Map.Veridia),
+        new("Rivermouth", "The Traveler's Inn", 1075076, 1753, 2785, 0, Map.Veridia),
+        new("Cresthaven", "The Mercenary Inn", 1075078, 2946, 788, 2, Map.Veridia),
+        new("Coldbarrow", "The Falconer's Inn", 1075079, 3587, 378, 2, Map.Veridia),
+        //new("End's Wharf", "The Ironwood Inn", 1075080, 4485, 104, 2, Map.Veridia),
     ];
 
     public static readonly CityInfo[] NewHavenStartingCities =
     [
-        new("New Haven", "The Bountiful Harvest Inn", 1150168, 3503, 2574, 14, Map.Underworld),
+        new("Stonehollow", "The Bountiful Harvest Inn", 1150168, 4197, 2537, 0, Map.Veridia),
-        new("Britain", "The Wayfarer's Inn", 1075074, 1602, 1591, 20, Map.Underworld)
+        new("Bastion", "The Wayfarer's Inn", 1075074, 2782, 1940, 1, Map.Veridia),
         // Magincia removed because it burned down.
     ];
 
@@ -130,27 +121,27 @@ public static partial class CharacterCreation
     {
         var pre6000ClientSupport = TileMatrix.Pre6000ClientSupport;
         var availableMaps = ExpansionInfo.CoreExpansion.MapSelectionFlags;
-        var trammelAvailable = availableMaps.Includes(MapSelectionFlags.Underworld);
+        var veridiaAvailable = availableMaps.Includes(MapSelectionFlags.Veridia);
         var terMerAvailable = availableMaps.Includes(MapSelectionFlags.TerMur);
 
-        if (trammelAvailable)
+        if (veridiaAvailable)
         {
             if (pre6000ClientSupport)
             {
-                return [..OldHavenStartingCities, ..UnderworldStartingCities];
+                return [..OldHavenStartingCities, ..VeridiaStartingCities];
             }
 
             if (terMerAvailable)
             {
-                return [..NewHavenStartingCities, ..UnderworldStartingCities, ..StartingCitiesSA];
+                return [..NewHavenStartingCities, ..VeridiaStartingCities, ..StartingCitiesSA];
             }
 
-            return [..NewHavenStartingCities, ..UnderworldStartingCities];
+            return [..NewHavenStartingCities, ..VeridiaStartingCities];
         }
 
-        if (availableMaps.Includes(MapSelectionFlags.Veridia))
+        if (availableMaps.Includes(MapSelectionFlags.Underworld))
         {
-            return VeridiaStartingCities;
+            return UnderworldStartingCities;
         }
 
         logger.Error("No starting cities are available.");
@@ -308,10 +299,10 @@ public static partial class CharacterCreation
 
         if (m.AccessLevel > AccessLevel.Player)
         {
-            var map = availableMaps.Includes(MapSelectionFlags.Veridia) ? Map.Veridia : Map.Underworld;
+            var map = availableMaps.Includes(MapSelectionFlags.Underworld) ? Map.Underworld : Map.Veridia;
-            if (availableMaps.Includes(MapSelectionFlags.Veridia))
+            if (availableMaps.Includes(MapSelectionFlags.Underworld))
             {
-                return new CityInfo("Green Acres", "Green Acres", 5445, 1153, 0, map);
+                return new CityInfo("Green Acres", "Green Acres", 5445, 1153, 0, Map.Veridia);
             }
         }
 
@@ -337,7 +328,7 @@ public static partial class CharacterCreation
                          * 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 Underworld facet.
+                         * Haven on the Veridia facet.
                          */
                         Timer.StartTimer(BadStartMessageDelay, () => m.SendLocalizedMessage(1062205));
                         return GetStartingCities()[0];
@@ -363,7 +354,7 @@ public static partial class CharacterCreation
                          * installation and cannot be transported to Tokuno.
                          * You will not be able to take your new player quest in Tokuno
                          * without an SE client. You are now being taken to the city of
-                         * Haven on the Underworld facet.
+                         * Haven on the Veridia facet.
                          */
                         Timer.StartTimer(BadStartMessageDelay, () => m.SendLocalizedMessage(1063487));
                         return GetStartingCities()[0];
@@ -385,7 +376,7 @@ public static partial class CharacterCreation
                          * installation and cannot be transported to Tokuno.
                          * You will not be able to take your new player quest in Tokuno
                          * without an SE client. You are now being taken to the city of
-                         * Haven on the Underworld facet.
+                         * Haven on the Veridia facet.
                          */
                         Timer.StartTimer(BadStartMessageDelay, () => m.SendLocalizedMessage(1063487));
                         return GetStartingCities()[0];

Run.sh

@@ -1,10 +1,16 @@
 #!/usr/bin/env bash
-if ( gprep -f ModernUO.dll > /dev/null)
+if ( pgrep -f ModernUO.dll > /dev/null)
 then
   echo "________________________________"
   echo "| A Server is already running!! "
   echo "--------------------------------"
 else
+  echo "________________________________"
+  echo "| Compiling server files."
+  echo "--------------------------------"
+  dotnet publish Projects/Application/Application.csproj -c Release -r linux-x64 --self-contained=false
+  echo ""
+  echo ""
   echo "________________________________"
   echo "| Starting Server...."
   echo "--------------------------------"