Merge remote-tracking branch 'origin/310-dev'

This commit is contained in:
Refringe 2024-07-23 11:03:32 -04:00
commit 7c76342ee2
No known key found for this signature in database
4 changed files with 18 additions and 11 deletions

View File

@ -2667,7 +2667,7 @@
"localeTextId": "5a2d28f786f77436023be4a5 0", "localeTextId": "5a2d28f786f77436023be4a5 0",
"collectionTimeHours": 72, "collectionTimeHours": 72,
"associatedEvent": "Promo", "associatedEvent": "Promo",
"maxToSendPlayer": 1 "maxToSendPlayer": 50
}, },
"TWITCHNEWYEARS2023": { "TWITCHNEWYEARS2023": {
"items": [ "items": [

View File

@ -33,7 +33,17 @@
"formatter": { "formatter": {
"enabled": true, "enabled": true,
"formatWithErrors": false, "formatWithErrors": false,
"ignore": [], "ignore": [
"**/.git",
"**/.pkg-cache",
"**/.vscode",
"**/build",
"**/node_modules",
"**/types",
"**/tests/__cache__",
"**/tests/__coverage__",
"**/.editorconfig"
],
"attributePosition": "auto", "attributePosition": "auto",
"indentStyle": "space", "indentStyle": "space",
"indentWidth": 4, "indentWidth": 4,

View File

@ -152,15 +152,6 @@ export class GameController
return; return;
} }
if (fullProfile.characters.pmc.RagfairInfo)
{
if (Number.isNaN(fullProfile.characters.pmc.RagfairInfo.rating))
{
this.logger.warning(`Profile: ${sessionID} ragfair rating was not a valid number, resetting to 0`);
fullProfile.characters.pmc.RagfairInfo.rating = 0;
}
}
if (Array.isArray(fullProfile.characters.pmc.WishList)) if (Array.isArray(fullProfile.characters.pmc.WishList))
{ {
fullProfile.characters.pmc.WishList = {}; fullProfile.characters.pmc.WishList = {};

View File

@ -215,6 +215,12 @@ export class QuestController
*/ */
protected playerLevelFulfillsQuestRequirement(quest: IQuest, playerLevel: number): boolean protected playerLevelFulfillsQuestRequirement(quest: IQuest, playerLevel: number): boolean
{ {
if (!quest.conditions)
{
// No conditions
return true;
}
const levelConditions = this.questConditionHelper.getLevelConditions(quest.conditions.AvailableForStart); const levelConditions = this.questConditionHelper.getLevelConditions(quest.conditions.AvailableForStart);
if (levelConditions.length) if (levelConditions.length)
{ {