Merge branch '4.0.0-DEV' into json-validation-module

sp-tarkov · Jan 9, 2025 · 4b04b5d · 4b04b5d
2 parents 56c13e9 + ae7fddb
commit 4b04b5d
Show file tree

Hide file tree

Showing 13 changed files with 607 additions and 501 deletions.
diff --git a/project/src/callbacks/PrestigeCallbacks.ts b/project/src/callbacks/PrestigeCallbacks.ts
@@ -22,7 +22,7 @@ export class PrestigeCallbacks {
     }
 
     /** Handle client/prestige/obtain */
-    public obtainPrestige(url: string, info: IObtainPrestigeRequest, sessionID: string): INullResponseData {
+    public obtainPrestige(url: string, info: IObtainPrestigeRequest[], sessionID: string): INullResponseData {
         this.prestigeController.obtainPrestige(sessionID, info);
 
         return this.httpResponse.nullResponse();

diff --git a/project/src/controllers/PrestigeController.ts b/project/src/controllers/PrestigeController.ts
@@ -1,14 +1,23 @@
 import { PlayerScavGenerator } from "@spt/generators/PlayerScavGenerator";
 import { DialogueHelper } from "@spt/helpers/DialogueHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
 import type { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { QuestHelper } from "@spt/helpers/QuestHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { CustomisationSource } from "@spt/models/eft/common/tables/ICustomisationStorage";
 import { IPrestige } from "@spt/models/eft/common/tables/IPrestige";
+import { IQuestReward } from "@spt/models/eft/common/tables/IQuest";
+import { IAddItemDirectRequest } from "@spt/models/eft/inventory/IAddItemDirectRequest";
+import { IAddItemsDirectRequest } from "@spt/models/eft/inventory/IAddItemsDirectRequest";
 import { IObtainPrestigeRequest } from "@spt/models/eft/prestige/IObtainPrestigeRequest";
+import { IProfileCreateRequestData } from "@spt/models/eft/profile/IProfileCreateRequestData";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { SkillTypes } from "@spt/models/enums/SkillTypes";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { SaveServer } from "@spt/servers/SaveServer";
+import { CreateProfileService } from "@spt/services/CreateProfileService";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { MailSendService } from "@spt/services/MailSendService";
@@ -32,12 +41,14 @@ export class PrestigeController {
         @inject("ItemHelper") protected itemHelper: ItemHelper,
         @inject("ProfileFixerService") protected profileFixerService: ProfileFixerService,
         @inject("LocalisationService") protected localisationService: LocalisationService,
+        @inject("CreateProfileService") protected createProfileService: CreateProfileService,
         @inject("SeasonalEventService") protected seasonalEventService: SeasonalEventService,
         @inject("MailSendService") protected mailSendService: MailSendService,
         @inject("PlayerScavGenerator") protected playerScavGenerator: PlayerScavGenerator,
         @inject("EventOutputHolder") protected eventOutputHolder: EventOutputHolder,
         @inject("TraderHelper") protected traderHelper: TraderHelper,
         @inject("DialogueHelper") protected dialogueHelper: DialogueHelper,
+        @inject("InventoryHelper") protected inventoryHelper: InventoryHelper,
         @inject("QuestHelper") protected questHelper: QuestHelper,
         @inject("ProfileHelper") protected profileHelper: ProfileHelper,
     ) {}
@@ -52,12 +63,125 @@ export class PrestigeController {
     /**
      * Handle /client/prestige/obtain
      */
-    public obtainPrestige(sessionID: string, request: IObtainPrestigeRequest): void {
+    public obtainPrestige(sessionId: string, request: IObtainPrestigeRequest[]): void {
         // TODO
-        // Reset profile back to default from template
-        // Take items passed in from request and add to inventory
-        // Set prestige level in profile
+        // DONE Reset profile back to default from template
+        // DONE Set prestige level in profile
+        // DONE Copy skills
+        // DONE Take items passed in from request and add to inventory
         // Update dogtags to prestige type
-        // Iterate over prestige.json rewards and add to profile
+        // DONE Iterate over prestige.json rewards and add to profile
+        // DONE add achievement
+
+        const prePrestigeProfileClone = this.cloner.clone(this.profileHelper.getFullProfile(sessionId));
+        const prePrestigePmc = prePrestigeProfileClone.characters.pmc;
+        const createRequest: IProfileCreateRequestData = {
+            side: prePrestigePmc.Info.Side,
+            nickname: prePrestigePmc.Info.Nickname,
+            headId: prePrestigePmc.Customization.Head,
+            voiceId: Object.values(this.databaseService.getTemplates().customization).find(
+                (customisation) => customisation._name === prePrestigePmc.Info.Voice,
+            )._id,
+            sptForcePrestigeLevel: prePrestigeProfileClone.characters.pmc.Info.PrestigeLevel + 1, // Current + 1
+        };
+
+        // Reset profile
+        this.createProfileService.createProfile(sessionId, createRequest);
+
+        // Get freshly reset profile ready for editing
+        const newProfile = this.profileHelper.getFullProfile(sessionId);
+
+        // Skill copy
+        const commonSKillsToCopy = prePrestigePmc.Skills.Common;
+        for (const skillToCopy of commonSKillsToCopy) {
+            // Set progress to max level 20
+            skillToCopy.Progress = Math.min(skillToCopy.Progress, 2000);
+            const existingSkill = newProfile.characters.pmc.Skills.Common.find((skill) => skill.Id === skillToCopy.Id);
+            if (existingSkill) {
+                existingSkill.Progress = skillToCopy.Progress;
+            } else {
+                newProfile.characters.pmc.Skills.Common.push(skillToCopy);
+            }
+        }
+
+        const masteringSkillsToCopy = prePrestigePmc.Skills.Mastering;
+        for (const skillToCopy of masteringSkillsToCopy) {
+            // Set progress to max level 20
+            skillToCopy.Progress = Math.min(skillToCopy.Progress, 2000);
+            const existingSkill = newProfile.characters.pmc.Skills.Mastering.find(
+                (skill) => skill.Id === skillToCopy.Id,
+            );
+            if (existingSkill) {
+                existingSkill.Progress = skillToCopy.Progress;
+            } else {
+                newProfile.characters.pmc.Skills.Mastering.push(skillToCopy);
+            }
+        }
+
+        const indexToGet = Math.min(createRequest.sptForcePrestigeLevel - 1, 1); // Index starts at 0
+        const rewards = this.databaseService.getTemplates().prestige.elements[indexToGet].rewards;
+        this.addPrestigeRewardsToProfile(sessionId, newProfile, rewards);
+
+        // Copy transferred items
+        for (const transferRequest of request) {
+            const item = prePrestigePmc.Inventory.items.find((item) => item._id === transferRequest.id);
+            const addItemRequest: IAddItemDirectRequest = {
+                itemWithModsToAdd: [item],
+                foundInRaid: item.upd?.SpawnedInSession,
+                useSortingTable: false,
+                callback: null,
+            };
+            this.inventoryHelper.addItemToStash(
+                sessionId,
+                addItemRequest,
+                newProfile.characters.pmc,
+                this.eventOutputHolder.getOutput(sessionId),
+            );
+        }
+
+        // Add "Prestigious" achievement
+        if (!newProfile.achievements["676091c0f457869a94017a23"]) {
+            newProfile.achievements["676091c0f457869a94017a23"] = this.timeUtil.getTimestamp();
+        }
+    }
+
+    protected addPrestigeRewardsToProfile(sessionId: string, newProfile: ISptProfile, rewards: IQuestReward[]) {
+        for (const reward of rewards) {
+            switch (reward.type) {
+                case "CustomizationDirect": {
+                    this.profileHelper.addHideoutCustomisationUnlock(newProfile, reward, CustomisationSource.PRESTIGE);
+                    break;
+                }
+                case "Skill":
+                    this.profileHelper.addSkillPointsToPlayer(
+                        newProfile.characters.pmc,
+                        reward.target as SkillTypes,
+                        reward.value as number,
+                    );
+                    break;
+                case "Item": {
+                    const addItemRequest: IAddItemDirectRequest = {
+                        itemWithModsToAdd: reward.items,
+                        foundInRaid: reward.items[0]?.upd?.SpawnedInSession,
+                        useSortingTable: false,
+                        callback: null,
+                    };
+                    this.inventoryHelper.addItemToStash(
+                        sessionId,
+                        addItemRequest,
+                        newProfile.characters.pmc,
+                        this.eventOutputHolder.getOutput(sessionId),
+                    );
+                    break;
+                }
+                // case "ExtraDailyQuest": {
+                //     // todo
+                //     break;
+                // }
+                default:
+                    this.logger.error(`Unhandled prestige reward type: ${reward.type}`);
+                    break;
+            }
+        }
     }
 }