Skip to content

Add additional lines with different tracker images to responses #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MattEqualsCoder merged 8 commits into from
Apr 6, 2025
Merged

Add additional lines with different tracker images to responses #682

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
844ff18
Add additional lines with different tracker images to responses
MattEqualsCoder Apr 2, 2025
2a01bed
Add additional configs to the tracker profile configs
MattEqualsCoder Apr 4, 2025
c079d76
Updates for Windows version
MattEqualsCoder Apr 4, 2025
498368c
Fix clear location comments
MattEqualsCoder Apr 5, 2025
d30318e
Allow location comments for dungeon items
MattEqualsCoder Apr 5, 2025
77c8369
Merge branch 'main' into april-fools
MattEqualsCoder Apr 5, 2025
8ca1eec
Fix unit tests
MattEqualsCoder Apr 5, 2025
c3ebbb8
Fix warnings and issues from betus's stream
MattEqualsCoder Apr 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/TrackerCouncil.Smz3.Abstractions/TrackerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 0 additions & 8 deletions src/TrackerCouncil.Smz3.Data.SchemaGenerator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -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();
Expand Down
110 changes: 0 additions & 110 deletions src/TrackerCouncil.Smz3.Data/Configuration/ConfigFiles/DungeonConfig.cs
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions src/TrackerCouncil.Smz3.Data/Configuration/ConfigFiles/TrackerProfileConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
9 changes: 0 additions & 9 deletions src/TrackerCouncil.Smz3.Data/Configuration/ConfigProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
39 changes: 17 additions & 22 deletions src/TrackerCouncil.Smz3.Data/Configuration/ConfigServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading