Make generate spawners DRY

modernuo · Jun 6, 2024 · feadada · feadada
1 parent 45f489b
commit feadada
Showing 1 changed file with 43 additions and 70 deletions.
diff --git a/Projects/UOContent/Gumps/AdminGump.cs b/Projects/UOContent/Gumps/AdminGump.cs
@@ -2012,39 +2012,7 @@ public override void OnResponse(NetState sender, in RelayInfo info)
                                 }
                             case 103:
                                 {
-                                    var folder = Core.SA ? "post-uoml" : "uoml";
-
-                                    var availableMaps = ExpansionInfo.CoreExpansion.MapSelectionFlags;
-                                    if (Core.SA && availableMaps.Includes(MapSelectionFlags.TerMur))
-                                    {
-                                        InvokeCommand($"GenerateSpawners Data/Spawns/post-uoml/termur/*.json");
-                                    }
-
-                                    if (availableMaps.Includes(MapSelectionFlags.Malas))
-                                    {
-                                        InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/malas/*.json");
-                                    }
-
-                                    if (availableMaps.Includes(MapSelectionFlags.Tokuno))
-                                    {
-                                        InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/tokuno/*.json");
-                                    }
-
-                                    if (availableMaps.Includes(MapSelectionFlags.Ilshenar))
-                                    {
-                                        InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/ilshenar/*.json");
-                                    }
-
-                                    if (availableMaps.Includes(MapSelectionFlags.Trammel))
-                                    {
-                                        InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/trammel/*.json");
-                                    }
-
-                                    if (availableMaps.Includes(MapSelectionFlags.Felucca))
-                                    {
-                                        InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/felucca/*.json");
-                                    }
-
+                                    GenerateSpawners();
                                     notice = "Spawners have been generated.";
                                     break;
                                 }
@@ -2103,52 +2071,21 @@ public override void OnResponse(NetState sender, in RelayInfo info)
                                     notice = "Khaldun puzzles have been generated.";
                                     break;
                                 }
-                            
+
                             case 114:
                                 {
                                     // 101
                                     InvokeCommand("TelGen");
-                                    
+
                                     // 102
                                     InvokeCommand("MoonGen");
-                                    
+
                                     // 103
                                     InvokeCommand("DoorGen");
-
-                                    // 104
-                                    var folder = Core.SA ? "post-uoml" : "uoml";
-
-                                    var availableMaps = ExpansionInfo.CoreExpansion.MapSelectionFlags;
-                                    if (Core.SA && availableMaps.Includes(MapSelectionFlags.TerMur))
-                                    {
-                                        InvokeCommand($"GenerateSpawners Data/Spawns/post-uoml/termur/*.json");
-                                    }
-
-                                    if (availableMaps.Includes(MapSelectionFlags.Malas))
-                                    {
-                                        InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/malas/*.json");
-                                    }
-
-                                    if (availableMaps.Includes(MapSelectionFlags.Tokuno))
-                                    {
-                                        InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/tokuno/*.json");
-                                    }
-
-                                    if (availableMaps.Includes(MapSelectionFlags.Ilshenar))
-                                    {
-                                        InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/ilshenar/*.json");
-                                    }
 
-                                    if (availableMaps.Includes(MapSelectionFlags.Trammel))
-                                    {
-                                        InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/trammel/*.json");
-                                    }
+                                    // 104
+                                    GenerateSpawners();
 
-                                    if (availableMaps.Includes(MapSelectionFlags.Felucca))
-                                    {
-                                        InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/felucca/*.json");
-                                    }
-
                                     // 105
                                     InvokeCommand("SignGen");
 
@@ -2176,7 +2113,7 @@ public override void OnResponse(NetState sender, in RelayInfo info)
 
                                     // 113
                                     InvokeCommand("GenKhaldun");
-                                    
+
                                     notice = "All the above options have been generated at once.";
                                     break;
                                 }
@@ -3980,6 +3917,42 @@ public override void OnResponse(NetState sender, in RelayInfo info)
             }
         }
 
+        private void GenerateSpawners()
+        {
+            var folder = Core.SA ? "post-uoml" : "uoml";
+
+            var availableMaps = ExpansionInfo.CoreExpansion.MapSelectionFlags;
+            if (Core.SA && availableMaps.Includes(MapSelectionFlags.TerMur))
+            {
+                InvokeCommand("GenerateSpawners Data/Spawns/post-uoml/termur/*.json");
+            }
+
+            if (availableMaps.Includes(MapSelectionFlags.Malas))
+            {
+                InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/malas/*.json");
+            }
+
+            if (availableMaps.Includes(MapSelectionFlags.Tokuno))
+            {
+                InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/tokuno/*.json");
+            }
+
+            if (availableMaps.Includes(MapSelectionFlags.Ilshenar))
+            {
+                InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/ilshenar/*.json");
+            }
+
+            if (availableMaps.Includes(MapSelectionFlags.Trammel))
+            {
+                InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/trammel/*.json");
+            }
+
+            if (availableMaps.Includes(MapSelectionFlags.Felucca))
+            {
+                InvokeCommand($"GenerateSpawners Data/Spawns/{folder}/felucca/*.json");
+            }
+        }
+
         private void Shutdown(bool restart, bool save)
         {
             CommandLogging.WriteLine(