From 75a3f0a92cbdf8ac29193d4bbbbc17d7a02349ab Mon Sep 17 00:00:00 2001 From: Daniel Dias Rodrigues Date: Sat, 8 Jun 2024 23:05:34 -0300 Subject: [PATCH] fix: Adds 'Do everything' option to AdminGump (#1817) --- Projects/UOContent/Gumps/AdminGump.cs | 117 ++++++++++++++++++-------- 1 file changed, 84 insertions(+), 33 deletions(-) diff --git a/Projects/UOContent/Gumps/AdminGump.cs b/Projects/UOContent/Gumps/AdminGump.cs index 0b5d562cf..f056af5db 100644 --- a/Projects/UOContent/Gumps/AdminGump.cs +++ b/Projects/UOContent/Gumps/AdminGump.cs @@ -278,6 +278,7 @@ namespace Server.Gumps AddButtonLabeled(220, 300, GetButtonID(3, 112), "Doom"); AddButtonLabeled(20, 325, GetButtonID(3, 113), "Khaldun Puzzles"); + AddButtonLabeled(220, 325, GetButtonID(3, 114), "Do everything"); goto case AdminGumpPage.Administer; } @@ -2011,39 +2012,7 @@ namespace Server.Gumps } 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,6 +2072,52 @@ namespace Server.Gumps break; } + case 114: + { + // 101 + InvokeCommand("TelGen"); + + // 102 + InvokeCommand("MoonGen"); + + // 103 + InvokeCommand("DoorGen"); + + // 104 + GenerateSpawners(); + + // 105 + InvokeCommand("SignGen"); + + // 106 + InvokeCommand("Decorate"); + + // 107 + InvokeCommand("GenChamps"); + + // 108 + InvokeCommand("DecorateMag"); + + // 109 + InvokeCommand("GenStealArties"); + + // 110 + InvokeCommand("SHTelGen"); + + // 111 + InvokeCommand("SecretLocGen"); + + // 112 + InvokeCommand("GenLeverPuzzle"); + InvokeCommand("GenGauntlet"); + + // 113 + InvokeCommand("GenKhaldun"); + + notice = "All the above options have been generated at once."; + break; + } + case 200: { InvokeCommand("Save"); @@ -3902,6 +3917,42 @@ namespace Server.Gumps } } + 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(