diff --git a/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/Environment.cs b/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/Environment.cs index d4e375a..8deb463 100644 --- a/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/Environment.cs +++ b/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/Environment.cs @@ -1,5 +1,7 @@ +using System; using System.Collections.Generic; using System.IO; +using System.Threading; using BattleFieldSimulator.FileSystem; namespace BattleFieldSimulator.BattlefieldEnvironment @@ -11,12 +13,14 @@ namespace BattleFieldSimulator.BattlefieldEnvironment public List Adversaries { get; } public StreamWriter OutFile { get; } - public Environment(IMap map, List allies, List adversaries, string outFile) + public Environment(IMap map, List allies, List adversaries) { Map = map; Allies = allies; Adversaries = adversaries; - OutFile = new StreamWriter(Path.Combine(FileSystemConstants.ExecutionDirectory, outFile)); + string format = "M_dd_yyyy_hh:mm:ss:tt"; + var logName = $"log_{DateTime.Now.ToString(format)}.txt"; + OutFile = new StreamWriter(Path.Combine(FileSystemConstants.LogDirectory, logName)); } } diff --git a/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/EnvironmentFactory.cs b/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/EnvironmentFactory.cs index f78c6cf..bf88373 100644 --- a/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/EnvironmentFactory.cs +++ b/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/EnvironmentFactory.cs @@ -6,9 +6,9 @@ namespace BattleFieldSimulator.BattlefieldEnvironment { - public Environment CreateEnvironment(IMap map, List allies, List adversaries, string outFile) + public Environment CreateEnvironment(IMap map, List allies, List adversaries) { - return new Environment(map, allies, adversaries, outFile); + return new Environment(map, allies, adversaries); } } } \ No newline at end of file diff --git a/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/EnvironmentSetup.cs b/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/EnvironmentSetup.cs index 61e4877..e0395a2 100644 --- a/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/EnvironmentSetup.cs +++ b/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/EnvironmentSetup.cs @@ -13,12 +13,12 @@ namespace BattleFieldSimulator.BattlefieldEnvironment _troopLoader = troopLoader; } - public Environment Setup(string mapName, string troopFile, string outFile) + public Environment Setup(string mapName, string troopFile) { var map = _mapLoader.LoadMap(mapName); var allies = _troopLoader.LoadAllies(troopFile); var adversaries = _troopLoader.LoadAdversaries(troopFile); - var env = _environmentFactory.CreateEnvironment(map, allies, adversaries, outFile); + var env = _environmentFactory.CreateEnvironment(map, allies, adversaries); return env; } } diff --git a/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/IEnvironmentFactory.cs b/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/IEnvironmentFactory.cs index 17c20cf..c01a46c 100644 --- a/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/IEnvironmentFactory.cs +++ b/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/IEnvironmentFactory.cs @@ -4,6 +4,6 @@ namespace BattleFieldSimulator.BattlefieldEnvironment { public interface IEnvironmentFactory { - Environment CreateEnvironment(IMap map, List allies, List adversaries, string outFile); + Environment CreateEnvironment(IMap map, List allies, List adversaries); } } \ No newline at end of file diff --git a/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/IEnvironmentSetup.cs b/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/IEnvironmentSetup.cs index ee48aca..3254e64 100644 --- a/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/IEnvironmentSetup.cs +++ b/BattleFieldSimulator/BattleFieldSimulator/BattlefieldEnvironment/IEnvironmentSetup.cs @@ -2,6 +2,6 @@ namespace BattleFieldSimulator.BattlefieldEnvironment { public interface IEnvironmentSetup { - Environment Setup(string mapName, string troopFile, string outFile); + Environment Setup(string mapName, string troopFile); } } \ No newline at end of file diff --git a/BattleFieldSimulator/BattleFieldSimulator/ConsoleClient/ConsoleClient.cs b/BattleFieldSimulator/BattleFieldSimulator/ConsoleClient/ConsoleClient.cs index 9c41d23..995a99a 100644 --- a/BattleFieldSimulator/BattleFieldSimulator/ConsoleClient/ConsoleClient.cs +++ b/BattleFieldSimulator/BattleFieldSimulator/ConsoleClient/ConsoleClient.cs @@ -34,7 +34,7 @@ namespace BattleFieldSimulator.ConsoleClient PrintHelpMenu(); break; case "-r": - _simRunner.RunSimulation(inString[1], inString[2], inString[3]); + _simRunner.RunSimulation(inString[1], inString[2]); break; default: return; @@ -48,6 +48,10 @@ namespace BattleFieldSimulator.ConsoleClient $"A properly formatted man and troop json file are required. The files must be placed \n" + $"in their respective folder locations. There are examples of what the files should \n" + $"look like in there. \n \n" + + $"The maps and troop files load from folders maps/ troops/ respectively. These folders " + + $"should be placed in the execution directory. \n\n" + + $"Log files are written to the common documents folder of your operating system. For windows this is \n" + + $"\tC:\\Users\\Public\\Documents\\BattlefieldSimulator\\Logs \n\n" + $"<-q> Will exit the program"); } @@ -58,7 +62,7 @@ namespace BattleFieldSimulator.ConsoleClient Console.WriteLine("Welcome to the battlefield simulator! \n \n " + "Please make a selection: \n" + "\t <-h> help menu \n" + - "\t <-r mapFileName.json TroopFileName.json outFile.txt> run program \n" + + "\t <-r mapFileName.json TroopFileName.json> run program \n" + "\t <-q> exit program \n"); } } diff --git a/BattleFieldSimulator/BattleFieldSimulator/SimRunner/ISimRunner.cs b/BattleFieldSimulator/BattleFieldSimulator/SimRunner/ISimRunner.cs index 48cfccc..02f1a84 100644 --- a/BattleFieldSimulator/BattleFieldSimulator/SimRunner/ISimRunner.cs +++ b/BattleFieldSimulator/BattleFieldSimulator/SimRunner/ISimRunner.cs @@ -2,6 +2,6 @@ namespace BattleFieldSimulator.SimRunner { public interface ISimRunner { - void RunSimulation(string mapName, string troopFile, string outFile); + void RunSimulation(string mapName, string troopFile); } } \ No newline at end of file diff --git a/BattleFieldSimulator/BattleFieldSimulator/SimRunner/SimRunner.cs b/BattleFieldSimulator/BattleFieldSimulator/SimRunner/SimRunner.cs index 3ba8ddf..0e570e8 100644 --- a/BattleFieldSimulator/BattleFieldSimulator/SimRunner/SimRunner.cs +++ b/BattleFieldSimulator/BattleFieldSimulator/SimRunner/SimRunner.cs @@ -14,15 +14,15 @@ namespace BattleFieldSimulator.SimRunner _simulation = simulation; } - public void RunSimulation(string mapName, string troopFile, string outFile) + public void RunSimulation(string mapName, string troopFile) { - var environment = Setup(mapName, troopFile, outFile); + var environment = Setup(mapName, troopFile); _simulation.Run(environment); } - private Environment Setup(string mapName, string troopFile, string outFile) + private Environment Setup(string mapName, string troopFile) { - return _environmentSetup.Setup(mapName, troopFile, outFile); + return _environmentSetup.Setup(mapName, troopFile); } } } \ No newline at end of file diff --git a/BattleFieldSimulator/BattleFieldSimulator/SimRunner/Simulation.cs b/BattleFieldSimulator/BattleFieldSimulator/SimRunner/Simulation.cs index 289123c..87d57b8 100644 --- a/BattleFieldSimulator/BattleFieldSimulator/SimRunner/Simulation.cs +++ b/BattleFieldSimulator/BattleFieldSimulator/SimRunner/Simulation.cs @@ -26,9 +26,15 @@ namespace BattleFieldSimulator.SimRunner finished = CheckIfFinished(environment.Allies, environment.Adversaries); } if(environment.Adversaries.Count != 0) + { Console.WriteLine($"The Enemy Won!!\n\n"); + environment.OutFile.WriteLine($"The Enemy Won!!\n\n"); + } if(environment.Allies.Count != 0) + { Console.WriteLine($"We Were Victorious!!\n\n"); + environment.OutFile.WriteLine($"We Were Victorious!!\n\n"); + } } private void PrintRoundInfo(IEnvironment environment) diff --git a/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattleFieldSimulator.exe b/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattleFieldSimulator.exe index e6a20ec..658e33e 100644 Binary files a/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattleFieldSimulator.exe and b/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattleFieldSimulator.exe differ diff --git a/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattleFieldSimulator.pdb b/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattleFieldSimulator.pdb index 0b62198..0c6d945 100644 Binary files a/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattleFieldSimulator.pdb and b/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattleFieldSimulator.pdb differ diff --git a/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattlefieldSimulator/Logs/log_4222020092351AM.txt b/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattlefieldSimulator/Logs/log_4222020092351AM.txt new file mode 100644 index 0000000..3e74cb2 --- /dev/null +++ b/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattlefieldSimulator/Logs/log_4222020092351AM.txt @@ -0,0 +1,139 @@ +Allies: 2 +Adversaries: 2 +Ally 0 Casualties: 0 Initial Troop Count: 30 +Ally 1 Casualties: 0 Initial Troop Count: 10 +Adversary 0 Casualties: 0 Initial Troop Count: 10 +Adversary 1 Casualties: 0 Initial Troop Count: 15 +A . A . . . . . . . +. E . . . . . . . . +. . . . . . . E . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 2 +Ally 0 Casualties: 17 Initial Troop Count: 30 +Ally 1 Casualties: 2 Initial Troop Count: 10 +Adversary 0 Casualties: 6 Initial Troop Count: 10 +Adversary 1 Casualties: 0 Initial Troop Count: 15 +A . A . . . E . . . +. E . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 2 +Ally 0 Casualties: 26 Initial Troop Count: 30 +Ally 1 Casualties: 3 Initial Troop Count: 10 +Adversary 0 Casualties: 10 Initial Troop Count: 10 +Adversary 1 Casualties: 0 Initial Troop Count: 15 +A . A E . . . . . . +. E . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 26 Initial Troop Count: 30 +Ally 1 Casualties: 3 Initial Troop Count: 10 +Adversary 0 Casualties: 4 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 26 Initial Troop Count: 30 +Ally 1 Casualties: 5 Initial Troop Count: 10 +Adversary 0 Casualties: 8 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 26 Initial Troop Count: 30 +Ally 1 Casualties: 5 Initial Troop Count: 10 +Adversary 0 Casualties: 11 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 26 Initial Troop Count: 30 +Ally 1 Casualties: 7 Initial Troop Count: 10 +Adversary 0 Casualties: 12 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 26 Initial Troop Count: 30 +Ally 1 Casualties: 8 Initial Troop Count: 10 +Adversary 0 Casualties: 13 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- diff --git a/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattlefieldSimulator/Logs/log_4_22_2020_09:24:47:AM.txt b/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattlefieldSimulator/Logs/log_4_22_2020_09:24:47:AM.txt new file mode 100644 index 0000000..b1f4e6d --- /dev/null +++ b/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattlefieldSimulator/Logs/log_4_22_2020_09:24:47:AM.txt @@ -0,0 +1,156 @@ +Allies: 2 +Adversaries: 2 +Ally 0 Casualties: 0 Initial Troop Count: 30 +Ally 1 Casualties: 0 Initial Troop Count: 10 +Adversary 0 Casualties: 0 Initial Troop Count: 10 +Adversary 1 Casualties: 0 Initial Troop Count: 15 +A . A . . . . . . . +. E . . . . . . . . +. . . . . . . E . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 2 +Ally 0 Casualties: 15 Initial Troop Count: 30 +Ally 1 Casualties: 2 Initial Troop Count: 10 +Adversary 0 Casualties: 6 Initial Troop Count: 10 +Adversary 1 Casualties: 0 Initial Troop Count: 15 +A . A . . . E . . . +. E . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 2 +Ally 0 Casualties: 23 Initial Troop Count: 30 +Ally 1 Casualties: 4 Initial Troop Count: 10 +Adversary 0 Casualties: 9 Initial Troop Count: 10 +Adversary 1 Casualties: 0 Initial Troop Count: 15 +A . A E . . . . . . +. E . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 23 Initial Troop Count: 30 +Ally 1 Casualties: 4 Initial Troop Count: 10 +Adversary 0 Casualties: 3 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 23 Initial Troop Count: 30 +Ally 1 Casualties: 6 Initial Troop Count: 10 +Adversary 0 Casualties: 5 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 23 Initial Troop Count: 30 +Ally 1 Casualties: 7 Initial Troop Count: 10 +Adversary 0 Casualties: 8 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 23 Initial Troop Count: 30 +Ally 1 Casualties: 7 Initial Troop Count: 10 +Adversary 0 Casualties: 10 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 23 Initial Troop Count: 30 +Ally 1 Casualties: 7 Initial Troop Count: 10 +Adversary 0 Casualties: 12 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 23 Initial Troop Count: 30 +Ally 1 Casualties: 7 Initial Troop Count: 10 +Adversary 0 Casualties: 13 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- diff --git a/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattlefieldSimulator/Logs/testing.txt b/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattlefieldSimulator/Logs/testing.txt new file mode 100644 index 0000000..022e6c4 --- /dev/null +++ b/BattleFieldSimulator/BattleFieldSimulator/bin/Release/BattlefieldSimulator/Logs/testing.txt @@ -0,0 +1,104 @@ +Allies: 2 +Adversaries: 2 +Ally 0 Casualties: 0 Initial Troop Count: 30 +Ally 1 Casualties: 0 Initial Troop Count: 10 +Adversary 0 Casualties: 0 Initial Troop Count: 10 +Adversary 1 Casualties: 0 Initial Troop Count: 15 +A . A . . . . . . . +. E . . . . . . . . +. . . . . . . E . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 2 +Ally 0 Casualties: 8 Initial Troop Count: 30 +Ally 1 Casualties: 2 Initial Troop Count: 10 +Adversary 0 Casualties: 9 Initial Troop Count: 10 +Adversary 1 Casualties: 0 Initial Troop Count: 15 +A . A . . . E . . . +. E . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 8 Initial Troop Count: 30 +Ally 1 Casualties: 2 Initial Troop Count: 10 +Adversary 0 Casualties: 0 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 8 Initial Troop Count: 30 +Ally 1 Casualties: 3 Initial Troop Count: 10 +Adversary 0 Casualties: 7 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 8 Initial Troop Count: 30 +Ally 1 Casualties: 4 Initial Troop Count: 10 +Adversary 0 Casualties: 12 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- +Allies: 2 +Adversaries: 1 +Ally 0 Casualties: 8 Initial Troop Count: 30 +Ally 1 Casualties: 5 Initial Troop Count: 10 +Adversary 0 Casualties: 15 Initial Troop Count: 15 +A . A E . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . +. . . . . . . . . . + +-------------------- diff --git a/BattleFieldSimulator/BattleFieldSimulator/obj/Release/BattleFieldSimulator.exe b/BattleFieldSimulator/BattleFieldSimulator/obj/Release/BattleFieldSimulator.exe index e6a20ec..658e33e 100644 Binary files a/BattleFieldSimulator/BattleFieldSimulator/obj/Release/BattleFieldSimulator.exe and b/BattleFieldSimulator/BattleFieldSimulator/obj/Release/BattleFieldSimulator.exe differ diff --git a/BattleFieldSimulator/BattleFieldSimulator/obj/Release/BattleFieldSimulator.pdb b/BattleFieldSimulator/BattleFieldSimulator/obj/Release/BattleFieldSimulator.pdb index 0b62198..0c6d945 100644 Binary files a/BattleFieldSimulator/BattleFieldSimulator/obj/Release/BattleFieldSimulator.pdb and b/BattleFieldSimulator/BattleFieldSimulator/obj/Release/BattleFieldSimulator.pdb differ diff --git a/BattleFieldSimulator/Executable_And_DLLs/Release.zip b/BattleFieldSimulator/Executable_And_DLLs/Release.zip new file mode 100644 index 0000000..c5b9e6f Binary files /dev/null and b/BattleFieldSimulator/Executable_And_DLLs/Release.zip differ diff --git a/BattleFieldSimulator/Executable_And_DLLs/Release/BattleFieldSimulator.exe b/BattleFieldSimulator/Executable_And_DLLs/Release/BattleFieldSimulator.exe index e6a20ec..658e33e 100644 Binary files a/BattleFieldSimulator/Executable_And_DLLs/Release/BattleFieldSimulator.exe and b/BattleFieldSimulator/Executable_And_DLLs/Release/BattleFieldSimulator.exe differ diff --git a/BattleFieldSimulator/Executable_And_DLLs/Release/BattleFieldSimulator.pdb b/BattleFieldSimulator/Executable_And_DLLs/Release/BattleFieldSimulator.pdb index 0b62198..0c6d945 100644 Binary files a/BattleFieldSimulator/Executable_And_DLLs/Release/BattleFieldSimulator.pdb and b/BattleFieldSimulator/Executable_And_DLLs/Release/BattleFieldSimulator.pdb differ diff --git a/BattleFieldSimulator/Executable_And_DLLs/Release/maps/SimpleMap.json b/BattleFieldSimulator/Executable_And_DLLs/Release/maps/SimpleMap.json new file mode 100644 index 0000000..44e7c20 --- /dev/null +++ b/BattleFieldSimulator/Executable_And_DLLs/Release/maps/SimpleMap.json @@ -0,0 +1,18 @@ +{ + "Map": { + "X": "10", + "Y" : "10", + "Grid": [ + [0, 0, 0, 0, 0, 0, 0, 5, 5, 0], + [0, 1, 1, 1, 0, 0, 0, 5, 5, 0], + [0, 2, 2, 2, 0, 0, 0, 5, 4, 0], + [0, 2, 3, 2, 0, 0, 0, 4, 3, 0], + [0, 2, 2, 1, 0, 0, 0, 3, 2, 0], + [0, 0, 0, 0, 0, 0, 0, 2, 2, 0], + [0, 0, 0, 0, 0, 0, 0, 1, 1, 0], + [0, 0, 0, 1, 0, 0, 0, 1, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 1, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + ] + } +} \ No newline at end of file diff --git a/BattleFieldSimulator/Executable_And_DLLs/Release/troops/SimpleTroopFile.json b/BattleFieldSimulator/Executable_And_DLLs/Release/troops/SimpleTroopFile.json new file mode 100644 index 0000000..f9f6936 --- /dev/null +++ b/BattleFieldSimulator/Executable_And_DLLs/Release/troops/SimpleTroopFile.json @@ -0,0 +1,81 @@ +{ + "Allies": [ + { + "Troop": + { + "MovementSpeed": 1.5, + "SightDistance": 4, + "EngagementDistance": 3, + "WeaponDamage": 8.5, + "Marksmanship": 7, + "TroopCount": 30, + "Aggressiveness": 7, + "Defense": 6, + "Mission": "Defend", + "EntryPointX": 0, + "EntryPointY": 0, + "ObjectiveX": 0, + "ObjectiveY": 0 + } + }, + { + "Troop": + { + "MovementSpeed": 2.5, + "SightDistance": 2, + "EngagementDistance": 1, + "WeaponDamage": 5, + "Marksmanship": 4, + "TroopCount": 10, + "Aggressiveness": 10, + "Defense": 3, + "Mission": "Defend", + "EntryPointX": 0, + "EntryPointY": 2, + "ObjectiveX": 0, + "ObjectiveY": 0 + } + + } + ], + "Adversaries": [ + { + "Troop": + { + "MovementSpeed": 2.5, + "SightDistance": 3, + "EngagementDistance": 1, + "WeaponDamage": 7, + "Marksmanship": 4, + "TroopCount": 10, + "Aggressiveness": 10, + "Defense": 3, + "Mission": "Attack", + "EntryPointX": 1, + "EntryPointY": 1, + "ObjectiveX": 0, + "ObjectiveY": 0 + } + + }, + { + "Troop": + { + "MovementSpeed": 2.5, + "SightDistance": 2, + "EngagementDistance": 1, + "WeaponDamage": 1, + "Marksmanship": 4, + "TroopCount": 15, + "Aggressiveness": 10, + "Defense": 3, + "Mission": "Attack", + "EntryPointX": 2, + "EntryPointY": 7, + "ObjectiveX": 0, + "ObjectiveY": 0 + } + + } + ] +} \ No newline at end of file