From 17e4d1468f1056a5329ea89db9b94d6849300597 Mon Sep 17 00:00:00 2001
From: KaenoDev <193943350+KaenoDev@users.noreply.github.com>
Date: Sun, 26 Jan 2025 13:40:50 +0000
Subject: [PATCH] Fix membercatergory, victim and aggressor
---
Libraries/Core/Generators/BotGenerator.cs | 6 ++---
.../Core/Generators/PlayerScavGenerator.cs | 2 +-
.../Core/Generators/RagfairOfferGenerator.cs | 2 +-
.../Helpers/Dialogue/CommandoDialogChatBot.cs | 4 ++--
.../Helpers/Dialogue/SptDialogueChatBot.cs | 4 ++--
Libraries/Core/Helpers/RagfairOfferHelper.cs | 2 +-
.../Core/Models/Eft/Common/Tables/BotBase.cs | 16 ++++++++++++++
.../Core/Models/Eft/Common/Tables/Item.cs | 3 +++
Libraries/Core/Models/Enums/MemberCategory.cs | 22 +++++++++----------
.../Core/Services/PmcChatResponseService.cs | 6 ++---
.../Core/Services/RagfairCategoriesService.cs | 2 +-
11 files changed, 44 insertions(+), 25 deletions(-)
diff --git a/Libraries/Core/Generators/BotGenerator.cs b/Libraries/Core/Generators/BotGenerator.cs
index a54a006a..d773f119 100644
--- a/Libraries/Core/Generators/BotGenerator.cs
+++ b/Libraries/Core/Generators/BotGenerator.cs
@@ -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
diff --git a/Libraries/Core/Generators/PlayerScavGenerator.cs b/Libraries/Core/Generators/PlayerScavGenerator.cs
index 4affd3e6..d109a035 100644
--- a/Libraries/Core/Generators/PlayerScavGenerator.cs
+++ b/Libraries/Core/Generators/PlayerScavGenerator.cs
@@ -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;
diff --git a/Libraries/Core/Generators/RagfairOfferGenerator.cs b/Libraries/Core/Generators/RagfairOfferGenerator.cs
index 00ab6b28..7a8c7760 100644
--- a/Libraries/Core/Generators/RagfairOfferGenerator.cs
+++ b/Libraries/Core/Generators/RagfairOfferGenerator.cs
@@ -157,7 +157,7 @@ public class RagfairOfferGenerator(
if (isTrader) {
return new RagfairOfferUser(){
Id = userID,
- MemberType = MemberCategory.TRADER
+ MemberType = MemberCategory.Trader
};
}
diff --git a/Libraries/Core/Helpers/Dialogue/CommandoDialogChatBot.cs b/Libraries/Core/Helpers/Dialogue/CommandoDialogChatBot.cs
index 7d9e0128..067f192a 100644
--- a/Libraries/Core/Helpers/Dialogue/CommandoDialogChatBot.cs
+++ b/Libraries/Core/Helpers/Dialogue/CommandoDialogChatBot.cs
@@ -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"
}
diff --git a/Libraries/Core/Helpers/Dialogue/SptDialogueChatBot.cs b/Libraries/Core/Helpers/Dialogue/SptDialogueChatBot.cs
index 9c5c107e..04b01a8f 100644
--- a/Libraries/Core/Helpers/Dialogue/SptDialogueChatBot.cs
+++ b/Libraries/Core/Helpers/Dialogue/SptDialogueChatBot.cs
@@ -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"
}
diff --git a/Libraries/Core/Helpers/RagfairOfferHelper.cs b/Libraries/Core/Helpers/RagfairOfferHelper.cs
index 027aceef..75da865b 100644
--- a/Libraries/Core/Helpers/RagfairOfferHelper.cs
+++ b/Libraries/Core/Helpers/RagfairOfferHelper.cs
@@ -998,6 +998,6 @@ public class RagfairOfferHelper(
/// True = from trader
public bool OfferIsFromTrader(RagfairOffer offer)
{
- return offer.User.MemberType == MemberCategory.TRADER;
+ return offer.User.MemberType == MemberCategory.Trader;
}
}
diff --git a/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs
index f8659e0b..52323a16 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs
+++ b/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs
@@ -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
diff --git a/Libraries/Core/Models/Eft/Common/Tables/Item.cs b/Libraries/Core/Models/Eft/Common/Tables/Item.cs
index 1965f476..b7b934e4 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/Item.cs
+++ b/Libraries/Core/Models/Eft/Common/Tables/Item.cs
@@ -182,6 +182,9 @@ public record UpdFaceShield
{
[JsonPropertyName("Hits")]
public int? Hits { get; set; }
+
+ [JsonPropertyName("HitSeed")]
+ public int? HitSeed { get; set; }
}
public record UpdRepairable
diff --git a/Libraries/Core/Models/Enums/MemberCategory.cs b/Libraries/Core/Models/Enums/MemberCategory.cs
index 777c44b9..bbdf683c 100644
--- a/Libraries/Core/Models/Enums/MemberCategory.cs
+++ b/Libraries/Core/Models/Enums/MemberCategory.cs
@@ -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
}
diff --git a/Libraries/Core/Services/PmcChatResponseService.cs b/Libraries/Core/Services/PmcChatResponseService.cs
index d8ed9e54..bfcc9001 100644
--- a/Libraries/Core/Services/PmcChatResponseService.cs
+++ b/Libraries/Core/Services/PmcChatResponseService.cs
@@ -287,15 +287,15 @@ public class PmcChatResponseService(
protected UserDialogInfo GetVictimDetails(Victim pmcVictim)
{
var categories = new List{
- 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);
diff --git a/Libraries/Core/Services/RagfairCategoriesService.cs b/Libraries/Core/Services/RagfairCategoriesService.cs
index fddb988e..f7480a9f 100644
--- a/Libraries/Core/Services/RagfairCategoriesService.cs
+++ b/Libraries/Core/Services/RagfairCategoriesService.cs
@@ -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)