Merge remote-tracking branch 'origin/310-dev'
This commit is contained in:
commit
7c76342ee2
@ -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": [
|
||||||
|
@ -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,
|
||||||
|
@ -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 = {};
|
||||||
|
@ -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)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user