diff --git a/ProjectLighthouse.sln.DotSettings b/ProjectLighthouse.sln.DotSettings index abc916cc..1c039f54 100644 --- a/ProjectLighthouse.sln.DotSettings +++ b/ProjectLighthouse.sln.DotSettings @@ -1,2 +1,3 @@  - True \ No newline at end of file + True + True \ No newline at end of file diff --git a/ProjectLighthouse/Types/User.cs b/ProjectLighthouse/Types/User.cs index 1aa46473..6bb04ef9 100644 --- a/ProjectLighthouse/Types/User.cs +++ b/ProjectLighthouse/Types/User.cs @@ -18,6 +18,9 @@ namespace ProjectLighthouse { public int PhotosWithMeCount { get; set; } public bool CommentsEnabled { get; set; } public Location Location { get; set; } + public int FavouriteSlotCount { get; set; } + public int FavouriteUserCount { get; set; } + public int lolcatftwCount { get; set; } public string Pins { get; set; } public int StaffChallengeGoldCount { get; set; } public int StaffChallengeSilverCount { get; set; } @@ -40,8 +43,11 @@ namespace ProjectLighthouse { private string SerializeSlots() { string slots = string.Empty; - foreach(string slotType in slotTypes) { + foreach(string s in slotTypes) { + string slotType = s; // vars in foreach are immutable, define helper var + slots += LbpSerializer.GetStringElement(slotType + "UsedSlots", UsedSlots); + if(slotType == "lbp1") slotType = ""; slots += LbpSerializer.GetStringElement(slotType + "EntitledSlots", EntitledSlots); // ReSharper disable once StringLiteralTypo slots += LbpSerializer.GetStringElement(slotType + slotType == "crossControl" ? "PurchsedSlots" : "PurchasedSlots", 0); @@ -55,8 +61,29 @@ namespace ProjectLighthouse { public string Serialize() { string user = LbpSerializer.GetTaggedStringElement("npHandle", Username, "icon", IconHash) + + LbpSerializer.GetStringElement("game", Game) + this.SerializeSlots() + - LbpSerializer.GetStringElement("game", Game); + LbpSerializer.GetStringElement("lists", Lists) + + LbpSerializer.GetStringElement("lists_quota", ListsQuota) + + LbpSerializer.GetStringElement("heartCount", HeartCount) + + LbpSerializer.GetStringElement("yay2", YayHash) + + LbpSerializer.GetStringElement("boo2", BooHash) + + LbpSerializer.GetStringElement("biography", Biography) + + LbpSerializer.GetStringElement("reviewCount", ReviewCount) + + LbpSerializer.GetStringElement("commentCount", CommentCount) + + LbpSerializer.GetStringElement("photosByMeCount", PhotosByMeCount) + + LbpSerializer.GetStringElement("photosWithMeCount", PhotosWithMeCount) + + LbpSerializer.GetStringElement("commentsEnabled", CommentsEnabled) + + Location.Serialize() + + LbpSerializer.GetStringElement("favouriteSlotCount", FavouriteSlotCount) + + LbpSerializer.GetStringElement("favouriteUserCount", FavouriteUserCount) + + LbpSerializer.GetStringElement("lolcatftwCount", lolcatftwCount) + + LbpSerializer.GetStringElement("pins", Pins) + + LbpSerializer.GetStringElement("staffChallengeGoldCount", StaffChallengeGoldCount) + + LbpSerializer.GetStringElement("staffChallengeSilverCount", StaffChallengeSilverCount) + + LbpSerializer.GetStringElement("staffChallengeBronzeCount", StaffChallengeBronzeCount) + + LbpSerializer.GetStringElement("photos", "") + + this.ClientsConnected.Serialize(); return LbpSerializer.GetTaggedStringElement("user", user, "type", "user"); }