Added Achivs

Added lot more in TestServer for soon multiplayer U19TS
SlejmUr · Feb 9, 2024 · 44f0725 · 44f0725
1 parent a562b00
commit 44f0725
Show file tree

Hide file tree

Showing 30 changed files with 560 additions and 163 deletions.
diff --git a/JsonLib/Classes/DatabaseRelated/Achievement.cs b/JsonLib/Classes/DatabaseRelated/Achievement.cs
@@ -0,0 +1,53 @@
+using JsonLib.Classes.QuestRelated;
+using Newtonsoft.Json;
+
+namespace JsonLib.Classes.DatabaseRelated
+{
+    public class Achievement
+    {
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public string id { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public string imageUrl { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public string assetPath { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public List<object> rewards { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public Quest.Conditions conditions { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public bool instantComplete { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public bool showNotificationsInGame { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public bool showProgress { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public string prefab { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public string rarity { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public bool hidden { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public bool showConditions { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public bool progressBarEnabled { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public string side { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+        public int index { get; set; }
+    }
+}
diff --git a/JsonLib/Classes/DatabaseRelated/DatabaseCore.cs b/JsonLib/Classes/DatabaseRelated/DatabaseCore.cs
@@ -65,5 +65,7 @@ public class trader
         public Dictionary<string, string> Weather { get; set; } = new();
 
         public LootBase Loot { get; set; } = new();
+
+        public List<Achievement> Achievements { get; set; } = new();
     }
 }
diff --git a/JsonLib/Classes/ProfileRelated/Character.cs b/JsonLib/Classes/ProfileRelated/Character.cs
@@ -1,5 +1,4 @@
 using JsonLib.Classes.ItemRelated;
-using JsonLib.Classes.QuestRelated;
 using JsonLib.Classes.TradeRelated;
 using JsonLib.Enums;
 using Newtonsoft.Json;
@@ -26,59 +25,86 @@ public class Base
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public Customization Customization { get; set; }
 
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public Dictionary<string, bool> Encyclopedia { get; set; }
+
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public Health Health { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public Inventory Inventory { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public Skills Skills { get; set; }
+            public List<InsuredItem> InsuredItems { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public Stats Stats { get; set; }
+            public List<QuestItem> QuestItems { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public Dictionary<string, bool> Encyclopedia { get; set; }
+            public Skills Skills { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public ConditionCounters ConditionCounters { get; set; }
+            public _Notes Notes { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public Dictionary<string, BackendCounter> BackendCounters { get; set; }
+            public Dictionary<string, Counter> TaskConditionCounters { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<InsuredItem> InsuredItems { get; set; }
+            public List<Quest> Quests { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public Hideout Hideout { get; set; }
+            public Dictionary<string, int> Achievements { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<Quest> Quests { get; set; }
+            public UnlockedInfo UnlockedInfo { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public Dictionary<string, TraderInfo> TradersInfo { get; set; }
+            public List<Bonus> Bonuses { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public UnlockedInfo UnlockedInfo { get; set; }
+            public Hideout Hideout { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public RagfairInfo RagfairInfo { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<RepeatableQuests.CharacterRepeatableQuest> RepeatableQuests { get; set; }
+            public List<string> WishList { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<Bonus> Bonuses { get; set; }
+            public Stats Stats { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public _Notes Notes { get; set; }
+            public Dictionary<string, BackendCounter> BackendCounters { get; set; }
+
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public Dictionary<string, TraderInfo> TradersInfo { get; set; }
 
             [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
             public string SurvivorClass { get; set; }
 
+            [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+            public Dictionary<string, int> CheckedMagazines { get; set; }
+
+            [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+            public List<string> CheckedChambers { get; set; }
+
+            [JsonProperty(NullValueHandling = NullValueHandling.Include)]
+            public object BonusController { get; set; }
+
+            [JsonProperty(NullValueHandling = NullValueHandling.Include)]
+            public Skills SkillsInfo { get; set; }
+
+            [JsonProperty(NullValueHandling = NullValueHandling.Include)]
+            public Inventory InventoryInfo { get; set; }
+
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<string> WishList { get; set; }
+            public int Experience { get; set; }
+
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public string Side { get; set; }
+
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public int MagDrillsMastering { get; set; }
 
         }
 
@@ -90,9 +116,6 @@ public class UnlockedInfo
         }
         public class Info
         {
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public string EntryPoint { get; set; }
-
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public string Nickname { get; set; }
 
@@ -102,59 +125,44 @@ public class Info
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public string Side { get; set; }
 
-            [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
-            public bool SquadnviteRestriction { get; set; }
-
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public string Voice { get; set; }
-
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public int Level { get; set; }
+            public int RegistrationDate { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public int Experience { get; set; }
-
+            public int SavageLockTime { get; set; }
+            public string GroupId { get; set; }
+            public string TeamId { get; set; }
+            public string EntryPoint { get; set; }
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public int RegistrationDate { get; set; }
+            public int NicknameChangeDate { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public string GameVersion { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public int AccountType { get; set; }
-
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public EMemberCategory MemberCategory { get; set; }
+            public string Voice { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public bool lockedMoveCommands { get; set; }
+            public bool IsStreamerModeAvailable { get; set; }
 
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public double SavageLockTime { get; set; }
+            [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
+            public bool SquadnviteRestriction { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public int LastTimePlayedAsSavage { get; set; }
+            public List<Ban> Bans { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public Settings Settings { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public int NicknameChangeDate { get; set; }
-
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<object> NeedWipeOptions { get; set; }
-
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<Ban> Bans { get; set; }
+            public EMemberCategory MemberCategory { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public bool BannedState { get; set; }
+            public int Experience { get; set; }
 
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public int BannedUntil { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public bool IsStreamerModeAvailable { get; set; }
+            public int Level { get; set; }
 
         }
         public class Settings
@@ -472,12 +480,7 @@ public class CounterKeyValue
             public int Value { get; set; }
 
         }
-        public class ConditionCounters
-        {
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<Counter> Counters { get; set; }
 
-        }
         public class Counter
         {
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
@@ -487,7 +490,10 @@ public class Counter
             public int value { get; set; }
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public string qid { get; set; }
+            public string sourceId { get; set; }
+
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public string type { get; set; }
 
         }
         public class Aggressor
@@ -552,33 +558,6 @@ public class LethalDamage
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public int ImpactsCount { get; set; }
 
-        }
-        public class BodyPartsDamageHistory
-        {
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<DamageStats> Head { get; set; }
-
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<DamageStats> Chest { get; set; }
-
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<DamageStats> Stomach { get; set; }
-
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<DamageStats> LeftArm { get; set; }
-
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<DamageStats> RightArm { get; set; }
-
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<DamageStats> LeftLeg { get; set; }
-
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<DamageStats> RightLeg { get; set; }
-
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            public List<DamageStats> Common { get; set; }
-
         }
         public class DamageStats
         {
@@ -663,7 +642,17 @@ public class InsuredItem
 
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public string itemId { get; set; }
+        }
+        public class QuestItem
+        {
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public string _id { get; set; }
 
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public string _tpl { get; set; }
+
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public string parentId { get; set; }
         }
         public class Hideout
         {
@@ -805,6 +794,16 @@ public class _Notes
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public List<Note> Notes { get; set; }
 
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public _TransactionInProcess TransactionInProcess { get; set; }
+
+            public class _TransactionInProcess
+            {
+                public object Handlers { get; set; }
+                public bool HasHandlers { get; set; }
+                public bool HasCheckChanges { get; set; }
+            }
+
         }
         public class Quest
         {