GH #6 - Properly fix origin secrets

kabili207 · Sep 10, 2023 · 609e3eb · 609e3eb
1 parent d5a3dea
commit 609e3eb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 25 deletions.
diff --git a/ZoraGenWpf/Properties/AssemblyInfo.cs b/ZoraGenWpf/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ZoraGen WPF")]
-[assembly: AssemblyCopyright("Copyright © Amy Nagle 2013 - 2021")]
+[assembly: AssemblyCopyright("Copyright © Amy Nagle 2013 - 2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/ZoraGenWpf/SecretControl.xaml.cs b/ZoraGenWpf/SecretControl.xaml.cs
@@ -70,9 +70,9 @@ public SecretControl()
 			};
 		}
 
-		public void SetSecret(Secret secret, GameRegion region)
+		public void SetSecret(Secret secret)
 		{
-			SetSecret(secret.ToBytes(), region);
+			SetSecret(secret.ToBytes(), secret.Region);
 		}
 
 		public void SetSecret(byte[] secret, GameRegion region)

diff --git a/ZoraGenWpf/ViewSecretsWindow.xaml.cs b/ZoraGenWpf/ViewSecretsWindow.xaml.cs
@@ -54,34 +54,39 @@ public ViewSecretsWindow(GameInfo info) : this()
 
 		private void SetSecrets()
 		{
-			uxGameSecret.SetSecret(new GameSecret(_info), _info.Region);
-			uxRingSecret.SetSecret(new RingSecret(_info), _info.Region);
+			uxGameSecret.SetSecret(new GameSecret(_info));
+			uxRingSecret.SetSecret(new RingSecret(_info));
 
 			if (_info.IsLinkedGame)
 			{
+				Game game = _info.Game == Game.Ages ? Game.Seasons : Game.Seasons;
+				GameRegion region = _info.Region;
+				short gameId = _info.GameID;
+
 				bool returnSecret = false;
-				uxMemSecret01.SetSecret(new MemorySecret(_info, Memory.ClockShopKingZora, returnSecret), _info.Region);
-				uxMemSecret02.SetSecret(new MemorySecret(_info, Memory.GraveyardFairy, returnSecret), _info.Region);
-				uxMemSecret03.SetSecret(new MemorySecret(_info, Memory.SubrosianTroy, returnSecret), _info.Region);
-				uxMemSecret04.SetSecret(new MemorySecret(_info, Memory.DiverPlen, returnSecret), _info.Region);
-				uxMemSecret05.SetSecret(new MemorySecret(_info, Memory.SmithLibrary, returnSecret), _info.Region);
-				uxMemSecret06.SetSecret(new MemorySecret(_info, Memory.PirateTokay, returnSecret), _info.Region);
-				uxMemSecret07.SetSecret(new MemorySecret(_info, Memory.TempleMamamu, returnSecret), _info.Region);
-				uxMemSecret08.SetSecret(new MemorySecret(_info, Memory.DekuTingle, returnSecret), _info.Region);
-				uxMemSecret09.SetSecret(new MemorySecret(_info, Memory.BiggoronElder, returnSecret), _info.Region);
-				uxMemSecret10.SetSecret(new MemorySecret(_info, Memory.RuulSymmetry, returnSecret), _info.Region);
+				uxMemSecret01.SetSecret(new MemorySecret(game, region, gameId, Memory.ClockShopKingZora, returnSecret));
+				uxMemSecret02.SetSecret(new MemorySecret(game, region, gameId, Memory.GraveyardFairy, returnSecret));
+				uxMemSecret03.SetSecret(new MemorySecret(game, region, gameId, Memory.SubrosianTroy, returnSecret));
+				uxMemSecret04.SetSecret(new MemorySecret(game, region, gameId, Memory.DiverPlen, returnSecret));
+				uxMemSecret05.SetSecret(new MemorySecret(game, region, gameId, Memory.SmithLibrary, returnSecret));
+				uxMemSecret06.SetSecret(new MemorySecret(game, region, gameId, Memory.PirateTokay, returnSecret));
+				uxMemSecret07.SetSecret(new MemorySecret(game, region, gameId, Memory.TempleMamamu, returnSecret));
+				uxMemSecret08.SetSecret(new MemorySecret(game, region, gameId, Memory.DekuTingle, returnSecret));
+				uxMemSecret09.SetSecret(new MemorySecret(game, region, gameId, Memory.BiggoronElder, returnSecret));
+				uxMemSecret10.SetSecret(new MemorySecret(game, region, gameId, Memory.RuulSymmetry, returnSecret));
 
+				game = _info.Game;
 				returnSecret = true;
-				uxMemReturnSecret01.SetSecret(new MemorySecret(_info, Memory.ClockShopKingZora, returnSecret), _info.Region);
-				uxMemReturnSecret02.SetSecret(new MemorySecret(_info, Memory.GraveyardFairy, returnSecret), _info.Region);
-				uxMemReturnSecret03.SetSecret(new MemorySecret(_info, Memory.SubrosianTroy, returnSecret), _info.Region);
-				uxMemReturnSecret04.SetSecret(new MemorySecret(_info, Memory.DiverPlen, returnSecret), _info.Region);
-				uxMemReturnSecret05.SetSecret(new MemorySecret(_info, Memory.SmithLibrary, returnSecret), _info.Region);
-				uxMemReturnSecret06.SetSecret(new MemorySecret(_info, Memory.PirateTokay, returnSecret), _info.Region);
-				uxMemReturnSecret07.SetSecret(new MemorySecret(_info, Memory.TempleMamamu, returnSecret), _info.Region);
-				uxMemReturnSecret08.SetSecret(new MemorySecret(_info, Memory.DekuTingle, returnSecret), _info.Region);
-				uxMemReturnSecret09.SetSecret(new MemorySecret(_info, Memory.BiggoronElder, returnSecret), _info.Region);
-				uxMemReturnSecret10.SetSecret(new MemorySecret(_info, Memory.RuulSymmetry, returnSecret), _info.Region);
+				uxMemReturnSecret01.SetSecret(new MemorySecret(game, region, gameId, Memory.ClockShopKingZora, returnSecret));
+				uxMemReturnSecret02.SetSecret(new MemorySecret(game, region, gameId, Memory.GraveyardFairy, returnSecret));
+				uxMemReturnSecret03.SetSecret(new MemorySecret(game, region, gameId, Memory.SubrosianTroy, returnSecret));
+				uxMemReturnSecret04.SetSecret(new MemorySecret(game, region, gameId, Memory.DiverPlen, returnSecret));
+				uxMemReturnSecret05.SetSecret(new MemorySecret(game, region, gameId, Memory.SmithLibrary, returnSecret));
+				uxMemReturnSecret06.SetSecret(new MemorySecret(game, region, gameId, Memory.PirateTokay, returnSecret));
+				uxMemReturnSecret07.SetSecret(new MemorySecret(game, region, gameId, Memory.TempleMamamu, returnSecret));
+				uxMemReturnSecret08.SetSecret(new MemorySecret(game, region, gameId, Memory.DekuTingle, returnSecret));
+				uxMemReturnSecret09.SetSecret(new MemorySecret(game, region, gameId, Memory.BiggoronElder, returnSecret));
+				uxMemReturnSecret10.SetSecret(new MemorySecret(game, region, gameId, Memory.RuulSymmetry, returnSecret));
 			}
 
 			if (_info.Game == Game.Ages)