Merge branch '3.11.0-dev' into feat-botgen-refactor

sp-tarkov · Feb 17, 2025 · 206b922 · 206b922
2 parents 2c0bd0f + ca4810c
commit 206b922
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/project/src/controllers/HideoutController.ts b/project/src/controllers/HideoutController.ts
@@ -428,7 +428,7 @@ export class HideoutController {
      * Handle HideoutPutItemsInAreaSlots
      * Create item in hideout slot item array, remove item from player inventory
      * @param pmcData Profile data
-     * @param addItemToHideoutRequest reqeust from client to place item in area slot
+     * @param addItemToHideoutRequest request from client to place item in area slot
      * @param sessionID Session id
      * @returns IItemEventRouterResponse object
      */

diff --git a/project/src/controllers/InventoryController.ts b/project/src/controllers/InventoryController.ts
@@ -522,7 +522,7 @@ export class InventoryController {
      * Bind an inventory item to the quick access menu at bottom of player screen
      * Handle bind event
      * @param pmcData Player profile
-     * @param bindRequest Reqeust object
+     * @param bindRequest Request object
      * @param sessionID Session id
      * @returns IItemEventRouterResponse
      */

diff --git a/project/src/controllers/ProfileController.ts b/project/src/controllers/ProfileController.ts
@@ -97,7 +97,7 @@ export class ProfileController {
 
     /**
      * Handle client/game/profile/create
-     * @param info Client reqeust object
+     * @param info Client request object
      * @param sessionID Player id
      * @returns Profiles _id value
      */

diff --git a/project/src/controllers/QuestController.ts b/project/src/controllers/QuestController.ts
@@ -158,7 +158,7 @@ export class QuestController {
         for (const condition of questConditions) {
             if (pmcData.TaskConditionCounters[condition.id]) {
                 this.logger.error(
-                    `Unable to add new task condition counter: ${condition.conditionType} for qeust: ${questId} to profile: ${pmcData.sessionId} as it already exists:`,
+                    `Unable to add new task condition counter: ${condition.conditionType} for quest: ${questId} to profile: ${pmcData.sessionId} as it already exists:`,
                 );
             }
 
@@ -476,7 +476,7 @@ export class QuestController {
     /**
      * Handle /client/game/profile/items/moving - QuestFail
      * @param pmcData Pmc profile
-     * @param request Fail qeust request
+     * @param request Fail quest request
      * @param sessionID Session id
      * @returns IItemEventRouterResponse
      */

diff --git a/project/src/services/SeasonalEventService.ts b/project/src/services/SeasonalEventService.ts
@@ -86,6 +86,7 @@ export class SeasonalEventService {
             ItemTpl.FACECOVER_GRINCH_MASK,
             ItemTpl.FACECOVER_HARE_MASK,
             ItemTpl.FACECOVER_AYBOLIT_MASK,
+            ItemTpl.BARTER_SPECIAL_40DEGREE_FUEL
         ];
     }