Merge pull request #682 from TheTrackerCouncil/april-fools

Add additional lines with different tracker images to responses

Author: MattEqualsCoder

src/TrackerCouncil.Smz3.Abstractions/TrackerBase.cs

@@ -82,11 +82,6 @@ public abstract class TrackerBase : IDisposable
     /// </summary>
     public IReadOnlyCollection<BasicVoiceRequest> Requests { get; protected init; } = null!;
 
-    /// <summary>
-    /// Metadata configs
-    /// </summary>
-    public Configs Configs { get; protected init; } = null!;
-
     /// <summary>
     /// Gets a dictionary containing the rules and the various speech
     /// recognition syntaxes.

src/TrackerCouncil.Smz3.Data.SchemaGenerator/Program.cs

@@ -23,7 +23,6 @@ public static class Program
     private static readonly List<(Type, string)> s_generationTypes = new()
     {
         (typeof(BossConfig), "bosses.json"),
-        (typeof(DungeonConfig), "dungeons.json"),
         (typeof(GameLinesConfig), "game.json"),
         (typeof(HintTileConfig), "hint_tiles.json"),
         (typeof(ItemConfig), "items.json"),
@@ -139,13 +138,6 @@ private static void CreateTemplates(string outputPath)
         var exampleBossConfig = BossConfig.Example();
         WriteTemplate(templatePath, "bosses", templateBossConfig, exampleBossConfig);
 
-        // Dungeon Template
-        var dungeonConfig = configProvider.GetDungeonConfig(new List<string>(), null);
-        var templateDungeonConfig = new DungeonConfig();
-        templateDungeonConfig.AddRange(dungeonConfig.Select(dungeon => new DungeonInfo() { Dungeon = dungeon.Dungeon, Type = templateDungeonConfig.GetType() }));
-        var exampleDungeonConfig = DungeonConfig.Example();
-        WriteTemplate(templatePath, "dungeons", templateDungeonConfig, exampleDungeonConfig);
-
         // Item Template
         var itemConfig = configProvider.GetItemConfig(new List<string>(), null);
         var templateItemConfig = new ItemConfig();

src/TrackerCouncil.Smz3.Data/Configuration/ConfigFiles/DungeonConfig.cs

@@ -4,4 +4,11 @@ public class TrackerProfileConfig
 {
     public bool UseAltVoice { get; set; }
     public ResponseConfig? ResponseConfig { get; set; }
+    public BossConfig? BossConfig { get; set; }
+    public ItemConfig? ItemConfig { get; set; }
+    public LocationConfig? LocationConfig { get; set; }
+    public RegionConfig? RegionConfig { get; set; }
+    public RequestConfig? RequestConfig { get; set; }
+    public RewardConfig? RewardConfig { get; set; }
+    public RoomConfig? RoomConfig { get; set; }
 }

src/TrackerCouncil.Smz3.Data/Configuration/ConfigFiles/TrackerProfileConfig.cs

@@ -98,15 +98,6 @@ protected virtual T LoadConfig<T>(string fileName)
     public virtual BossConfig GetBossConfig(IReadOnlyCollection<string> profiles, string? mood) =>
         LoadYamlConfigs<BossConfig, BossInfo>("bosses.yml", profiles, mood);
 
-    /// <summary>
-    /// Returns the configs with additional information for dungeons
-    /// </summary>
-    /// <param name="profiles">The selected tracker profile(s) to load</param>
-    /// <param name="mood">The current tracker mood to pick the specific mood file</param>
-    /// <returns></returns>
-    public virtual DungeonConfig GetDungeonConfig(IReadOnlyCollection<string> profiles, string? mood) =>
-        LoadYamlConfigs<DungeonConfig, DungeonInfo>("dungeons.yml", profiles, mood);
-
     /// <summary>
     /// Returns the configs with additional information for items
     /// </summary>

src/TrackerCouncil.Smz3.Data/Configuration/ConfigProvider.cs

@@ -15,90 +15,85 @@ public static IServiceCollection AddConfigs(this IServiceCollection services)
         });
 
         services.AddSingleton<Configs>();
-        services.AddTransient<IMetadataService, MetadataService>();
 
-        services.AddScoped(serviceProvider =>
-        {
-            var configs = serviceProvider.GetRequiredService<Configs>();
-            return configs.Bosses;
-        });
+        services.AddScoped<IMetadataService, MetadataService>();
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
-            return configs.Dungeons;
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
+            return configs.Bosses;
         });
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
             return configs.Items;
         });
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
             return configs.Locations;
         });
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
             return configs.Regions;
         });
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
             return configs.Requests;
         });
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
             return configs.Responses;
         });
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
             return configs.Rooms;
         });
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
             return configs.Rewards;
         });
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
             return configs.UILayouts;
         });
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
             return configs.GameLines;
         });
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
             return configs.MsuConfig;
         });
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
-            return configs.HintTileConfig;
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
+            return configs.HintTiles;
         });
 
         services.AddScoped(serviceProvider =>
         {
-            var configs = serviceProvider.GetRequiredService<Configs>();
-            return configs.MetadataConfig;
+            var configs = serviceProvider.GetRequiredService<IMetadataService>();
+            return configs.Metadata;
         });
 
         return services;