refactorings:

- fixed petcount - renamed groupboxes - commented quickslots out
tolik518 · Feb 19, 2024 · af22c7b · af22c7b
1 parent 93e2dbf
commit af22c7b
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 34 deletions.
diff --git a/SoG_SGreader.Test/DataReaderTests.cs b/SoG_SGreader.Test/DataReaderTests.cs
@@ -22,7 +22,11 @@ private static Player GetSaveGame(int saveGameNumber)
             if (Environment.GetEnvironmentVariable("GITHUB_WORKSPACE") != null) {
                 projectDirectory = Environment.GetEnvironmentVariable("GITHUB_WORKSPACE");
             }
-
+            else
+            {
+                projectDirectory = Path.Combine(projectDirectory, "SoG_SGreader");
+            }
+
             string filePath = Path.Combine(projectDirectory, "SoG_SGreader.Test", "SaveGames", saveGameNumber + ".cha");
 
             return DataReader.ReadFromFile(filePath, fakeTextBox);

diff --git a/SoG_SGreader.Test/IntegrationTests.cs b/SoG_SGreader.Test/IntegrationTests.cs
@@ -16,7 +16,11 @@ private static string GetExePath()
                 projectDirectory = Environment.GetEnvironmentVariable("GITHUB_WORKSPACE");
                 return Path.Combine(projectDirectory, "SoG_SGreader", "bin", "Release", "SoG_SGreader.exe");
             }
-
+            else
+            {
+                projectDirectory = Path.Combine(projectDirectory, "SoG_SGreader");
+            }
+
             return Path.Combine(projectDirectory, "SoG_SGreader", "bin", "Debug", "SoG_SGreader.exe");
         }
 
@@ -27,6 +31,10 @@ private static string GetSaveGamePath(string saveGameNumber)
             // Exception for GitHub Actions Test Runner
             if (Environment.GetEnvironmentVariable("GITHUB_WORKSPACE") != null) {
                 projectDirectory = Environment.GetEnvironmentVariable("GITHUB_WORKSPACE");
+            }  
+            else
+            {
+                projectDirectory = Path.Combine(projectDirectory,"SoG_SGreader");
             }
 
             return Path.Combine(projectDirectory, "SoG_SGreader.Test", "SaveGames", saveGameNumber + ".cha");
@@ -54,7 +62,7 @@ public void TestBadPath()
             string output = process.StandardOutput.ReadToEnd();
             process.WaitForExit();
 
-            Assert.Contains("Could not find file", output);
+            Assert.Contains("Could not read savegame", output);
             Assert.Contains(Path.Combine("SaveGames", "doesntexist.cha"), output);
         }
 

diff --git a/SoG_SGreader/DataWriter.cs b/SoG_SGreader/DataWriter.cs
@@ -116,8 +116,8 @@ public void WriteToFile(string fileName)
                 writeBinary.Write(playerObject.SkillGoldPoints);
                 writeBinary.Write(playerObject.Cash);
 
-                writeBinary.Write(playerObject.PetsCount);
-                for (var i = 0; i != playerObject.PetsCount; i++)
+                writeBinary.Write(playerObject.Pets.Count);
+                for (var i = 0; i != playerObject.Pets.Count; i++)
                 {
                     var currentPet = playerObject.Pets[i];
 

diff --git a/SoG_SGreader/Forms/FrmMain.Designer.cs b/SoG_SGreader/Forms/FrmMain.Designer.cs
diff --git a/SoG_SGreader/Forms/FrmMain.cs b/SoG_SGreader/Forms/FrmMain.cs
@@ -90,9 +90,8 @@ private void InitElements() //  Designer Items
                     Size = new Size(79, 21),
                     Enabled = false
                 };
-                groupBox3.Controls.Add(cbQuickslotType[i]);
-                groupBox3.Controls.Add(cbQuickslot[i]);
-                cbQuickslotType[i].SelectedIndexChanged += new System.EventHandler(QuickslotType_SelectedIndexChanged);
+                grpQuickslots.Controls.Add(cbQuickslotType[i]);
+                grpQuickslots.Controls.Add(cbQuickslot[i]);
 
                 iQuickslotYpos -= 27;
             }
@@ -309,6 +308,7 @@ private void GetDataFromFields()
             playerObject.Style.Weapon = (int)Enum.Parse(typeof(SogItems), cbStyleWeapon.Text);
             playerObject.Style.Shield = (int)Enum.Parse(typeof(SogItems), cbStyleShield.Text);
 
+            /* TODO: Quickslots are not being saved correctly, we need to fix this
             for (int i = 0; i < 10; i++)
             {
                 if (cbQuickslotType[i].Text == nameof(SogItems))
@@ -323,9 +323,10 @@ private void GetDataFromFields()
                 }
                 else
                 {
-                    playerObject.Quickslots[i] = (int)0;
-                }
+                    //playerObject.Quickslots[i] = 0;
+                    playerObject.Quickslots[i] = playerObject.Quickslots[i];
             }
+            }*/
 
             playerObject.ItemsCount = lstInventory.Items.Count;
             playerObject.Inventory.Clear();