diff --git a/osrs-toolbox/APIs/Runescape/DataModels/PlayerInfo.cs b/osrs-toolbox/APIs/Runescape/DataModels/PlayerInfo.cs index e92aa3e..e4f24b8 100644 --- a/osrs-toolbox/APIs/Runescape/DataModels/PlayerInfo.cs +++ b/osrs-toolbox/APIs/Runescape/DataModels/PlayerInfo.cs @@ -19,6 +19,7 @@ namespace osrs_toolbox //skills public Skill Overall { get; set; } = InitialSkillState; + //public Skill PreSailingOverall { get; set; } = InitialSkillState; public Skill Attack { get; set; } = InitialSkillState; public Skill Defence { get; set; } = InitialSkillState; public Skill Strength { get; set; } = InitialSkillState; @@ -42,8 +43,10 @@ namespace osrs_toolbox public Skill Runecrafting { get; set; } = InitialSkillState; public Skill Hunter { get; set; } = InitialSkillState; public Skill Construction { get; set; } = InitialSkillState; + public Skill Sailing { get; set; } = InitialSkillState; //minigames + public Activity GridManPoints { get; set; } = InitialActivityState; public Activity LeaguePoints { get; set; } = InitialActivityState; public Activity BountyHunterRogues { get; set; } = InitialActivityState; public Activity BountyHunter { get; set; } = InitialActivityState; @@ -86,6 +89,7 @@ namespace osrs_toolbox public Boss DagannothRex { get; set; } = InitialBossState; public Boss DagannothSupreme { get; set; } = InitialBossState; public Boss DerangedArchaeologist { get; set; } = InitialBossState; + public Boss DoomofMokhaiotl { get; set; } = InitialBossState; public Boss DukeSucellus { get; set; } = InitialBossState; public Boss GeneralGraardor { get; set; } = InitialBossState; public Boss GiantMole { get; set; } = InitialBossState; @@ -106,6 +110,7 @@ namespace osrs_toolbox public Boss Sarachnis { get; set; } = InitialBossState; public Boss Scorpia { get; set; } = InitialBossState; public Boss Scurrius { get; set; } = InitialBossState; + public Boss ShellbaneGryphon { get; set; } = InitialBossState; public Boss Skotizo { get; set; } = InitialBossState; public Boss SolHeredit { get; set; } = InitialBossState; public Boss Spindel { get; set; } = InitialBossState; @@ -179,8 +184,8 @@ namespace osrs_toolbox foreach (PropertyInfo info in properties.Where(info => info.PropertyType == typeof(Activity))) { - Activity skill = (Activity)info.GetValue(this, null); - yield return skill; + Activity activity = (Activity)info.GetValue(this, null); + yield return activity; } } @@ -191,8 +196,8 @@ namespace osrs_toolbox foreach (PropertyInfo info in properties.Where(info => info.PropertyType == typeof(Boss))) { - Boss skill = (Boss)info.GetValue(this, null); - yield return skill; + Boss boss = (Boss)info.GetValue(this, null); + yield return boss; } } } diff --git a/osrs-toolbox/APIs/Runescape/PlayerInfoService.cs b/osrs-toolbox/APIs/Runescape/PlayerInfoService.cs index 7fb374c..79e4c02 100644 --- a/osrs-toolbox/APIs/Runescape/PlayerInfoService.cs +++ b/osrs-toolbox/APIs/Runescape/PlayerInfoService.cs @@ -7,6 +7,7 @@ using System.Net; using System.Reflection; using System.Text; using System.Threading.Tasks; +using System.Windows; namespace osrs_toolbox { @@ -103,7 +104,10 @@ namespace osrs_toolbox .Where(x => typeof(IPlayerInfoProperty).IsAssignableFrom(x.PropertyType)).ToArray(); if (properties.Count() != TotalLines(reader) && _throwMismatchException) + { throw new FormatException("Property mismatch; OSRS API Contains more properties than PlayerInfo class. Please contact Repository creator"); + } + foreach (PropertyInfo info in properties) { diff --git a/osrs-toolbox/APIs/WiseOldMan/Player/PlayerBosses.cs b/osrs-toolbox/APIs/WiseOldMan/Player/PlayerBosses.cs index 65565a3..8c37f2f 100644 --- a/osrs-toolbox/APIs/WiseOldMan/Player/PlayerBosses.cs +++ b/osrs-toolbox/APIs/WiseOldMan/Player/PlayerBosses.cs @@ -23,6 +23,7 @@ public BossData dagannoth_rex { get; set; } public BossData dagannoth_supreme { get; set; } public BossData deranged_archaeologist { get; set; } + public BossData doom_of_mokhaiotl { get; set; } public BossData duke_sucellus { get; set; } public BossData general_graardor { get; set; } public BossData giant_mole { get; set; } @@ -43,6 +44,7 @@ public BossData sarachnis { get; set; } public BossData scorpia { get; set; } public BossData scurrius { get; set; } + public BossData shellbane_gryphon { get; set; } public BossData skotizo { get; set; } public BossData sol_heredit { get; set; } public BossData spindel { get; set; } diff --git a/osrs-toolbox/APIs/WiseOldMan/Player/PlayerSkills.cs b/osrs-toolbox/APIs/WiseOldMan/Player/PlayerSkills.cs index 89d98ba..9c2339a 100644 --- a/osrs-toolbox/APIs/WiseOldMan/Player/PlayerSkills.cs +++ b/osrs-toolbox/APIs/WiseOldMan/Player/PlayerSkills.cs @@ -26,5 +26,6 @@ public SkillData runecrafting { get; set; } public SkillData hunter { get; set; } public SkillData construction { get; set; } + public SkillData sailing { get; set; } } } diff --git a/osrs-toolbox/Models/HiscoreLookupModel.cs b/osrs-toolbox/Models/HiscoreLookupModel.cs index b998267..92f937f 100644 --- a/osrs-toolbox/Models/HiscoreLookupModel.cs +++ b/osrs-toolbox/Models/HiscoreLookupModel.cs @@ -66,8 +66,10 @@ namespace osrs_toolbox Output += string.Format("\nRunecrafting Level: {0} XP: {1} Rank: {2}", HiscoreInfo.Runecrafting.Level, HiscoreInfo.Runecrafting.Experience, HiscoreInfo.Runecrafting.Rank); Output += string.Format("\nHunter Level: {0} XP: {1} Rank: {2}", HiscoreInfo.Hunter.Level, HiscoreInfo.Hunter.Experience, HiscoreInfo.Hunter.Rank); Output += string.Format("\nConstruction Level: {0} XP: {1} Rank: {2}", HiscoreInfo.Construction.Level, HiscoreInfo.Construction.Experience, HiscoreInfo.Construction.Rank); + Output += string.Format("\nSailing Level: {0} XP: {1} Rank: {2}", HiscoreInfo.Sailing.Level, HiscoreInfo.Sailing.Experience, HiscoreInfo.Sailing.Rank); break; case "Activities": + Output += string.Format("\nGrid Man Points: {0} Rank: {1}", HiscoreInfo.GridManPoints.Score, HiscoreInfo.GridManPoints.Rank); Output += string.Format("\nLeague Points: {0} Rank: {1}", HiscoreInfo.LeaguePoints.Score, HiscoreInfo.LeaguePoints.Rank); Output += string.Format("\nBounty Hunter Rogues Score: {0} Rank: {1}", HiscoreInfo.BountyHunterRogues.Score, HiscoreInfo.BountyHunterRogues.Rank); Output += string.Format("\nBounty Hunter Score: {0} Rank: {1}", HiscoreInfo.BountyHunter.Score, HiscoreInfo.BountyHunter.Rank); @@ -110,6 +112,7 @@ namespace osrs_toolbox Output += string.Format("\nDagannoth Rex KC: {0} Rank: {1}", HiscoreInfo.DagannothRex.Kills, HiscoreInfo.DagannothRex.Rank); Output += string.Format("\nDagannoth Supreme KC: {0} Rank: {1}", HiscoreInfo.DagannothSupreme.Kills, HiscoreInfo.DagannothSupreme.Rank); Output += string.Format("\nDeranged Archaeologist KC: {0} Rank: {1}", HiscoreInfo.DerangedArchaeologist.Kills, HiscoreInfo.DerangedArchaeologist.Rank); + Output += string.Format("\nDoom of Mokhaiotl KC: {0} Rank: {1}", HiscoreInfo.DoomofMokhaiotl.Kills, HiscoreInfo.DoomofMokhaiotl.Rank); Output += string.Format("\nDuke Sucellus KC: {0} Rank: {1}", HiscoreInfo.DukeSucellus.Kills, HiscoreInfo.DukeSucellus.Rank); Output += string.Format("\nGeneral Graardor KC: {0} Rank: {1}", HiscoreInfo.GeneralGraardor.Kills, HiscoreInfo.GeneralGraardor.Rank); Output += string.Format("\nGiant Mole KC: {0} Rank: {1}", HiscoreInfo.GiantMole.Kills, HiscoreInfo.GiantMole.Rank); @@ -130,6 +133,7 @@ namespace osrs_toolbox Output += string.Format("\nSarachnis KC: {0} Rank: {1}", HiscoreInfo.Sarachnis.Kills, HiscoreInfo.Sarachnis.Rank); Output += string.Format("\nScorpia KC: {0} Rank: {1}", HiscoreInfo.Scorpia.Kills, HiscoreInfo.Scorpia.Rank); Output += string.Format("\nScurrius KC: {0} Rank: {1}", HiscoreInfo.Scurrius.Kills, HiscoreInfo.Scurrius.Rank); + Output += string.Format("\nShellbane Gryphon KC: {0} Rank: {1}", HiscoreInfo.ShellbaneGryphon.Kills, HiscoreInfo.ShellbaneGryphon.Rank); Output += string.Format("\nSkotizo KC: {0} Rank: {1}", HiscoreInfo.Skotizo.Kills, HiscoreInfo.Skotizo.Rank); Output += string.Format("\nSol Heredit KC: {0} Rank: {1}", HiscoreInfo.SolHeredit.Kills, HiscoreInfo.SolHeredit.Rank); Output += string.Format("\nSpindel KC: {0} Rank: {1}", HiscoreInfo.Spindel.Kills, HiscoreInfo.Spindel.Rank);