470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup of daily reward code doing the same item check multiple times

Browse Source
This commit is contained in:
Dev 2023-10-15 10:28:52 +01:00
parent 870f9a5092
commit cd74f05558
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
project/src/generators/RepeatableQuestGenerator.ts
View File

@ -736,34 +736,23 @@ export class RepeatableQuestGenerator
// first filter for type and baseclass to avoid lookup in handbook for non-available items // first filter for type and baseclass to avoid lookup in handbook for non-available items
const rewardableItems = this.getRewardableItems(repeatableConfig); const rewardableItems = this.getRewardableItems(repeatableConfig);
// blacklist
// rome-ignore lint/complexity/useSimplifiedLogicExpression: <explanation>
let itemSelection = rewardableItems.filter(x => !this.itemHelper.isOfBaseclass(x[0], BaseClasses.DOG_TAG_USEC)
&& !this.itemHelper.isOfBaseclass(x[0], BaseClasses.DOG_TAG_BEAR)
&& !this.itemHelper.isOfBaseclass(x[0], BaseClasses.MOUNT)
);
const minPrice = Math.min(25000, 0.5 * roublesBudget); const minPrice = Math.min(25000, 0.5 * roublesBudget);
itemSelection = itemSelection.filter(x => this.itemHelper.getItemPrice(x[0]) < roublesBudget && this.itemHelper.getItemPrice(x[0]) > minPrice); let itemSelection = rewardableItems.filter(x => this.itemHelper.getItemPrice(x[0]) < roublesBudget && this.itemHelper.getItemPrice(x[0]) > minPrice);
if (itemSelection.length === 0) if (itemSelection.length === 0)
{ {
this.logger.warning(this.localisationService.getText("repeatable-no_reward_item_found_in_price_range", {minPrice: minPrice, roublesBudget: roublesBudget})); this.logger.warning(this.localisationService.getText("repeatable-no_reward_item_found_in_price_range", {minPrice: minPrice, roublesBudget: roublesBudget}));
// in case we don't find any items in the price range // In case we don't find any items in the price range
// rome-ignore lint/complexity/useSimplifiedLogicExpression: <explanation> itemSelection = rewardableItems.filter(x => this.itemHelper.getItemPrice(x[0]) < roublesBudget
itemSelection = rewardableItems.filter(x => !this.itemHelper.isOfBaseclass(x[0], BaseClasses.DOG_TAG_USEC)
&& !this.itemHelper.isOfBaseclass(x[0], BaseClasses.DOG_TAG_BEAR)
&& !this.itemHelper.isOfBaseclass(x[0], BaseClasses.MOUNT)
&& this.itemHelper.getItemPrice(x[0]) < roublesBudget
); );
} }
const rewards: IRewards = { const rewards: IRewards = {
Started: [], Started: [],
Success: [ Success: [
{ {
"value": rewardXP, value: rewardXP,
"type": "Experience", type: "Experience",
"index": 0 index: 0
} }
], ],
Fail: [] Fail: []
@ -936,10 +925,14 @@ export class RepeatableQuestGenerator
} }
} }
if (this.itemHelper.isOfBaseclasses(tpl, [BaseClasses.DOG_TAG_USEC, BaseClasses.DOG_TAG_BEAR, BaseClasses.MOUNT, BaseClasses.KEY, BaseClasses.ARMBAND]))
{
return false;
}
// Skip globally blacklisted items + boss items
// rome-ignore lint/complexity/useSimplifiedLogicExpression: <explanation> // rome-ignore lint/complexity/useSimplifiedLogicExpression: <explanation>
valid = !this.itemHelper.isOfBaseclass(tpl, BaseClasses.KEY) valid = !this.itemFilterService.isItemBlacklisted(tpl)
&& !this.itemHelper.isOfBaseclass(tpl, BaseClasses.ARMBAND)
&& !this.itemFilterService.isItemBlacklisted(tpl)
&& !this.itemFilterService.isBossItem(tpl); && !this.itemFilterService.isBossItem(tpl);
return valid; return valid;