chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix membercatergory, victim and aggressor

Browse Source
This commit is contained in:
KaenoDev
2025-01-26 13:40:50 +00:00
parent aa56a06911
commit 17e4d1468f
11 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Core/Generators/BotGenerator.cs
+3 -3
View File
@@ -748,7 +748,7 @@ public class BotGenerator(
if (botInfo.Nickname?.ToLower() == "nikita")
{
botInfo.GameVersion = GameEditions.UNHEARD;
botInfo.MemberCategory = MemberCategory.DEVELOPER;
botInfo.MemberCategory = MemberCategory.Developer;
return botInfo.GameVersion;
}
@@ -760,10 +760,10 @@ public class BotGenerator(
switch (botInfo.GameVersion)
{
case GameEditions.EDGE_OF_DARKNESS:
botInfo.MemberCategory = MemberCategory.UNIQUE_ID;
botInfo.MemberCategory = MemberCategory.UniqueId;
break;
case GameEditions.UNHEARD:
botInfo.MemberCategory = MemberCategory.UNHEARD;
botInfo.MemberCategory = MemberCategory.Unheard;
break;
default:
// Everyone else gets a weighted randomised category
Libraries/Core/Generators/PlayerScavGenerator.cs
+1 -1
View File
@@ -81,7 +81,7 @@ public class PlayerScavGenerator(
scavData.Info.Bans = [];
scavData.Info.RegistrationDate = pmcDataClone.Info.RegistrationDate;
scavData.Info.GameVersion = pmcDataClone.Info.GameVersion;
scavData.Info.MemberCategory = MemberCategory.UNIQUE_ID;
scavData.Info.MemberCategory = MemberCategory.UniqueId;
scavData.Info.LockedMoveCommands = true;
scavData.RagfairInfo = pmcDataClone.RagfairInfo;
scavData.UnlockedInfo = pmcDataClone.UnlockedInfo;
Libraries/Core/Generators/RagfairOfferGenerator.cs
+1 -1
View File
@@ -157,7 +157,7 @@ public class RagfairOfferGenerator(
if (isTrader) {
return new RagfairOfferUser(){
Id = userID,
MemberType = MemberCategory.TRADER
MemberType = MemberCategory.Trader
};
}
Libraries/Core/Helpers/Dialogue/CommandoDialogChatBot.cs
+2 -2
View File
@@ -28,8 +28,8 @@ public class CommandoDialogChatBot(
Info = new UserDialogDetails
{
Level = 1,
MemberCategory = MemberCategory.DEVELOPER,
SelectedMemberCategory = MemberCategory.DEVELOPER,
MemberCategory = MemberCategory.Developer,
SelectedMemberCategory = MemberCategory.Developer,
Nickname = "Commando",
Side = "Usec"
}
Libraries/Core/Helpers/Dialogue/SptDialogueChatBot.cs
+2 -2
View File
@@ -29,8 +29,8 @@ public class SptDialogueChatBot(
Info = new UserDialogDetails
{
Level = 1,
MemberCategory = MemberCategory.DEVELOPER,
SelectedMemberCategory = MemberCategory.DEVELOPER,
MemberCategory = MemberCategory.Developer,
SelectedMemberCategory = MemberCategory.Developer,
Nickname = _coreConfig.SptFriendNickname,
Side = "Usec"
}
Libraries/Core/Helpers/RagfairOfferHelper.cs
+1 -1
View File
@@ -998,6 +998,6 @@ public class RagfairOfferHelper(
/// <returns>True = from trader</returns>
public bool OfferIsFromTrader(RagfairOffer offer)
{
return offer.User.MemberType == MemberCategory.TRADER;
return offer.User.MemberType == MemberCategory.Trader;
}
}
Libraries/Core/Models/Eft/Common/Tables/BotBase.cs
+16
View File
@@ -415,6 +415,14 @@ public record Victim
public string? ColliderType { get; set; }
public string? Role { get; set; }
public string? Location { get; set; }
[JsonPropertyName("GInterface186.ProfileId")]
public string? UnusedProfileId { get; set; }
[JsonPropertyName("GInterface186.Nickname")]
public string? UnusedName { get; set; }
[JsonPropertyName("GInterface186.Side")]
public string? UnusedSide { get; set; }
[JsonPropertyName("GInterface186.PrestigeLevel")]
public int? UnusedPrestige { get; set; }
}
public record SessionCounters
@@ -451,6 +459,14 @@ public record Aggressor
public string? Category { get; set; }
public string? ColliderType { get; set; }
public string? Role { get; set; }
[JsonPropertyName("GInterface186.ProfileId")]
public string? UnusedProfileId { get; set; }
[JsonPropertyName("GInterface186.Nickname")]
public string? UnusedName { get; set; }
[JsonPropertyName("GInterface186.Side")]
public string? UnusedSide { get; set; }
[JsonPropertyName("GInterface186.PrestigeLevel")]
public int? UnusedPrestige { get; set; }
}
public record DamageHistory
Libraries/Core/Models/Eft/Common/Tables/Item.cs
+3
View File
@@ -182,6 +182,9 @@ public record UpdFaceShield
{
[JsonPropertyName("Hits")]
public int? Hits { get; set; }
[JsonPropertyName("HitSeed")]
public int? HitSeed { get; set; }
}
public record UpdRepairable
Libraries/Core/Models/Enums/MemberCategory.cs
+11 -11
View File
@@ -3,15 +3,15 @@
public enum MemberCategory
{
Default = 0,
DEVELOPER = 1,
UNIQUE_ID = 2,
TRADER = 4,
GROUP = 8,
SYSTEM = 16,
CHAT_MODERATOR = 32,
CHAT_MODERATOR_WITH_PERMANENT_BAN = 64,
UNIT_TEST = 128,
SHERPA = 256,
EMISSARY = 512,
UNHEARD = 1024
Developer = 1,
UniqueId = 2,
Trader = 4,
Group = 8,
System = 16,
ChatModerator = 32,
ChatModeratorWithPermanentBan = 64,
UnitTest = 128,
Sherpa = 256,
Emissary = 512,
Unheard = 1024
}
Libraries/Core/Services/PmcChatResponseService.cs
+3 -3
View File
@@ -287,15 +287,15 @@ public class PmcChatResponseService(
protected UserDialogInfo GetVictimDetails(Victim pmcVictim)
{
var categories = new List<MemberCategory>{
MemberCategory.UNIQUE_ID,
MemberCategory.UniqueId,
MemberCategory.Default,
MemberCategory.Default,
MemberCategory.Default,
MemberCategory.Default,
MemberCategory.Default,
MemberCategory.Default,
MemberCategory.SHERPA,
MemberCategory.DEVELOPER
MemberCategory.Sherpa,
MemberCategory.Developer
};
var chosenCategory = _randomUtil.GetArrayValue(categories);
Libraries/Core/Services/RagfairCategoriesService.cs
+1 -1
View File
@@ -30,7 +30,7 @@ public class RagfairCategoriesService(
.Where(
offer =>
{
var isTraderOffer = offer.User.MemberType == MemberCategory.TRADER;
var isTraderOffer = offer.User.MemberType == MemberCategory.Trader;
// Not level 15 and offer is from player, skip
if (!fleaUnlocked || !isTraderOffer)