From 46e329e0a17ef53596d62b722ed7aacebfc83ce5 Mon Sep 17 00:00:00 2001 From: tolik518 Date: Tue, 20 Feb 2024 20:34:03 +0100 Subject: [PATCH] renamed enums --- SoG_SGreader.Test/DataReaderTests.cs | 36 ++--- SoG_SGreader/DataReader.cs | 20 +-- SoG_SGreader/DataWriter.cs | 4 +- .../Enum/{SogColors.cs => SogColor.cs} | 2 +- .../Enum/{SogEnemies.cs => SogEnemy.cs} | 2 +- SoG_SGreader/Enum/{SogItems.cs => SogItem.cs} | 2 +- SoG_SGreader/Enum/{SogPets.cs => SogPet.cs} | 2 +- .../Enum/{SogQuests.cs => SogQuest.cs} | 2 +- .../Enum/{SogSkills.cs => SogSkill.cs} | 2 +- SoG_SGreader/Forms/FrmMain.cs | 144 +++++++++--------- SoG_SGreader/Objects/Card.cs | 2 +- SoG_SGreader/Objects/FishCaught.cs | 2 +- SoG_SGreader/Objects/Item.cs | 2 +- SoG_SGreader/Objects/ItemCrafted.cs | 2 +- SoG_SGreader/Objects/ItemsSeen.cs | 2 +- SoG_SGreader/Objects/MerchantItem.cs | 2 +- SoG_SGreader/Objects/Player.cs | 14 +- SoG_SGreader/Objects/Quest.cs | 2 +- SoG_SGreader/Objects/Skill.cs | 2 +- SoG_SGreader/SoG_SGreader.csproj | 12 +- 20 files changed, 129 insertions(+), 129 deletions(-) rename SoG_SGreader/Enum/{SogColors.cs => SogColor.cs} (94%) rename SoG_SGreader/Enum/{SogEnemies.cs => SogEnemy.cs} (99%) rename SoG_SGreader/Enum/{SogItems.cs => SogItem.cs} (99%) rename SoG_SGreader/Enum/{SogPets.cs => SogPet.cs} (96%) rename SoG_SGreader/Enum/{SogQuests.cs => SogQuest.cs} (99%) rename SoG_SGreader/Enum/{SogSkills.cs => SogSkill.cs} (99%) diff --git a/SoG_SGreader.Test/DataReaderTests.cs b/SoG_SGreader.Test/DataReaderTests.cs index b7a38c9..0f202fe 100644 --- a/SoG_SGreader.Test/DataReaderTests.cs +++ b/SoG_SGreader.Test/DataReaderTests.cs @@ -97,63 +97,63 @@ private static IEnumerable FirstItem() { yield return new object[] { new Item { - ItemID = SogItems.Usable_CardAlbum, + ItemID = SogItem.Usable_CardAlbum, ItemCount = 1, ItemPos = 189755 }, GetSaveGame(0).Inventory }; yield return new object[] { new Item{ - ItemID = SogItems.KeyItem_DivaMirror, + ItemID = SogItem.KeyItem_DivaMirror, ItemCount = 0, ItemPos = 158319 }, GetSaveGame(1).Inventory }; yield return new object[] { new Item{ - ItemID = SogItems.Usable_CardAlbum, + ItemID = SogItem.Usable_CardAlbum, ItemCount = 1, ItemPos = 46623 }, GetSaveGame(2).Inventory }; yield return new object[] { new Item{ - ItemID = SogItems.Usable_CardAlbum, + ItemID = SogItem.Usable_CardAlbum, ItemCount = 1, ItemPos = 16756 }, GetSaveGame(3).Inventory }; yield return new object[] { new Item{ - ItemID = SogItems.Usable_CardAlbum, + ItemID = SogItem.Usable_CardAlbum, ItemCount = 1, ItemPos = 25026 }, GetSaveGame(4).Inventory }; yield return new object[] { new Item{ - ItemID = SogItems.Usable_CardAlbum, + ItemID = SogItem.Usable_CardAlbum, ItemCount = 1, ItemPos = 18895 }, GetSaveGame(5).Inventory }; yield return new object[] { new Item{ - ItemID = SogItems.Usable_CardAlbum, + ItemID = SogItem.Usable_CardAlbum, ItemCount = 1, ItemPos = 16634 }, GetSaveGame(6).Inventory }; yield return new object[] { new Item{ - ItemID = SogItems.Usable_CardAlbum, + ItemID = SogItem.Usable_CardAlbum, ItemCount = 1, ItemPos = 14455 }, GetSaveGame(7).Inventory }; yield return new object[] { new Item{ - ItemID = SogItems.Usable_CardAlbum, + ItemID = SogItem.Usable_CardAlbum, ItemCount = 1, ItemPos = 96617 }, GetSaveGame(8).Inventory }; @@ -170,63 +170,63 @@ private static IEnumerable LastItem() { yield return new object[] { new Item { - ItemID = SogItems.Furniture_Decoration_ArcadeChallengeTrophyF08, + ItemID = SogItem.Furniture_Decoration_ArcadeChallengeTrophyF08, ItemCount = 1, ItemPos = 189760 }, GetSaveGame(0).Inventory }; yield return new object[] { new Item { - ItemID = SogItems.KeyItem_CatalystOfPower, + ItemID = SogItem.KeyItem_CatalystOfPower, ItemCount = 1, ItemPos = 159243 }, GetSaveGame(1).Inventory }; yield return new object[] { new Item { - ItemID = SogItems.KeyItem_CatalystOfPower, + ItemID = SogItem.KeyItem_CatalystOfPower, ItemCount = 1, ItemPos = 46457 }, GetSaveGame(2).Inventory }; yield return new object[] { new Item { - ItemID = SogItems.Shoes_MushroomSlippers, + ItemID = SogItem.Shoes_MushroomSlippers, ItemCount = 1, ItemPos = 16738}, GetSaveGame(3).Inventory }; yield return new object[] { new Item { - ItemID = SogItems.TwoHanded_BugNet, + ItemID = SogItem.TwoHanded_BugNet, ItemCount = 0, ItemPos = 25025 }, GetSaveGame(4).Inventory }; yield return new object[] { new Item { - ItemID = SogItems.TwoHanded_BugNet, + ItemID = SogItem.TwoHanded_BugNet, ItemCount = 0, ItemPos = 18894}, GetSaveGame(5).Inventory }; yield return new object[] { new Item { - ItemID = SogItems.Furniture_Carpet_MasterHQRed, + ItemID = SogItem.Furniture_Carpet_MasterHQRed, ItemCount = 0, ItemPos = 16614}, GetSaveGame(6).Inventory }; yield return new object[] { new Item { - ItemID = SogItems.TwoHanded_BugNet, + ItemID = SogItem.TwoHanded_BugNet, ItemCount = 0, ItemPos =14454}, GetSaveGame(7).Inventory }; yield return new object[] { new Item { - ItemID = SogItems.OneHanded_UgrasScroll, + ItemID = SogItem.OneHanded_UgrasScroll, ItemCount = 1, ItemPos =96375 }, GetSaveGame(8).Inventory }; diff --git a/SoG_SGreader/DataReader.cs b/SoG_SGreader/DataReader.cs index ce19610..d7c4b8a 100644 --- a/SoG_SGreader/DataReader.cs +++ b/SoG_SGreader/DataReader.cs @@ -51,10 +51,10 @@ public static Player ReadFromFile(string fileName, ITextBoxWrapper txtConsole) switch (quickSlotType) { case 1: - playerObject.Quickslots.Add((SogItems)readBinary.ReadInt32()); + playerObject.Quickslots.Add((SogItem)readBinary.ReadInt32()); break; case 2: - playerObject.Quickslots.Add((SogSkills)readBinary.ReadUInt16()); + playerObject.Quickslots.Add((SogSkill)readBinary.ReadUInt16()); break; default: playerObject.Quickslots.Add(0); @@ -82,7 +82,7 @@ public static Player ReadFromFile(string fileName, ITextBoxWrapper txtConsole) { playerObject.Inventory.Add(new Item { - ItemID = (SogItems)readBinary.ReadInt32(), + ItemID = (SogItem)readBinary.ReadInt32(), ItemCount = readBinary.ReadInt32(), ItemPos = readBinary.ReadUInt32() }); @@ -100,7 +100,7 @@ public static Player ReadFromFile(string fileName, ITextBoxWrapper txtConsole) { playerObject.MerchantItems.Add(new MerchantItem { - ItemID = (SogItems)readBinary.ReadInt32(), + ItemID = (SogItem)readBinary.ReadInt32(), ItemCount = readBinary.ReadInt32() }); } @@ -115,7 +115,7 @@ public static Player ReadFromFile(string fileName, ITextBoxWrapper txtConsole) { playerObject.Cards.Add(new Card { - CardID = (SogEnemies)readBinary.ReadInt32() + CardID = (SogEnemy)readBinary.ReadInt32() }); } @@ -152,7 +152,7 @@ public static Player ReadFromFile(string fileName, ITextBoxWrapper txtConsole) { playerObject.Skills.Add(new Skill { - SkillID = (SogSkills)readBinary.ReadInt16(), + SkillID = (SogSkill)readBinary.ReadInt16(), SkillLevel = readBinary.ReadByte() }); } @@ -238,7 +238,7 @@ public static Player ReadFromFile(string fileName, ITextBoxWrapper txtConsole) { playerObject.Quests.Add(new Quest { - QuestID = (SogQuests) readBinary.ReadUInt16() + QuestID = (SogQuest) readBinary.ReadUInt16() }); } txtConsole.AppendText("\r\n" + "QuestsCount: " + playerObject.QuestsCount); @@ -296,7 +296,7 @@ public static Player ReadFromFile(string fileName, ITextBoxWrapper txtConsole) { playerObject.ItemsMet.Add(new ItemsSeen { - ItemID = (SogItems)readBinary.ReadInt32() + ItemID = (SogItem)readBinary.ReadInt32() }); } @@ -309,7 +309,7 @@ public static Player ReadFromFile(string fileName, ITextBoxWrapper txtConsole) { playerObject.ItemsCrafted.Add(new ItemCrafted { - ItemID = (SogItems)readBinary.ReadInt32() + ItemID = (SogItem)readBinary.ReadInt32() }); } @@ -322,7 +322,7 @@ public static Player ReadFromFile(string fileName, ITextBoxWrapper txtConsole) { playerObject.FishiesCaught.Add(new FishCaught { - FishID = (SogItems)readBinary.ReadInt32() + FishID = (SogItem)readBinary.ReadInt32() }); } diff --git a/SoG_SGreader/DataWriter.cs b/SoG_SGreader/DataWriter.cs index 9fdf8c5..49956f8 100644 --- a/SoG_SGreader/DataWriter.cs +++ b/SoG_SGreader/DataWriter.cs @@ -41,12 +41,12 @@ public void WriteToFile(string fileName) foreach (var quickslot in playerObject.Quickslots) { - if (quickslot.GetType() == typeof(SogItems)) + if (quickslot.GetType() == typeof(SogItem)) { writeBinary.Write((byte) 1); writeBinary.Write((int) quickslot); } - else if (quickslot.GetType() == typeof(SogSkills)) + else if (quickslot.GetType() == typeof(SogSkill)) { writeBinary.Write((byte) 2); writeBinary.Write((ushort) quickslot); diff --git a/SoG_SGreader/Enum/SogColors.cs b/SoG_SGreader/Enum/SogColor.cs similarity index 94% rename from SoG_SGreader/Enum/SogColors.cs rename to SoG_SGreader/Enum/SogColor.cs index 45dfc2f..967f1d6 100644 --- a/SoG_SGreader/Enum/SogColors.cs +++ b/SoG_SGreader/Enum/SogColor.cs @@ -1,6 +1,6 @@ namespace SoG_SGreader { - public enum SogColors : ushort + public enum SogColor : ushort { _2C1D1D, _2E2226, diff --git a/SoG_SGreader/Enum/SogEnemies.cs b/SoG_SGreader/Enum/SogEnemy.cs similarity index 99% rename from SoG_SGreader/Enum/SogEnemies.cs rename to SoG_SGreader/Enum/SogEnemy.cs index 586885b..fb8776c 100644 --- a/SoG_SGreader/Enum/SogEnemies.cs +++ b/SoG_SGreader/Enum/SogEnemy.cs @@ -1,6 +1,6 @@ namespace SoG_SGreader { - public enum SogEnemies: int + public enum SogEnemy: int { Null = -1, GreenSlime = 0, diff --git a/SoG_SGreader/Enum/SogItems.cs b/SoG_SGreader/Enum/SogItem.cs similarity index 99% rename from SoG_SGreader/Enum/SogItems.cs rename to SoG_SGreader/Enum/SogItem.cs index 38758e0..6981ea9 100644 --- a/SoG_SGreader/Enum/SogItems.cs +++ b/SoG_SGreader/Enum/SogItem.cs @@ -2,7 +2,7 @@ { // Source: Secrets of Grindea: SoG.ItemCodex // Game Version: 0.99g - public enum SogItems: int + public enum SogItem: int { Null = -1, Apple = 0, diff --git a/SoG_SGreader/Enum/SogPets.cs b/SoG_SGreader/Enum/SogPet.cs similarity index 96% rename from SoG_SGreader/Enum/SogPets.cs rename to SoG_SGreader/Enum/SogPet.cs index 96646a8..70d9b22 100644 --- a/SoG_SGreader/Enum/SogPets.cs +++ b/SoG_SGreader/Enum/SogPet.cs @@ -2,7 +2,7 @@ { // Source: Secrets of Grindea: SoG.NPCCodex // Game Version: 0.99c - public enum SogPets: int + public enum SogPet: int { Rabby = 0x2710, Slimy = 0x2711, diff --git a/SoG_SGreader/Enum/SogQuests.cs b/SoG_SGreader/Enum/SogQuest.cs similarity index 99% rename from SoG_SGreader/Enum/SogQuests.cs rename to SoG_SGreader/Enum/SogQuest.cs index 3dba0f5..49cb75e 100644 --- a/SoG_SGreader/Enum/SogQuests.cs +++ b/SoG_SGreader/Enum/SogQuest.cs @@ -2,7 +2,7 @@ { // Source: Secrets of Grindea: SoG.QuestCodex // Game Version: 0.99g - public enum SogQuests: ushort + public enum SogQuest: ushort { MainQuest_FirstVillage_FindApples = 0, MainQuest_FirstVillage_GearUp = 1, diff --git a/SoG_SGreader/Enum/SogSkills.cs b/SoG_SGreader/Enum/SogSkill.cs similarity index 99% rename from SoG_SGreader/Enum/SogSkills.cs rename to SoG_SGreader/Enum/SogSkill.cs index 5f9976c..d383c0a 100644 --- a/SoG_SGreader/Enum/SogSkills.cs +++ b/SoG_SGreader/Enum/SogSkill.cs @@ -2,7 +2,7 @@ { // Source: Secrets of Grindea: SoG.SpellCodex // Game Version: 0.99g - public enum SogSkills: ushort + public enum SogSkill: ushort { NULL = 0, Basic_HealthBoost = 1, diff --git a/SoG_SGreader/Forms/FrmMain.cs b/SoG_SGreader/Forms/FrmMain.cs index 511b5d0..cb9fabd 100644 --- a/SoG_SGreader/Forms/FrmMain.cs +++ b/SoG_SGreader/Forms/FrmMain.cs @@ -101,14 +101,14 @@ private void InitElements() // Designer Items //was selected in the Type combobox private void QuickslotType_SelectedIndexChanged(object sender, EventArgs e) { - var items = Enum.GetNames(typeof(SogItems)); - var skills = Enum.GetNames(typeof(SogSkills)); + var items = Enum.GetNames(typeof(SogItem)); + var skills = Enum.GetNames(typeof(SogSkill)); for (int i = 0; i < 10; i++) { switch (cbQuickslotType[i].Text) { - case "SogItems": + case "SogItem": cbQuickslot[i].DataSource = items; break; case "SogSpells": @@ -129,8 +129,8 @@ private string[] FilterItems(string[] items, params string[] prefixes) private void InitFields() { - var items = Enum.GetNames(typeof(SogItems)); - var skills = Enum.GetNames(typeof(SogSkills)); + var items = Enum.GetNames(typeof(SogItem)); + var skills = Enum.GetNames(typeof(SogSkill)); cbHat.DataSource = FilterItems(items, "Hat_"); cbFacegear.DataSource = FilterItems(items, "Facegear_"); @@ -151,7 +151,7 @@ private void InitFields() { switch (cbQuickslotType[i].Text) { - case "SogItems": + case "SogItem": cbQuickslot[i].DataSource = items; break; case "SogSpells": @@ -168,10 +168,10 @@ private void InitFields() cbSelectedItem.DataSource = items; //fill cblstCards with all the cards from Enemies enum - var cards = Enum.GetNames(typeof(SogEnemies)); + var cards = Enum.GetNames(typeof(SogEnemy)); cblstCards.DataSource = cards; - var quests = Enum.GetNames(typeof(SogQuests)); + var quests = Enum.GetNames(typeof(SogQuest)); cblstQuests.DataSource = quests; } @@ -180,20 +180,20 @@ private void PopulateFields() txtNickname.Text = playerObject.Nickname; - cbHat.Text = ((SogItems)playerObject.Equip.Hat).ToString(); - cbFacegear.Text = ((SogItems)playerObject.Equip.Facegear).ToString(); - cbWeapon.Text = ((SogItems)playerObject.Equip.Weapon).ToString(); - cbShield.Text = ((SogItems)playerObject.Equip.Shield).ToString(); - cbArmor.Text = ((SogItems)playerObject.Equip.Armor).ToString(); - cbShoes.Text = ((SogItems)playerObject.Equip.Shoes).ToString(); + cbHat.Text = ((SogItem)playerObject.Equip.Hat).ToString(); + cbFacegear.Text = ((SogItem)playerObject.Equip.Facegear).ToString(); + cbWeapon.Text = ((SogItem)playerObject.Equip.Weapon).ToString(); + cbShield.Text = ((SogItem)playerObject.Equip.Shield).ToString(); + cbArmor.Text = ((SogItem)playerObject.Equip.Armor).ToString(); + cbShoes.Text = ((SogItem)playerObject.Equip.Shoes).ToString(); - cbAccessory1.Text = ((SogItems)playerObject.Equip.Accessory1).ToString(); - cbAccessory2.Text = ((SogItems)playerObject.Equip.Accessory2).ToString(); + cbAccessory1.Text = ((SogItem)playerObject.Equip.Accessory1).ToString(); + cbAccessory2.Text = ((SogItem)playerObject.Equip.Accessory2).ToString(); - cbStyleHat.Text = ((SogItems)playerObject.Style.Hat).ToString(); - cbStyleFacegear.Text = ((SogItems)playerObject.Style.Facegear).ToString(); - cbStyleWeapon.Text = ((SogItems)playerObject.Style.Weapon).ToString(); - cbStyleShield.Text = ((SogItems)playerObject.Style.Shield).ToString(); + cbStyleHat.Text = ((SogItem)playerObject.Style.Hat).ToString(); + cbStyleFacegear.Text = ((SogItem)playerObject.Style.Facegear).ToString(); + cbStyleWeapon.Text = ((SogItem)playerObject.Style.Weapon).ToString(); + cbStyleShield.Text = ((SogItem)playerObject.Style.Shield).ToString(); for (int i = 0; i < 10; i++) { @@ -201,11 +201,11 @@ private void PopulateFields() cbQuickslotType[i].Text = (playerObject.Quickslots[i].GetType()).Name.ToString(); } - btnHairColor.BackColor = ColorTranslator.FromHtml("#" + ((SogColors)playerObject.Style.HairColor).ToString().TrimStart('_')); + btnHairColor.BackColor = ColorTranslator.FromHtml("#" + ((SogColor)playerObject.Style.HairColor).ToString().TrimStart('_')); // btnSkinColor.BackColor = ColorTranslator.FromHtml("#" + ((SoG_Colors)iHairColor).ToString().TrimStart('_')); - btnPonchoColor.BackColor = ColorTranslator.FromHtml("#" + ((SogColors)playerObject.Style.PonchoColor).ToString().TrimStart('_')); - btnShirtColor.BackColor = ColorTranslator.FromHtml("#" + ((SogColors)playerObject.Style.ShirtColor).ToString().TrimStart('_')); - btnPantsColor.BackColor = ColorTranslator.FromHtml("#" + ((SogColors)playerObject.Style.PantsColor).ToString().TrimStart('_')); + btnPonchoColor.BackColor = ColorTranslator.FromHtml("#" + ((SogColor)playerObject.Style.PonchoColor).ToString().TrimStart('_')); + btnShirtColor.BackColor = ColorTranslator.FromHtml("#" + ((SogColor)playerObject.Style.ShirtColor).ToString().TrimStart('_')); + btnPantsColor.BackColor = ColorTranslator.FromHtml("#" + ((SogColor)playerObject.Style.PantsColor).ToString().TrimStart('_')); for (int i = 0; i != playerObject.ItemsCount; i++) { @@ -254,45 +254,45 @@ private void PopulateFields() rbMale.Checked = playerObject.Style.Sex != 0; rbFemale.Checked = playerObject.Style.Sex == 0; - sliderSkillMelee1h0.Value = playerObject.GetSkillLevel(SogSkills.Skill_OneHanded_Stinger); - sliderSkillMelee1h1.Value = playerObject.GetSkillLevel(SogSkills.Skill_OneHanded_MillionStabs); - sliderSkillMelee1h2.Value = playerObject.GetSkillLevel(SogSkills.Skill_OneHanded_SpiritSlash); - sliderSkillMelee1h3.Value = playerObject.GetSkillLevel(SogSkills.Skill_OneHanded_ShadowClone); - sliderSkillMelee1h4.Value = playerObject.GetSkillLevel(SogSkills.Skill_OneHanded_QuickCounter); - - sliderSkillMelee2h0.Value = playerObject.GetSkillLevel(SogSkills.Skill_TwoHanded_Overhead); - sliderSkillMelee2h1.Value = playerObject.GetSkillLevel(SogSkills.Skill_TwoHanded_Spin); - sliderSkillMelee2h2.Value = playerObject.GetSkillLevel(SogSkills.Skill_TwoHanded_Throw); - sliderSkillMelee2h3.Value = playerObject.GetSkillLevel(SogSkills.Skill_TwoHanded_Smash); - sliderSkillMelee2h4.Value = playerObject.GetSkillLevel(SogSkills.Skill_TwoHanded_BerserkMode); - - sliderSkillMagicF0.Value = playerObject.GetSkillLevel(SogSkills.Magic_Fire_Fireball); - sliderSkillMagicF1.Value = playerObject.GetSkillLevel(SogSkills.Magic_Fire_Meteor); - sliderSkillMagicF2.Value = playerObject.GetSkillLevel(SogSkills.Magic_Fire_Flamethrower); + sliderSkillMelee1h0.Value = playerObject.GetSkillLevel(SogSkill.Skill_OneHanded_Stinger); + sliderSkillMelee1h1.Value = playerObject.GetSkillLevel(SogSkill.Skill_OneHanded_MillionStabs); + sliderSkillMelee1h2.Value = playerObject.GetSkillLevel(SogSkill.Skill_OneHanded_SpiritSlash); + sliderSkillMelee1h3.Value = playerObject.GetSkillLevel(SogSkill.Skill_OneHanded_ShadowClone); + sliderSkillMelee1h4.Value = playerObject.GetSkillLevel(SogSkill.Skill_OneHanded_QuickCounter); + + sliderSkillMelee2h0.Value = playerObject.GetSkillLevel(SogSkill.Skill_TwoHanded_Overhead); + sliderSkillMelee2h1.Value = playerObject.GetSkillLevel(SogSkill.Skill_TwoHanded_Spin); + sliderSkillMelee2h2.Value = playerObject.GetSkillLevel(SogSkill.Skill_TwoHanded_Throw); + sliderSkillMelee2h3.Value = playerObject.GetSkillLevel(SogSkill.Skill_TwoHanded_Smash); + sliderSkillMelee2h4.Value = playerObject.GetSkillLevel(SogSkill.Skill_TwoHanded_BerserkMode); + + sliderSkillMagicF0.Value = playerObject.GetSkillLevel(SogSkill.Magic_Fire_Fireball); + sliderSkillMagicF1.Value = playerObject.GetSkillLevel(SogSkill.Magic_Fire_Meteor); + sliderSkillMagicF2.Value = playerObject.GetSkillLevel(SogSkill.Magic_Fire_Flamethrower); - sliderSkillMagicI0.Value = playerObject.GetSkillLevel(SogSkills.Magic_Ice_IceSpikes); - sliderSkillMagicI1.Value = playerObject.GetSkillLevel(SogSkills.Magic_Ice_IceNova); - sliderSkillMagicI2.Value = playerObject.GetSkillLevel(SogSkills.Magic_Ice_FrostyFriend); + sliderSkillMagicI0.Value = playerObject.GetSkillLevel(SogSkill.Magic_Ice_IceSpikes); + sliderSkillMagicI1.Value = playerObject.GetSkillLevel(SogSkill.Magic_Ice_IceNova); + sliderSkillMagicI2.Value = playerObject.GetSkillLevel(SogSkill.Magic_Ice_FrostyFriend); - sliderSkillMagicE0.Value = playerObject.GetSkillLevel(SogSkills.Magic_Earth_EarthSpike); - sliderSkillMagicE1.Value = playerObject.GetSkillLevel(SogSkills.Magic_Earth_SummonPlant); - sliderSkillMagicE2.Value = playerObject.GetSkillLevel(SogSkills.Magic_Earth_InsectSwarm); + sliderSkillMagicE0.Value = playerObject.GetSkillLevel(SogSkill.Magic_Earth_EarthSpike); + sliderSkillMagicE1.Value = playerObject.GetSkillLevel(SogSkill.Magic_Earth_SummonPlant); + sliderSkillMagicE2.Value = playerObject.GetSkillLevel(SogSkill.Magic_Earth_InsectSwarm); - sliderSkillMagicA0.Value = playerObject.GetSkillLevel(SogSkills.Magic_Wind_ChainLightning); - sliderSkillMagicA1.Value = playerObject.GetSkillLevel(SogSkills.Magic_Wind_SummonCloud); - sliderSkillMagicA2.Value = playerObject.GetSkillLevel(SogSkills.Magic_Wind_StaticTouch); + sliderSkillMagicA0.Value = playerObject.GetSkillLevel(SogSkill.Magic_Wind_ChainLightning); + sliderSkillMagicA1.Value = playerObject.GetSkillLevel(SogSkill.Magic_Wind_SummonCloud); + sliderSkillMagicA2.Value = playerObject.GetSkillLevel(SogSkill.Magic_Wind_StaticTouch); // find out if player has the card. mark the checkbox if yes for (int i = 0; i < cblstCards.Items.Count; i++) { - bool playerHasCard = playerObject.HasCard((SogEnemies)Enum.Parse(typeof(SogEnemies), cblstCards.Items[i].ToString())); + bool playerHasCard = playerObject.HasCard((SogEnemy)Enum.Parse(typeof(SogEnemy), cblstCards.Items[i].ToString())); cblstCards.SetItemChecked(i, playerHasCard); } // find out if player has the Quest. mark the checkbox if yes for (int i = 0; i < cblstQuests.Items.Count; i++) { - bool playerHasQuest = playerObject.HasQuest((SogQuests)Enum.Parse(typeof(SogQuests), cblstQuests.Items[i].ToString())); + bool playerHasQuest = playerObject.HasQuest((SogQuest)Enum.Parse(typeof(SogQuest), cblstQuests.Items[i].ToString())); cblstQuests.SetItemChecked(i, playerHasQuest); } } @@ -303,20 +303,20 @@ private void InitVariables() { } private void GetDataFromFields() { playerObject.Nickname = txtNickname.Text; - playerObject.Equip.Hat = (int)Enum.Parse(typeof(SogItems), cbHat.Text); - playerObject.Equip.Facegear = (int)Enum.Parse(typeof(SogItems), cbFacegear.Text); - playerObject.Equip.Weapon = (int)Enum.Parse(typeof(SogItems), cbWeapon.Text); - playerObject.Equip.Shield = (int)Enum.Parse(typeof(SogItems), cbShield.Text); - playerObject.Equip.Armor = (int)Enum.Parse(typeof(SogItems), cbArmor.Text); - playerObject.Equip.Shoes = (int)Enum.Parse(typeof(SogItems), cbShoes.Text); + playerObject.Equip.Hat = (int)Enum.Parse(typeof(SogItem), cbHat.Text); + playerObject.Equip.Facegear = (int)Enum.Parse(typeof(SogItem), cbFacegear.Text); + playerObject.Equip.Weapon = (int)Enum.Parse(typeof(SogItem), cbWeapon.Text); + playerObject.Equip.Shield = (int)Enum.Parse(typeof(SogItem), cbShield.Text); + playerObject.Equip.Armor = (int)Enum.Parse(typeof(SogItem), cbArmor.Text); + playerObject.Equip.Shoes = (int)Enum.Parse(typeof(SogItem), cbShoes.Text); - playerObject.Equip.Accessory1 = (int)Enum.Parse(typeof(SogItems), cbAccessory1.Text); - playerObject.Equip.Accessory2 = (int)Enum.Parse(typeof(SogItems), cbAccessory2.Text); + playerObject.Equip.Accessory1 = (int)Enum.Parse(typeof(SogItem), cbAccessory1.Text); + playerObject.Equip.Accessory2 = (int)Enum.Parse(typeof(SogItem), cbAccessory2.Text); - playerObject.Style.Hat = (int)Enum.Parse(typeof(SogItems), cbStyleHat.Text); - playerObject.Style.Facegear = (int)Enum.Parse(typeof(SogItems), cbStyleFacegear.Text); - playerObject.Style.Weapon = (int)Enum.Parse(typeof(SogItems), cbStyleWeapon.Text); - playerObject.Style.Shield = (int)Enum.Parse(typeof(SogItems), cbStyleShield.Text); + playerObject.Style.Hat = (int)Enum.Parse(typeof(SogItem), cbStyleHat.Text); + playerObject.Style.Facegear = (int)Enum.Parse(typeof(SogItem), cbStyleFacegear.Text); + playerObject.Style.Weapon = (int)Enum.Parse(typeof(SogItem), cbStyleWeapon.Text); + playerObject.Style.Shield = (int)Enum.Parse(typeof(SogItem), cbStyleShield.Text); /* TODO: Quickslots are not being saved correctly, we need to fix this for (int i = 0; i < 10; i++) @@ -345,7 +345,7 @@ private void GetDataFromFields() { Item item = new Item { - ItemID = (SogItems)Enum.Parse(typeof(SogItems), lstInventory.Items[i].SubItems[0].Text), + ItemID = (SogItem)Enum.Parse(typeof(SogItem), lstInventory.Items[i].SubItems[0].Text), ItemCount = int.Parse(lstInventory.Items[i].SubItems[1].Text), ItemPos = uint.Parse(lstInventory.Items[i].SubItems[2].Text) }; @@ -411,7 +411,7 @@ private void GetDataFromFields() { playerObject.Cards.Add( new Card { - CardID = (SogEnemies)Enum.Parse(typeof(SogEnemies), cblstCards.Items[i].ToString()) + CardID = (SogEnemy)Enum.Parse(typeof(SogEnemy), cblstCards.Items[i].ToString()) } ); } @@ -424,7 +424,7 @@ private void GetDataFromFields() { playerObject.Quests.Add( new Quest { - QuestID = (SogQuests)Enum.Parse(typeof(SogQuests), cblstQuests.Items[i].ToString()) + QuestID = (SogQuest)Enum.Parse(typeof(SogQuest), cblstQuests.Items[i].ToString()) } ); } @@ -542,19 +542,19 @@ private void ClothingColor_Click(object sender, EventArgs e) if (((Control)sender) == btnHairColor) { - playerObject.Style.HairColor = (byte)(SogColors)Enum.Parse(typeof(SogColors), sColor); + playerObject.Style.HairColor = (byte)(SogColor)Enum.Parse(typeof(SogColor), sColor); } else if (((Control)sender) == btnPonchoColor) { - playerObject.Style.PonchoColor = (byte)(SogColors)Enum.Parse(typeof(SogColors), sColor); + playerObject.Style.PonchoColor = (byte)(SogColor)Enum.Parse(typeof(SogColor), sColor); } else if (((Control)sender) == btnShirtColor) { - playerObject.Style.ShirtColor = (byte)(SogColors)Enum.Parse(typeof(SogColors), sColor); + playerObject.Style.ShirtColor = (byte)(SogColor)Enum.Parse(typeof(SogColor), sColor); } else if (((Control)sender) == btnPantsColor) { - playerObject.Style.PantsColor = (byte)(SogColors)Enum.Parse(typeof(SogColors), sColor); + playerObject.Style.PantsColor = (byte)(SogColor)Enum.Parse(typeof(SogColor), sColor); } } } @@ -579,7 +579,7 @@ private void LstPets_SelectedIndexChanged(object sender, EventArgs e) txtPetNickname.Text = lstPets.Items[index].SubItems[1].Text; - cbPetType.Text = ((SogPets)playerObject.Pets[index].Type1).ToString(); + cbPetType.Text = ((SogPet)playerObject.Pets[index].Type1).ToString(); } private void BtnDeleteSelectedItem_Click(object sender, EventArgs e) @@ -701,7 +701,7 @@ private void btnResetCards_Click(object sender, EventArgs e) { for (int i = 0; i < cblstCards.Items.Count; i++) { - bool playerHasCard = playerObject.HasCard((SogEnemies)Enum.Parse(typeof(SogEnemies), cblstCards.Items[i].ToString())); + bool playerHasCard = playerObject.HasCard((SogEnemy)Enum.Parse(typeof(SogEnemy), cblstCards.Items[i].ToString())); cblstCards.SetItemChecked(i, playerHasCard); } } @@ -726,7 +726,7 @@ private void btnResetQuests_Click(object sender, EventArgs e) { for (int i = 0; i < cblstQuests.Items.Count; i++) { - bool playerHasQuest = playerObject.HasQuest((SogQuests)Enum.Parse(typeof(SogQuests), cblstQuests.Items[i].ToString())); + bool playerHasQuest = playerObject.HasQuest((SogQuest)Enum.Parse(typeof(SogQuest), cblstQuests.Items[i].ToString())); cblstQuests.SetItemChecked(i, playerHasQuest); } } diff --git a/SoG_SGreader/Objects/Card.cs b/SoG_SGreader/Objects/Card.cs index 8412d14..b23fca8 100644 --- a/SoG_SGreader/Objects/Card.cs +++ b/SoG_SGreader/Objects/Card.cs @@ -2,6 +2,6 @@ namespace SoG_SGreader { public class Card { - public SogEnemies CardID { get; set; } + public SogEnemy CardID { get; set; } } } \ No newline at end of file diff --git a/SoG_SGreader/Objects/FishCaught.cs b/SoG_SGreader/Objects/FishCaught.cs index 404a0bd..7bc4f67 100644 --- a/SoG_SGreader/Objects/FishCaught.cs +++ b/SoG_SGreader/Objects/FishCaught.cs @@ -2,6 +2,6 @@ namespace SoG_SGreader { public class FishCaught { - public SogItems FishID { get; set; } + public SogItem FishID { get; set; } } } \ No newline at end of file diff --git a/SoG_SGreader/Objects/Item.cs b/SoG_SGreader/Objects/Item.cs index 296d82e..c6126ae 100644 --- a/SoG_SGreader/Objects/Item.cs +++ b/SoG_SGreader/Objects/Item.cs @@ -2,7 +2,7 @@ namespace SoG_SGreader { public class Item { - public SogItems ItemID { get; set; } + public SogItem ItemID { get; set; } public int ItemCount { get; set; } public uint ItemPos { get; set; } diff --git a/SoG_SGreader/Objects/ItemCrafted.cs b/SoG_SGreader/Objects/ItemCrafted.cs index 6e383f7..9d9b3d2 100644 --- a/SoG_SGreader/Objects/ItemCrafted.cs +++ b/SoG_SGreader/Objects/ItemCrafted.cs @@ -2,6 +2,6 @@ namespace SoG_SGreader { public class ItemCrafted { - public SogItems ItemID { get; set; } + public SogItem ItemID { get; set; } } } \ No newline at end of file diff --git a/SoG_SGreader/Objects/ItemsSeen.cs b/SoG_SGreader/Objects/ItemsSeen.cs index cb371c1..baac034 100644 --- a/SoG_SGreader/Objects/ItemsSeen.cs +++ b/SoG_SGreader/Objects/ItemsSeen.cs @@ -2,6 +2,6 @@ namespace SoG_SGreader { public class ItemsSeen { - public SogItems ItemID { get; set; } + public SogItem ItemID { get; set; } } } \ No newline at end of file diff --git a/SoG_SGreader/Objects/MerchantItem.cs b/SoG_SGreader/Objects/MerchantItem.cs index 26f414a..eac81a1 100644 --- a/SoG_SGreader/Objects/MerchantItem.cs +++ b/SoG_SGreader/Objects/MerchantItem.cs @@ -2,7 +2,7 @@ namespace SoG_SGreader { public class MerchantItem { - public SogItems ItemID { get; set; } + public SogItem ItemID { get; set; } public int ItemCount { get; set; } } } \ No newline at end of file diff --git a/SoG_SGreader/Objects/Player.cs b/SoG_SGreader/Objects/Player.cs index 37c7f3b..5173b7c 100644 --- a/SoG_SGreader/Objects/Player.cs +++ b/SoG_SGreader/Objects/Player.cs @@ -77,7 +77,7 @@ public class Player public byte HouseStylesCount { get; set; } public List Houses; - internal byte GetSkillLevel(SogSkills skillId) + internal byte GetSkillLevel(SogSkill skillId) { return Skills.FirstOrDefault(skill => skill.SkillID == skillId)?.SkillLevel ?? 0; } @@ -87,12 +87,12 @@ internal byte GetSkillLevel(Skill skill) return Skills.FirstOrDefault(s => s.SkillID == skill.SkillID)?.SkillLevel ?? 0; } - internal bool HasCard(SogEnemies sogEnemies) + internal bool HasCard(SogEnemy sogEnemies) { return Cards.Any(card => card.CardID == sogEnemies); } - internal void AddCard(SogEnemies sogEnemies) + internal void AddCard(SogEnemy sogEnemies) { // add card to player, dont add duplicates if (!HasCard(sogEnemies)) @@ -104,7 +104,7 @@ internal void AddCard(SogEnemies sogEnemies) } } - internal void RemoveCard(SogEnemies sogEnemies) + internal void RemoveCard(SogEnemy sogEnemies) { // remove card from player, if it exists if (HasCard(sogEnemies)) @@ -115,12 +115,12 @@ internal void RemoveCard(SogEnemies sogEnemies) //same as above, but for quests - internal bool HasQuest(SogQuests sogQuests) + internal bool HasQuest(SogQuest sogQuests) { return Quests.Any(quest => quest.QuestID == sogQuests); } - internal void AddQuest(SogQuests sogQuests) + internal void AddQuest(SogQuest sogQuests) { // add quest to player, dont add duplicates if (!HasQuest(sogQuests)) @@ -132,7 +132,7 @@ internal void AddQuest(SogQuests sogQuests) } } - internal void RemoveQuest(SogQuests sogQuests) + internal void RemoveQuest(SogQuest sogQuests) { // remove quest from player, if it exists if (HasQuest(sogQuests)) diff --git a/SoG_SGreader/Objects/Quest.cs b/SoG_SGreader/Objects/Quest.cs index ed0e129..1b5dd65 100644 --- a/SoG_SGreader/Objects/Quest.cs +++ b/SoG_SGreader/Objects/Quest.cs @@ -2,6 +2,6 @@ namespace SoG_SGreader { public class Quest { - public SogQuests QuestID { get; set; } + public SogQuest QuestID { get; set; } } } \ No newline at end of file diff --git a/SoG_SGreader/Objects/Skill.cs b/SoG_SGreader/Objects/Skill.cs index f993f62..3d92aed 100644 --- a/SoG_SGreader/Objects/Skill.cs +++ b/SoG_SGreader/Objects/Skill.cs @@ -2,7 +2,7 @@ namespace SoG_SGreader { public class Skill { - public SogSkills SkillID { get; set; } + public SogSkill SkillID { get; set; } public byte SkillLevel { get; set; } } } \ No newline at end of file diff --git a/SoG_SGreader/SoG_SGreader.csproj b/SoG_SGreader/SoG_SGreader.csproj index 888f9f7..99cbb8f 100644 --- a/SoG_SGreader/SoG_SGreader.csproj +++ b/SoG_SGreader/SoG_SGreader.csproj @@ -131,14 +131,14 @@ - - + + - - - - + + + +