From 93b50f2d4dbc59d34359597c9030bed428090c1b Mon Sep 17 00:00:00 2001 From: Chomp Date: Mon, 13 Jan 2025 18:48:00 +0000 Subject: [PATCH] Updated `_botGenerator.GeneratePlayerScav` to return a `PmcData` --- Core/Generators/BotGenerator.cs | 36 ++++++++++++++++++++++++-- Core/Generators/PlayerScavGenerator.cs | 2 +- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Core/Generators/BotGenerator.cs b/Core/Generators/BotGenerator.cs index 53f5b3fe..580500a9 100644 --- a/Core/Generators/BotGenerator.cs +++ b/Core/Generators/BotGenerator.cs @@ -42,7 +42,7 @@ public class BotGenerator /// base bot template to use (e.g. assault/pmcbot) /// profile of player generating pscav /// BotBase - public BotBase GeneratePlayerScav(string sessionId, string role, string difficulty, BotType botTemplate, PmcData profile) + public PmcData GeneratePlayerScav(string sessionId, string role, string difficulty, BotType botTemplate, PmcData profile) { var bot = GetCloneOfBotBase(); bot.Info.Settings.BotDifficulty = difficulty; @@ -65,7 +65,39 @@ public class BotGenerator // Sets the name after scav name shown in parentheses bot.Info.MainProfileNickname = profile.Info.Nickname; - return bot; + return new PmcData + { + Id = bot.Id, + Aid = bot.Aid, + SessionId = bot.SessionId, + Savage = bot.Savage, + KarmaValue = bot.KarmaValue, + Info = bot.Info, + Customization = bot.Customization, + Health = bot.Health, + Inventory = bot.Inventory, + Skills = bot.Skills, + Stats = bot.Stats, + Encyclopedia = bot.Encyclopedia, + TaskConditionCounters = bot.TaskConditionCounters, + InsuredItems = bot.InsuredItems, + Hideout = bot.Hideout, + Quests = bot.Quests, + TradersInfo = bot.TradersInfo, + UnlockedInfo = bot.UnlockedInfo, + RagfairInfo = bot.RagfairInfo, + Achievements = bot.Achievements, + RepeatableQuests = bot.RepeatableQuests, + Bonuses = bot.Bonuses, + Notes = bot.Notes, + CarExtractCounts = bot.CarExtractCounts, + CoopExtractCounts = bot.CoopExtractCounts, + SurvivorClass = bot.SurvivorClass, + WishList = bot.WishList, + MoneyTransferLimitData = bot.MoneyTransferLimitData, + IsPmc = bot.IsPmc, + Prestige = new Prestige() + }; } /// diff --git a/Core/Generators/PlayerScavGenerator.cs b/Core/Generators/PlayerScavGenerator.cs index 45d4e396..0d4e8a58 100644 --- a/Core/Generators/PlayerScavGenerator.cs +++ b/Core/Generators/PlayerScavGenerator.cs @@ -100,7 +100,7 @@ public class PlayerScavGenerator var baseBotNode = ConstructBotBaseTemplate(playerScavKarmaSettings.BotTypeForLoot); AdjustBotTemplateWithKarmaSpecificSettings(playerScavKarmaSettings, baseBotNode); - var scavData = (PmcData)_botGenerator.GeneratePlayerScav( + var scavData = _botGenerator.GeneratePlayerScav( sessionID, playerScavKarmaSettings.BotTypeForLoot.ToLower(), "easy",