Merge pull request #113 from Lacyway/dev

Update backend.core models to use properties
project-fika · Jan 7, 2025 · 576b7b1 · 576b7b1
2 parents 4aac3bb + 9e38a9f
commit 576b7b1
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 51 deletions.
diff --git a/Fuyu.Backend.BSG/ItemTemplates/AmmoItemProperties.cs b/Fuyu.Backend.BSG/ItemTemplates/AmmoItemProperties.cs
@@ -190,9 +190,11 @@ public class AmmoItemProperties : StackableItemItemProperties
 
     public enum EFlareEventType
     {
-        Airdrop,
+		Light,
+		Airdrop,
         ExitActivate,
-        AIFollowEvent,
+		Quest,
+		AIFollowEvent,
         CallArtilleryOnMyself
     }
 }
diff --git a/Fuyu.Backend.BSG/ItemTemplates/VestItemProperties.cs b/Fuyu.Backend.BSG/ItemTemplates/VestItemProperties.cs
@@ -108,6 +108,7 @@ public enum EMaterialType
         GlassVisor,
         HelmetRicochet,
         MetalNoDecal,
+		Snow,
         None = 0
     }
 

diff --git a/Fuyu.Backend.BSG/Models/Hideout/EAreaType.cs b/Fuyu.Backend.BSG/Models/Hideout/EAreaType.cs
@@ -2,31 +2,34 @@ namespace Fuyu.Backend.BSG.Models.Hideout
 {
     public enum EAreaType
     {
-        Vents = 0,
-        Security = 1,
-        WaterCloset = 2,
-        Stash = 3,
-        Generator = 4,
-        Heating = 5,
-        WaterCollector = 6,
-        MedStation = 7,
-        Kitchen = 8,
-        RestSpace = 9,
-        Workbench = 10,
-        IntelligenceCenter = 11,
-        ShootingRange = 12,
-        Library = 13,
-        ScavCase = 14,
-        Illumination = 15,
-        PlaceOfFame = 16,
-        AirFilteringUnit = 17,
-        SolarPower = 18,
-        BoozeGenerator = 19,
-        BitcoinFarm = 20,
-        ChristmasIllumination = 21,
-        EmergencyWall = 22,
-        Gym = 23,
-        WeaponStand = 24,
-        WeaponStandSecondary = 25
-    }
+		NotSet = -1,
+        Vents,
+        Security,
+        WaterCloset,
+        Stash,
+        Generator,
+        Heating,
+        WaterCollector,
+        MedStation,
+        Kitchen,
+        RestSpace,
+        Workbench,
+        IntelligenceCenter,
+        ShootingRange,
+        Library,
+        ScavCase,
+        Illumination,
+        PlaceOfFame,
+        AirFilteringUnit,
+        SolarPower,
+        BoozeGenerator,
+        BitcoinFarm,
+        ChristmasIllumination,
+        EmergencyWall,
+        Gym,
+        WeaponStand,
+        WeaponStandSecondary,
+		EquipmentPresetsStand,
+		CircleOfCultists
+	}
 }
diff --git a/Fuyu.Backend.BSG/Models/Profiles/Info/EMemberCategory.cs b/Fuyu.Backend.BSG/Models/Profiles/Info/EMemberCategory.cs
@@ -11,6 +11,7 @@ public enum EMemberCategory
         ChatModeratorWithPermanentBan = 64,
         UnitTest = 128,
         Sherpa = 256,
-        Emissary = 512
+        Emissary = 512,
+		Unheard = 1024
     }
 }
diff --git a/Fuyu.Backend.BSG/Models/Profiles/Info/EPlayerSide.cs b/Fuyu.Backend.BSG/Models/Profiles/Info/EPlayerSide.cs
@@ -2,8 +2,8 @@ namespace Fuyu.Backend.BSG.Models.Profiles.Info
 {
     public enum EPlayerSide
     {
-        Usec,
+        Usec = 1,
         Bear,
-        Savage
+        Savage = 4
     }
 }
diff --git a/Fuyu.Backend.BSG/Models/Templates/EEquipmentBuildType.cs b/Fuyu.Backend.BSG/Models/Templates/EEquipmentBuildType.cs
@@ -4,6 +4,7 @@ namespace Fuyu.Backend.BSG.Models.Templates
     public enum EEquipmentBuildType
     {
         Custom,
-        Standard
+        Standard,
+		Storage
     }
 }
diff --git a/Fuyu.Backend.Core/Models/Accounts/Account.cs b/Fuyu.Backend.Core/Models/Accounts/Account.cs
@@ -7,18 +7,18 @@ namespace Fuyu.Backend.Core.Models.Accounts
     public class Account
     {
         [DataMember]
-        public int Id;
+        public int Id { get; set; }
 
         [DataMember]
-        public string Username;
+        public string Username { get; set; }
 
         [DataMember]
-        public string Password;
+        public string Password { get; set; }
 
         [DataMember]
-        public Dictionary<string, int?> Games;
+        public Dictionary<string, int?> Games { get; set; }
 
         [DataMember]
-        public bool IsBanned;
+        public bool IsBanned { get; set; }
     }
 }
diff --git a/Fuyu.Backend.Core/Models/Requests/AccountLoginRequest.cs b/Fuyu.Backend.Core/Models/Requests/AccountLoginRequest.cs
@@ -6,9 +6,9 @@ namespace Fuyu.Backend.Core.Models.Requests
     public class AccountLoginRequest
     {
         [DataMember]
-        public string Username;
+        public string Username { get; set; }
 
         [DataMember]
-        public string Password;
+        public string Password { get; set; }
     }
 }
diff --git a/Fuyu.Backend.Core/Models/Requests/AccountRegisterGameRequest.cs b/Fuyu.Backend.Core/Models/Requests/AccountRegisterGameRequest.cs
@@ -6,9 +6,9 @@ namespace Fuyu.Backend.Core.Models.Requests
     public class AccountRegisterGameRequest
     {
         [DataMember]
-        public string Game;
+        public string Game { get; set; }
 
         [DataMember]
-        public string Edition;
+        public string Edition { get; set; }
     }
 }
diff --git a/Fuyu.Backend.Core/Models/Requests/AccountRegisterRequest.cs b/Fuyu.Backend.Core/Models/Requests/AccountRegisterRequest.cs
@@ -6,9 +6,9 @@ namespace Fuyu.Backend.Core.Models.Requests
     public class AccountRegisterRequest
     {
         [DataMember]
-        public string Username;
+        public string Username { get; set; }
 
         [DataMember]
-        public string Password;
+        public string Password { get; set; }
     }
 }
diff --git a/Fuyu.Backend.Core/Models/Response/AccountGamesResponse.cs b/Fuyu.Backend.Core/Models/Response/AccountGamesResponse.cs
@@ -7,6 +7,6 @@ namespace Fuyu.Backend.Core.Models.Responses
     public class AccountGamesResponse
     {
         [DataMember]
-        public Dictionary<string, int?> Games;
+        public Dictionary<string, int?> Games { get; set; }
     }
 }
diff --git a/Fuyu.Backend.Core/Models/Response/AccountLoginResponse.cs b/Fuyu.Backend.Core/Models/Response/AccountLoginResponse.cs
@@ -7,9 +7,9 @@ namespace Fuyu.Backend.Core.Models.Responses
     public class AccountLoginResponse
     {
         [DataMember]
-        public ELoginStatus Status;
+        public ELoginStatus Status { get; set; }
 
         [DataMember]
-        public string SessionId;
+        public string SessionId { get; set; }
     }
 }
diff --git a/Fuyu.Backend.Core/Models/Response/AccountRegisterGameResponse.cs b/Fuyu.Backend.Core/Models/Response/AccountRegisterGameResponse.cs
@@ -7,9 +7,9 @@ namespace Fuyu.Backend.Core.Models.Responses
     public class AccountRegisterGameResponse
     {
         [DataMember]
-        public ERegisterStatus Status;
+        public ERegisterStatus Status { get; set; }
 
         [DataMember]
-        public int AccountId;
+        public int AccountId { get; set; }
     }
 }
diff --git a/Fuyu.Backend.Core/Models/Response/AccountRegisterResponse.cs b/Fuyu.Backend.Core/Models/Response/AccountRegisterResponse.cs
@@ -7,6 +7,6 @@ namespace Fuyu.Backend.Core.Models.Responses
     public class AccountRegisterResponse
     {
         [DataMember]
-        public ERegisterStatus Status;
-    }
+        public ERegisterStatus Status { get; set; }
+	}
 }