diff --git a/GraalGmapGenerator/GmapContentGenerator.cs b/GraalGmapGenerator/Generators/GmapContentGenerator.cs similarity index 90% rename from GraalGmapGenerator/GmapContentGenerator.cs rename to GraalGmapGenerator/Generators/GmapContentGenerator.cs index 3cb178e..d308568 100644 --- a/GraalGmapGenerator/GmapContentGenerator.cs +++ b/GraalGmapGenerator/Generators/GmapContentGenerator.cs @@ -1,15 +1,16 @@ using System; using System.Collections.Generic; using System.Text; +using GraalGmapGenerator.Models; using GraalGmapGenerator.Options; -namespace GraalGmapGenerator +namespace GraalGmapGenerator.Generators { public class GmapContentGenerator { - readonly GmapContentGenerationOptions _options; + readonly GmapContentGeneratorOptions _options; - public GmapContentGenerator(GmapContentGenerationOptions options) + public GmapContentGenerator(GmapContentGeneratorOptions options) { _options = options ?? throw new ArgumentNullException(nameof(options)); } @@ -64,7 +65,7 @@ namespace GraalGmapGenerator stringBuilder.Append($"\"{level.FileName}\""); // Only append a comma if its NOT the end of the row - if (i % gmap.Width < (gmap.Width - 1)) + if (i % gmap.Width < gmap.Width - 1) { stringBuilder.Append(','); } diff --git a/GraalGmapGenerator/LevelContentGenerator.cs b/GraalGmapGenerator/Generators/LevelContentGenerator.cs similarity index 89% rename from GraalGmapGenerator/LevelContentGenerator.cs rename to GraalGmapGenerator/Generators/LevelContentGenerator.cs index a4f0cbc..a6bce94 100644 --- a/GraalGmapGenerator/LevelContentGenerator.cs +++ b/GraalGmapGenerator/Generators/LevelContentGenerator.cs @@ -1,17 +1,17 @@ using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; +using GraalGmapGenerator.Models; using GraalGmapGenerator.Options; -namespace GraalGmapGenerator +namespace GraalGmapGenerator.Generators { public class LevelContentGenerator { private string _templateContent; - private LevelContentGenerationOptions _options; + private LevelContentGeneratorOptions _options; - public LevelContentGenerator(LevelContentGenerationOptions options) + public LevelContentGenerator(LevelContentGeneratorOptions options) { _options = options; _templateContent = GetTemplateFileContent(options.TemplateFilePath); @@ -26,7 +26,7 @@ namespace GraalGmapGenerator if (_options.AddLevelLinks) { IEnumerable links = GetLevelLinks(gmap, level); - foreach(LevelLink link in links) + foreach (LevelLink link in links) { stringBuilder.AppendLine(link.ToString()); } @@ -60,7 +60,7 @@ namespace GraalGmapGenerator } // If level is not on the bottom row - if (level.Index < (gmap.Width * gmap.Height) - gmap.Width - 1) + if (level.Index < gmap.Width * gmap.Height - gmap.Width - 1) { int linkLevelIndex = level.Index + gmap.Width; string levelFileName = Level.GetFileName(gmap.Name, linkLevelIndex, level.LevelType); diff --git a/GraalGmapGenerator/GmapBuilder.cs b/GraalGmapGenerator/GmapBuilder.cs index 78ef256..8ef5389 100644 --- a/GraalGmapGenerator/GmapBuilder.cs +++ b/GraalGmapGenerator/GmapBuilder.cs @@ -1,4 +1,6 @@ -namespace GraalGmapGenerator +using GraalGmapGenerator.Models; + +namespace GraalGmapGenerator { public class GmapBuilder { @@ -40,10 +42,7 @@ _addLevelLinks = value; return this; } - - /// - /// Builds the gmap - /// + public Gmap Build() { return new Gmap( diff --git a/GraalGmapGenerator/GmapWriter.cs b/GraalGmapGenerator/GmapWriter.cs index 349a20c..4a0873a 100644 --- a/GraalGmapGenerator/GmapWriter.cs +++ b/GraalGmapGenerator/GmapWriter.cs @@ -1,5 +1,7 @@ using System.IO; using GraalGmapGenerator.Enums; +using GraalGmapGenerator.Generators; +using GraalGmapGenerator.Models; namespace GraalGmapGenerator { @@ -14,14 +16,14 @@ namespace GraalGmapGenerator Directory.CreateDirectory(destinationPath); } - var gmapContentGen = new GmapContentGenerator(new Options.GmapContentGenerationOptions + var gmapContentGen = new GmapContentGenerator(new Options.GmapContentGeneratorOptions { LevelType = LevelType.Nw }); GmapContent gmapContent = gmapContentGen.Generate(gmap); - var levelContentGen = new LevelContentGenerator(new Options.LevelContentGenerationOptions + var levelContentGen = new LevelContentGenerator(new Options.LevelContentGeneratorOptions { AddLevelLinks = gmap.AddLevelLinks, TemplateFilePath = DefaultTemplateFilePath diff --git a/GraalGmapGenerator/Gmap.cs b/GraalGmapGenerator/Models/Gmap.cs similarity index 94% rename from GraalGmapGenerator/Gmap.cs rename to GraalGmapGenerator/Models/Gmap.cs index 5ba4b42..193a66a 100644 --- a/GraalGmapGenerator/Gmap.cs +++ b/GraalGmapGenerator/Models/Gmap.cs @@ -1,4 +1,4 @@ -namespace GraalGmapGenerator +namespace GraalGmapGenerator.Models { public class Gmap { diff --git a/GraalGmapGenerator/GmapContent.cs b/GraalGmapGenerator/Models/GmapContent.cs similarity index 89% rename from GraalGmapGenerator/GmapContent.cs rename to GraalGmapGenerator/Models/GmapContent.cs index 7e83a88..15cb4e3 100644 --- a/GraalGmapGenerator/GmapContent.cs +++ b/GraalGmapGenerator/Models/GmapContent.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace GraalGmapGenerator +namespace GraalGmapGenerator.Models { public class GmapContent { diff --git a/GraalGmapGenerator/Level.cs b/GraalGmapGenerator/Models/Level.cs similarity index 87% rename from GraalGmapGenerator/Level.cs rename to GraalGmapGenerator/Models/Level.cs index 27974ee..7cd7342 100644 --- a/GraalGmapGenerator/Level.cs +++ b/GraalGmapGenerator/Models/Level.cs @@ -1,20 +1,20 @@ using System; using GraalGmapGenerator.Enums; -namespace GraalGmapGenerator +namespace GraalGmapGenerator.Models { public class Level { public const int Width = 64; public const int Height = 64; - + public string FileName { get; } public int Index { get; } public LevelType LevelType { get; } public Level(Gmap gmap, int index, LevelType levelType) { - FileName = Level.GetFileName(gmap.Name, index, levelType); + FileName = GetFileName(gmap.Name, index, levelType); Index = index; LevelType = levelType; } @@ -27,7 +27,7 @@ namespace GraalGmapGenerator throw new NotImplementedException($"{levelType} has not been implemented."); case LevelType.Nw: - return ".nw"; + return ".nw"; case LevelType.Graal: return ".graal"; diff --git a/GraalGmapGenerator/LevelLink.cs b/GraalGmapGenerator/Models/LevelLink.cs similarity index 74% rename from GraalGmapGenerator/LevelLink.cs rename to GraalGmapGenerator/Models/LevelLink.cs index 47af138..e875041 100644 --- a/GraalGmapGenerator/LevelLink.cs +++ b/GraalGmapGenerator/Models/LevelLink.cs @@ -1,4 +1,4 @@ -namespace GraalGmapGenerator +namespace GraalGmapGenerator.Models { public class LevelLink { @@ -10,7 +10,14 @@ namespace GraalGmapGenerator public string DestinationX { get; } public string DestinationY { get; } - public LevelLink(string levelFileName, int x, int y, int width, int height, string destinationX, string destinationY) + public LevelLink( + string levelFileName, + int x, + int y, + int width, + int height, + string destinationX, + string destinationY) { LevelFileName = levelFileName; X = x; diff --git a/GraalGmapGenerator/Options/GmapContentGenerationOptions.cs b/GraalGmapGenerator/Options/GmapContentGeneratorOptions.cs similarity index 74% rename from GraalGmapGenerator/Options/GmapContentGenerationOptions.cs rename to GraalGmapGenerator/Options/GmapContentGeneratorOptions.cs index 906dc5e..7577a67 100644 --- a/GraalGmapGenerator/Options/GmapContentGenerationOptions.cs +++ b/GraalGmapGenerator/Options/GmapContentGeneratorOptions.cs @@ -2,7 +2,7 @@ using GraalGmapGenerator.Enums; namespace GraalGmapGenerator.Options { - public class GmapContentGenerationOptions + public class GmapContentGeneratorOptions { public LevelType LevelType { get; set; } } diff --git a/GraalGmapGenerator/Options/LevelContentGenerationOptions.cs b/GraalGmapGenerator/Options/LevelContentGeneratorOptions.cs similarity index 76% rename from GraalGmapGenerator/Options/LevelContentGenerationOptions.cs rename to GraalGmapGenerator/Options/LevelContentGeneratorOptions.cs index 781b20a..d9fabe2 100644 --- a/GraalGmapGenerator/Options/LevelContentGenerationOptions.cs +++ b/GraalGmapGenerator/Options/LevelContentGeneratorOptions.cs @@ -1,6 +1,6 @@ namespace GraalGmapGenerator.Options { - public class LevelContentGenerationOptions + public class LevelContentGeneratorOptions { public string TemplateFilePath { get; set; } public bool AddLevelLinks { get; set; } diff --git a/GraalGmapGeneratorTests/Fake/GmapContentGenerationOptionsFake.cs b/GraalGmapGeneratorTests/Fake/GmapContentGenerationOptionsFake.cs index 51dfda4..a5d4e28 100644 --- a/GraalGmapGeneratorTests/Fake/GmapContentGenerationOptionsFake.cs +++ b/GraalGmapGeneratorTests/Fake/GmapContentGenerationOptionsFake.cs @@ -4,9 +4,9 @@ namespace GraalGmapGeneratorTests.Fake { internal static class GmapContentGenerationOptionsFake { - internal static GmapContentGenerationOptions Get() + internal static GmapContentGeneratorOptions Get() { - return new GmapContentGenerationOptions + return new GmapContentGeneratorOptions { LevelType = GraalGmapGenerator.Enums.LevelType.Graal }; diff --git a/GraalGmapGeneratorTests/Fake/GmapFake.cs b/GraalGmapGeneratorTests/Fake/GmapFake.cs index ffcdcaa..a3e8d0b 100644 --- a/GraalGmapGeneratorTests/Fake/GmapFake.cs +++ b/GraalGmapGeneratorTests/Fake/GmapFake.cs @@ -1,4 +1,4 @@ -using GraalGmapGenerator; +using GraalGmapGenerator.Models; namespace GraalGmapGeneratorTests.Fake { diff --git a/GraalGmapGeneratorTests/GmapContentGeneratorTests.cs b/GraalGmapGeneratorTests/GmapContentGeneratorTests.cs index b1364cd..a7d9815 100644 --- a/GraalGmapGeneratorTests/GmapContentGeneratorTests.cs +++ b/GraalGmapGeneratorTests/GmapContentGeneratorTests.cs @@ -1,5 +1,6 @@ -using GraalGmapGenerator; -using GraalGmapGenerator.Enums; +using GraalGmapGenerator.Enums; +using GraalGmapGenerator.Generators; +using GraalGmapGenerator.Models; using GraalGmapGenerator.Options; using GraalGmapGeneratorTests.Fake; using NUnit.Framework; @@ -91,7 +92,7 @@ namespace GraalGmapGeneratorTests public void Generate_SavesValidLevels_ForLevelType(LevelType levelType, string expectedFileExtension) { Gmap gmap = GmapFake.Get(); - var generator = new GmapContentGenerator(new GmapContentGenerationOptions + var generator = new GmapContentGenerator(new GmapContentGeneratorOptions { LevelType = levelType }); diff --git a/GraalGmapGeneratorTests/GmapTests.cs b/GraalGmapGeneratorTests/GmapTests.cs index a04db92..d84998d 100644 --- a/GraalGmapGeneratorTests/GmapTests.cs +++ b/GraalGmapGeneratorTests/GmapTests.cs @@ -1,4 +1,4 @@ -using GraalGmapGenerator; +using GraalGmapGenerator.Models; using NUnit.Framework; namespace GraalGmapGeneratorTests