From 07fc90f1f0e0ce6e9fa53bb295a533ff2d8bce47 Mon Sep 17 00:00:00 2001
From: HUNTERSCOUTI <39131351+HUNTERSCOUTI@users.noreply.github.com>
Date: Sun, 26 Jun 2022 14:02:28 +0200
Subject: [PATCH] Sprites and Comments Update #2

---
 Projects/Animal Trainer/Maps.cs    |  97 +++++++++++---------
 Projects/Animal Trainer/Sprites.cs | 137 +++++++++++------------------
 2 files changed, 106 insertions(+), 128 deletions(-)

diff --git a/Projects/Animal Trainer/Maps.cs b/Projects/Animal Trainer/Maps.cs
index 2c9d2a7d..5a0f5717 100644
--- a/Projects/Animal Trainer/Maps.cs	
+++ b/Projects/Animal Trainer/Maps.cs	
@@ -57,13 +57,19 @@ internal static string GetMapTileRender(char[][] map, int tileI, int tileJ)
 			'b' => Sprites.BuildingSmall,
 			'v' => Sprites.VetSmall,
 			'S' => Sprites.Store,
+			'd' => Sprites.Door,
+			'o' => Sprites.LowWindowSideLeft,
+			'l' => Sprites.LowWindow,
+			'u' => Sprites.SideRoofLeft,
+			'y' => Sprites.SideRoofRight,
+			'M' => Sprites.MiddleRoof,
+			'R' => Sprites.TopRoofLeft,
+			'j' => Sprites.TopRoofRight,
+			'k' => Sprites.MiddleWindow,
 
 			//Decor
 			's' => Sprites.Sign,
 			'f' => Sprites.Fence,
-			'c' => Sprites.Chest, // REMOVE?
-			'e' => Sprites.EmptyChest, // REMOVE?
-			'B' => Sprites.Barrels1, // REMOVE?
 
 			//Nature
 			'w' => Sprites.Water,
@@ -96,12 +102,14 @@ internal static bool IsValidCharacterMapTile(char[][] map, int tileI, int tileJ)
 			'e' => true,
 			'1' => true,
 			'0' => true,
+			'o' => true,
 			'g' => true,
 			'2' => true,
 			'X' => true,
 			'k' => true,
 			'h' => true,
 			'G' => true,
+			'd' => true,
 			_ => false,
 		};
 	}
@@ -122,53 +130,54 @@ internal static bool IsValidCharacterMapTile(char[][] map, int tileI, int tileJ)
 		"gggTgggggTGGGGGGGGfg".ToCharArray(),
 		"gggTgggggTGGGGGGGGfg".ToCharArray(),
 		"gggTrrrrrTGGGGGGGGfg".ToCharArray(),
-		"gggT              fg".ToCharArray(),
-		"gggT              fg".ToCharArray(),
-		"gggT          GGGGfg".ToCharArray(),
+		"gggTgggggggg      fg".ToCharArray(),
+		"gggTgggggggg      fg".ToCharArray(),
+		"gggTgggggggg  GGGGfg".ToCharArray(),
 		"gggTTTrrrrTTTTGGGGfg".ToCharArray(),
-		"gggf          GGGGfg".ToCharArray(),
-		"gggf          GGGGfg".ToCharArray(),
+		"gggfgggggggg  GGGGfg".ToCharArray(),
+		"gggfgggggggg  GGGGfg".ToCharArray(),
+		"gggfgg        ggggfg".ToCharArray(),
+		"gggfgg        ggggfg".ToCharArray(),
+		"gggfgg  ggggggggggfg".ToCharArray(),
+		"gggfr rrr rrrrrrrrfg".ToCharArray(),
+		"gggfgg            fg".ToCharArray(),
+		"gggfgg            fg".ToCharArray(),
+		"gggfgg      GGGG  fg".ToCharArray(),
+		"gggfTTTTTTTTGGGGrrfg".ToCharArray(),
+		"gggfggggggggGGGG  fg".ToCharArray(),
+		"gggfggggggggGGGG  fg".ToCharArray(),
 		"gggf              fg".ToCharArray(),
-		"gggf              fg".ToCharArray(),
-		"gggf              fg".ToCharArray(),
-		"gggf              fg".ToCharArray(),
-		"gggf              fg".ToCharArray(),
-		"gggf              fg".ToCharArray(),
-		"gggf              fg".ToCharArray(),
-		"gggf              fg".ToCharArray(),
-		"gggf              fg".ToCharArray(),
-		"gggf              fg".ToCharArray(),
-		"gggf              fg".ToCharArray(),
-		"gggT              fg".ToCharArray(),
-		"gggT              fg".ToCharArray(),
-		"gggT              fg".ToCharArray(),
-		"gggT              fg".ToCharArray(),
-		"gggT              fg".ToCharArray(),
-		"gggT              fg".ToCharArray(),
-		"Tfffffffff  ffffffff".ToCharArray(),
-		"Tggggggggf  fggggggg".ToCharArray(),
-		"fggggggggf00fggggggg".ToCharArray(),
+		"gggTrr   srrrrrrrrTg".ToCharArray(),
+		"gggTggGGGG  ggGGGGTg".ToCharArray(),
+		"gggTggGGGG  ggGGGGTg".ToCharArray(),
+		"gggTggGGGG  GGGGggTg".ToCharArray(),
+		"gggTGGGGgg  GGGGggTg".ToCharArray(),
+		"gggTffffffGGffffffTg".ToCharArray(),
+		"gggTgggggfGGfgggggTg".ToCharArray(),
+		"gggTgggggfGGfgggggTg".ToCharArray(),
+		"gggTgggggfGGfgggggTg".ToCharArray(),
+		"gggfgggggf00fgggggfg".ToCharArray(),
 	};
 
 	internal static readonly char[][] PaletTown = new char[][]
 	{
 		"ffffffffff11ffffffff".ToCharArray(),
-		"f                  f".ToCharArray(),
-		"f                  f".ToCharArray(),
-		"f                  f".ToCharArray(),
-		"f                  f".ToCharArray(),
-		"f                  f".ToCharArray(),
-		"f                  f".ToCharArray(),
-		"f                  f".ToCharArray(),
-		"f                  f".ToCharArray(),
-		"f    sb       sb   f".ToCharArray(),
-		"f                  f".ToCharArray(),
-		"f    fffs          f".ToCharArray(),
-		"f         X    v   f".ToCharArray(),
-		"f                  f".ToCharArray(),
-		"f   WWWWWW   ffsf  f".ToCharArray(),
-		"f   WwwwwW         f".ToCharArray(),
-		"ff  WwwwwWffffffffff".ToCharArray(),
-		"ffffWwwwwWffffffffff".ToCharArray(),
+		"fg                gf".ToCharArray(),
+		"fg                gf".ToCharArray(),
+		"fg                gf".ToCharArray(),
+		"fg                gf".ToCharArray(),
+		"fg                gf".ToCharArray(),
+		"fg                gf".ToCharArray(),
+		"fg        RMMMMj  gf".ToCharArray(),
+		"fg  fffs  u    y  gf".ToCharArray(),
+		"fg  gggg   k kk   gf".ToCharArray(),
+		"fg  gggg olldlll  gf".ToCharArray(),
+		"fg          X     gf".ToCharArray(),
+		"fg        fffsff  gf".ToCharArray(),
+		"fgggWWWW  gggggg  gf".ToCharArray(),
+		"fgggWwwW  gggggg  gf".ToCharArray(),
+		"fgggWwwW          gf".ToCharArray(),
+		"ffggWwwWffffffffffff".ToCharArray(),
+		"ffffWwwWffffffffffff".ToCharArray(),
 	};
 }
diff --git a/Projects/Animal Trainer/Sprites.cs b/Projects/Animal Trainer/Sprites.cs
index 67cb35cb..62c9c306 100644
--- a/Projects/Animal Trainer/Sprites.cs	
+++ b/Projects/Animal Trainer/Sprites.cs	
@@ -11,72 +11,14 @@ public static class Sprites
 		@"       " + "\n" +
 		@"       " + "\n" +
 		@"       ";
+
+	// BUILDINGS //
 	public const string BuildingSmall =
 		@"       " + "\n" +
 		@" /---\ " + "\n" +
 		@"/-----\" + "\n" +
 		@"|     |" + "\n" +
 		@"|  █  |";
-	public const string BuildingLowLargeDoorLeft =
-		@" /-----" + "\n" +
-		@"/------" + "\n" +
-		@"|      " + "\n" +
-		@"|      " + "\n" +
-		@"|  █   ";
-	public const string BuildingLowLargeDoorRight =
-		@"-----\ " + "\n" +
-		@"------\" + "\n" +
-		@"      |" + "\n" +
-		@"      |" + "\n" +
-		@"   █  |";
-	public const string BuildingLowLargeLeft =
-		@" /-----" + "\n" +
-		@"/------" + "\n" +
-		@"|      " + "\n" +
-		@"|      " + "\n" +
-		@"| ▀ ▀  ";
-	public const string BuildingLowLargeRight =
-		@"-----\ " + "\n" +
-		@"------\" + "\n" +
-		@"      |" + "\n" +
-		@"      |" + "\n" +
-		@" ▀ ▀  |";
-	public const string BuildingLargeDoorLeft =
-		@"|      " + "\n" +
-		@"|      " + "\n" +
-		@"|      " + "\n" +
-		@"|      " + "\n" +
-		@"|  █   ";
-	public const string BuildingLargeDoorRight =
-		@"      |" + "\n" +
-		@"      |" + "\n" +
-		@"      |" + "\n" +
-		@"      |" + "\n" +
-		@"   █  |";
-	public const string BuildingLargeLeft =
-		@"|      " + "\n" +
-		@"|      " + "\n" +
-		@"|      " + "\n" +
-		@"|      " + "\n" +
-		@"|  ▀ ▀ ";
-	public const string BuildingLargeRight =
-		@"      |" + "\n" +
-		@"      |" + "\n" +
-		@"      |" + "\n" +
-		@"      |" + "\n" +
-		@"  ▀ ▀ |";
-	public const string BuildingLargeTopLeft =
-		@"  /----" + "\n" +
-		@" /-----" + "\n" +
-		@"/------" + "\n" +
-		@"| ▄ ▄  " + "\n" +
-		@"|      ";
-	public const string BuildingLargeTopRight =
-		@"----\  " + "\n" +
-		@"-----\ " + "\n" +
-		@"------\" + "\n" +
-		@"  ▄ ▄ |" + "\n" +
-		@"      |";
 	public const string VetSmall = // REMOVE? (Make it bigger like the pokecenter?)
 		@"       " + "\n" +
 		@" /---\ " + "\n" +
@@ -89,18 +31,63 @@ public static class Sprites
 		@"/Store\" + "\n" +
 		@"|     |" + "\n" +
 		@"|  █  |";
-	public const string Chest =  // REMOVE?
+	public const string Door =
+		@"▬▬▬▬▬▬▬" + "\n" +
+		@"█ ░░░ █" + "\n" +
+		@"█ ░░░ █" + "\n" +
+		@"█ ███ █" + "\n" +
+		@"█ ███ █";
+	public const string TopRoofLeft =
 		@"       " + "\n" +
 		@"       " + "\n" +
-		@"  _._  " + "\n" +
-		@" |___| " + "\n" +
-		@"       ";
-	public const string EmptyChest = // REMOVE?
+		@"    /--" + "\n" +
+		@"   /---" + "\n" +
+		@"  /----";
+	public const string TopRoofRight =
+		@"       " + "\n" +
+		@"       " + "\n" +
+		@"--\    " + "\n" +
+		@"---\   " + "\n" +
+		@"----\  ";
+	public const string MiddleRoof =
+		@"       " + "\n" +
+		@"       " + "\n" +
+		@"-------" + "\n" +
+		@"-------" + "\n" +
+		@"-------";
+	public const string SideRoofLeft =
+		@" //    " + "\n" +
+		@"//     " + "\n" +
+		@"/      " + "\n" +
+		@"|      " + "\n" +
+		@"|      ";
+	public const string SideRoofRight =
+		@"    \\ " + "\n" +
+		@"     \\" + "\n" +
+		@"      \" + "\n" +
+		@"      |" + "\n" +
+		@"      |";
+	public const string MiddleWindow =
 		@"       " + "\n" +
 		@"       " + "\n" +
+		@" ▐█ ▐█ " + "\n" +
 		@"       " + "\n" +
-		@" |___| " + "\n" +
 		@"       ";
+	public const string LowWindowSideLeft =
+		@"      |" + "\n" +
+		@"      |" + "\n" +
+		@"      |" + "\n" +
+		@"      |" + "\n" +
+		@"      |";
+	public const string LowWindow =
+		@"       " + "\n" +
+		@"       " + "\n" +
+		@" ▐█ ▐█ " + "\n" +
+		@"       " + "\n" +
+		@"#######";
+
+
+	//NATURE
 	public const string Water =
 		@"~~~~~~~" + "\n" +
 		@"~~~~~~~" + "\n" +
@@ -221,24 +208,6 @@ public static class Sprites
 		@"   ||  " + "\n" +
 		@"   ||  " + "\n" +
 		@"   ||  ";
-	public const string Barrels1 = // REMOVE?
-		@"       " + "\n" +
-		@"       " + "\n" +
-		@"  /---\" + "\n" +
-		@"/-\/-\|" + "\n" +
-		@"\ /\ //";
-	public const string Barrels2 = // REMOVE?
-		@"       " + "\n" +
-		@"       " + "\n" +
-		@"/---\  " + "\n" +
-		@"|/-\/-\" + "\n" +
-		@"\\ /\ /";
-	public const string Barrels3 = // REMOVE?
-		@"       " + "\n" +
-		@"       " + "\n" +
-		@" /---\ " + "\n" +
-		@"/--\/-\" + "\n" +
-		@"\  /\ /";
 	public const string Sign = // Text TBC
 		@" ┬──┬─╮" + "\n" +
 		@"╭┴──┴╮│" + "\n" +