spt/server
spt/server
0
0
Fork 0
mirror of https://github.com/sp-tarkov/server.git synced 2025-02-13 09:50:43 -05:00
Code

Correct mistake in sending repeatable data to client on quest accept

Browse Source
This commit is contained in:
Dev 2023-10-19 20:43:42 +01:00
parent d97beda4b7
commit 79dc3cca1b
3 changed files with 521 additions and 519 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1025
project/assets/database/templates/repeatableQuests.json
View File

File diff suppressed because it is too large Load Diff

14
project/src/controllers/QuestController.ts
View File

@ -10,7 +10,7 @@ import { IPmcData } from "@spt-aki/models/eft/common/IPmcData";
import { IQuestStatus } from "@spt-aki/models/eft/common/tables/IBotBase"; import { IQuestStatus } from "@spt-aki/models/eft/common/tables/IBotBase";
import { Item } from "@spt-aki/models/eft/common/tables/IItem"; import { Item } from "@spt-aki/models/eft/common/tables/IItem";
import { AvailableForConditions, IQuest, Reward } from "@spt-aki/models/eft/common/tables/IQuest"; import { AvailableForConditions, IQuest, Reward } from "@spt-aki/models/eft/common/tables/IQuest";
import { IRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests";
import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse"; import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse";
import { IAcceptQuestRequestData } from "@spt-aki/models/eft/quests/IAcceptQuestRequestData"; import { IAcceptQuestRequestData } from "@spt-aki/models/eft/quests/IAcceptQuestRequestData";
import { ICompleteQuestRequestData } from "@spt-aki/models/eft/quests/ICompleteQuestRequestData"; import { ICompleteQuestRequestData } from "@spt-aki/models/eft/quests/ICompleteQuestRequestData";
@ -373,7 +373,6 @@ export class QuestController
} }
const questRewards = this.questHelper.getQuestRewardItems(<IQuest><unknown>repeatableQuestProfile, desiredQuestState); const questRewards = this.questHelper.getQuestRewardItems(<IQuest><unknown>repeatableQuestProfile, desiredQuestState);
this.mailSendService.sendLocalisedNpcMessageToPlayer( this.mailSendService.sendLocalisedNpcMessageToPlayer(
sessionID, sessionID,
this.traderHelper.getTraderById(repeatableQuestProfile.traderId), this.traderHelper.getTraderById(repeatableQuestProfile.traderId),
@ -382,7 +381,15 @@ export class QuestController
questRewards, questRewards,
this.timeUtil.getHoursAsSeconds(this.questConfig.redeemTime)); this.timeUtil.getHoursAsSeconds(this.questConfig.redeemTime));
acceptQuestResponse.profileChanges[sessionID].quests = this.questHelper.getNewlyAccessibleQuestsWhenStartingQuest(acceptedQuest.qid, sessionID); const repeatableSettings = pmcData.RepeatableQuests.find(x => x.name === repeatableQuestProfile.sptRepatableGroupName);
const responseData: IPmcDataRepeatableQuest = {
activeQuests: [repeatableQuestProfile],
name: repeatableSettings.name,
inactiveQuests: [],
endTime: repeatableSettings.endTime,
changeRequirement: repeatableSettings.changeRequirement
};
acceptQuestResponse.profileChanges[sessionID].repeatableQuests = [responseData];
return acceptQuestResponse; return acceptQuestResponse;
} }
@ -401,6 +408,7 @@ export class QuestController
if (matchingQuest) if (matchingQuest)
{ {
this.logger.debug(`Accepted repeatable quest ${acceptedQuest.qid} from ${repeatableQuest.name}`); this.logger.debug(`Accepted repeatable quest ${acceptedQuest.qid} from ${repeatableQuest.name}`);
matchingQuest.sptRepatableGroupName = repeatableQuest.name;
return matchingQuest; return matchingQuest;
} }

1
project/src/models/eft/common/tables/IRepeatableQuests.ts
View File

@ -73,6 +73,7 @@ export interface IRepeatableQuest
templateId: string templateId: string
changeCost: IChangeCost[] changeCost: IChangeCost[]
changeStandingCost: number changeStandingCost: number
sptRepatableGroupName?: string;
} }
export interface IRewards export interface IRewards