Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update backend.core models to use properties #113

Merged
merged 2 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Fuyu.Backend.BSG/ItemTemplates/AmmoItemProperties.cs
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,11 @@ public class AmmoItemProperties : StackableItemItemProperties

public enum EFlareEventType
{
Airdrop,
Light,
Airdrop,
ExitActivate,
AIFollowEvent,
Quest,
AIFollowEvent,
CallArtilleryOnMyself
}
}
1 change: 1 addition & 0 deletions Fuyu.Backend.BSG/ItemTemplates/VestItemProperties.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public enum EMaterialType
GlassVisor,
HelmetRicochet,
MetalNoDecal,
Snow,
None = 0
}

Expand Down
57 changes: 30 additions & 27 deletions Fuyu.Backend.BSG/Models/Hideout/EAreaType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
3 changes: 2 additions & 1 deletion Fuyu.Backend.BSG/Models/Profiles/Info/EMemberCategory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public enum EMemberCategory
ChatModeratorWithPermanentBan = 64,
UnitTest = 128,
Sherpa = 256,
Emissary = 512
Emissary = 512,
Unheard = 1024
}
}
4 changes: 2 additions & 2 deletions Fuyu.Backend.BSG/Models/Profiles/Info/EPlayerSide.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ namespace Fuyu.Backend.BSG.Models.Profiles.Info
{
public enum EPlayerSide
{
Usec,
Usec = 1,
Bear,
Savage
Savage = 4
}
}
3 changes: 2 additions & 1 deletion Fuyu.Backend.BSG/Models/Templates/EEquipmentBuildType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ namespace Fuyu.Backend.BSG.Models.Templates
public enum EEquipmentBuildType
{
Custom,
Standard
Standard,
Storage
}
}
10 changes: 5 additions & 5 deletions Fuyu.Backend.Core/Models/Accounts/Account.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
4 changes: 2 additions & 2 deletions Fuyu.Backend.Core/Models/Requests/AccountLoginRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
4 changes: 2 additions & 2 deletions Fuyu.Backend.Core/Models/Requests/AccountRegisterRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
2 changes: 1 addition & 1 deletion Fuyu.Backend.Core/Models/Response/AccountGamesResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
4 changes: 2 additions & 2 deletions Fuyu.Backend.Core/Models/Response/AccountLoginResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
4 changes: 2 additions & 2 deletions Fuyu.Backend.Core/Models/Response/AccountRegisterResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ namespace Fuyu.Backend.Core.Models.Responses
public class AccountRegisterResponse
{
[DataMember]
public ERegisterStatus Status;
}
public ERegisterStatus Status { get; set; }
}
}