Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

return correct uncharged item when charges run out #5422

Merged
merged 4 commits into from
Nov 24, 2023
Merged

return correct uncharged item when charges run out #5422

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87108b9
return correct uncharged item when charges run out
nwjgit Oct 11, 2023
afac792
address problems and redo how bot finds variants
nwjgit Oct 11, 2023
c5cabd1
minor space adjustment
nwjgit Oct 11, 2023
b7c21ef
Merge branch 'master' into return-correct-chargeable-item
gc Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 58 additions & 24 deletions src/lib/degradeableItems.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
| 'trident_charges'
| 'scythe_of_vitur_charges';
itemsToRefundOnBreak: Bank;
refundVariants: {
variant: Item;
refund: Bank;
}[];
setup: GearSetupType;
aliases: string[];
chargeInput: {
Expand Down Expand Up @@ -58,23 +62,30 @@
{
item: getOSItem('Abyssal tentacle'),
settingsKey: 'tentacle_charges',
itemsToRefundOnBreak: new Bank().add('Kraken tentacle'),
itemsToRefundOnBreak: new Bank().add('Kraken tentacle').freeze(),
refundVariants: [],
setup: 'melee',
aliases: ['tentacle', 'tent'],
chargeInput: {
cost: new Bank().add('Abyssal whip'),
cost: new Bank().add('Abyssal whip').freeze(),
charges: 10_000
},
emoji: '<:Abyssal_tentacle:1068551359755989033>'
},
{
item: getOSItem('Sanguinesti staff'),
settingsKey: 'sang_charges',
itemsToRefundOnBreak: new Bank().add('Sanguinesti staff (uncharged)'),
itemsToRefundOnBreak: new Bank().add('Sanguinesti staff (uncharged)').freeze(),
refundVariants: [
{
variant: getOSItem('Holy sanguinesti staff'),
refund: new Bank().add('Holy sanguinesti staff (uncharged)').freeze()
}
],
setup: 'mage',
aliases: ['sang', 'sang staff', 'sanguinesti staff', 'sanguinesti'],
chargeInput: {
cost: new Bank().add('Blood rune', 3),
cost: new Bank().add('Blood rune', 3).freeze(),
charges: 1
},
unchargedItem: getOSItem('Sanguinesti staff (uncharged)'),
Expand All @@ -84,11 +95,12 @@
{
item: getOSItem('Celestial ring'),
settingsKey: 'celestial_ring_charges',
itemsToRefundOnBreak: new Bank().add('Celestial ring (uncharged)'),
itemsToRefundOnBreak: new Bank().add('Celestial ring (uncharged)').freeze(),
refundVariants: [],
setup: 'skilling',
aliases: ['celestial ring'],
chargeInput: {
cost: new Bank().add('Stardust', 10),
cost: new Bank().add('Stardust', 10).freeze(),
charges: 10
},
unchargedItem: getOSItem('Celestial ring (uncharged)'),
Expand All @@ -98,11 +110,12 @@
{
item: getOSItem('Ash sanctifier'),
settingsKey: 'ash_sanctifier_charges',
itemsToRefundOnBreak: new Bank().add('Ash sanctifier'),
itemsToRefundOnBreak: new Bank().add('Ash sanctifier').freeze(),
refundVariants: [],
setup: 'skilling',
aliases: ['ash sanctifier'],
chargeInput: {
cost: new Bank().add('Death rune', 1),
cost: new Bank().add('Death rune', 1).freeze(),
charges: 10
},
unchargedItem: getOSItem('Ash sanctifier'),
Expand All @@ -111,11 +124,12 @@
{
item: getOSItem('Serpentine helm'),
settingsKey: 'serp_helm_charges',
itemsToRefundOnBreak: new Bank().add('Serpentine helm (uncharged)'),
itemsToRefundOnBreak: new Bank().add('Serpentine helm (uncharged)').freeze(),
refundVariants: [],
setup: 'melee',
aliases: ['serp', 'serp helm', 'serpentine helm'],
chargeInput: {
cost: new Bank().add("Zulrah's scales"),
cost: new Bank().add("Zulrah's scales").freeze(),
charges: 1
},
unchargedItem: getOSItem('Serpentine helm (uncharged)'),
Expand All @@ -125,11 +139,12 @@
{
item: getOSItem('Amulet of blood fury'),
settingsKey: 'blood_fury_charges',
itemsToRefundOnBreak: new Bank().add('Amulet of fury'),
itemsToRefundOnBreak: new Bank().add('Amulet of fury').freeze(),
refundVariants: [],
setup: 'melee',
aliases: ['blood fury', 'amulet of blood fury'],
chargeInput: {
cost: new Bank().add('Blood shard'),
cost: new Bank().add('Blood shard').freeze(),
charges: 10_000
},
unchargedItem: getOSItem('Amulet of fury'),
Expand All @@ -139,11 +154,12 @@
{
item: getOSItem("Tumeken's shadow"),
settingsKey: 'tum_shadow_charges',
itemsToRefundOnBreak: new Bank().add("Tumeken's shadow (uncharged)"),
itemsToRefundOnBreak: new Bank().add("Tumeken's shadow (uncharged)").freeze(),
refundVariants: [],
setup: 'mage',
aliases: ['ts', 'tum shadow', 'tumekens shadow'],
chargeInput: {
cost: new Bank().add('Soul rune', 2).add('Chaos rune', 5),
cost: new Bank().add('Soul rune', 2).add('Chaos rune', 5).freeze(),
charges: 1
},
unchargedItem: getOSItem("Tumeken's shadow (uncharged)"),
Expand All @@ -153,23 +169,25 @@
{
item: getOSItem('Blood essence (active)'),
settingsKey: 'blood_essence_charges',
itemsToRefundOnBreak: new Bank(),
itemsToRefundOnBreak: new Bank().freeze(),
refundVariants: [],
setup: 'skilling',
aliases: ['blood essence'],
chargeInput: {
cost: new Bank().add('Blood essence'),
cost: new Bank().add('Blood essence').freeze(),
charges: 1000
},
emoji: ''
},
{
item: getOSItem('Trident of the swamp'),
settingsKey: 'trident_charges',
itemsToRefundOnBreak: new Bank().add('Uncharged toxic trident'),
itemsToRefundOnBreak: new Bank().add('Uncharged toxic trident').freeze(),
refundVariants: [],
setup: 'mage',
aliases: ['trident', 'trident of the swamp'],
chargeInput: {
cost: new Bank().add('Death rune').add('Chaos rune').add('Fire rune', 5).add("Zulrah's scales"),
cost: new Bank().add('Death rune').add('Chaos rune').add('Fire rune', 5).add("Zulrah's scales").freeze(),
charges: 1
},
unchargedItem: getOSItem('Uncharged toxic trident'),
Expand All @@ -179,11 +197,21 @@
{
item: getOSItem('Scythe of vitur'),
settingsKey: 'scythe_of_vitur_charges',
itemsToRefundOnBreak: new Bank().add('Scythe of vitur (uncharged)'),
itemsToRefundOnBreak: new Bank().add('Scythe of vitur (uncharged)').freeze(),
refundVariants: [
{
variant: getOSItem('Holy scythe of vitur'),
refund: new Bank().add('Holy scythe of vitur (uncharged)').freeze()
},
{
variant: getOSItem('Sanguine scythe of vitur'),
refund: new Bank().add('Sanguine scythe of vitur (uncharged)').freeze()
}
],
setup: 'melee',
aliases: ['scythe of vitur'],
chargeInput: {
cost: new Bank().add('Blood rune', 300).add('Vial of blood'),
cost: new Bank().add('Blood rune', 300).add('Vial of blood').freeze(),
charges: 100
},
unchargedItem: getOSItem('Scythe of vitur (uncharged)'),
Expand Down Expand Up @@ -282,22 +310,28 @@
});
const itemsDeleted = new Bank().add(item.id);

updateBankSetting('degraded_items_cost', itemsDeleted);

Check warning on line 313 in src/lib/degradeableItems.ts

View workflow job for this annotation

GitHub Actions / ESLint 

Promises must be awaited, end with a call to .catch, end with a call to .then with a rejection handler or be explicitly marked as ignored with the `void` operator

if (hasEquipped) {
// If its equipped, unequip and delete it.
// Get the users equipped item.
let refundItems = degItem.itemsToRefundOnBreak;
for (const variant of degItem.refundVariants) {
if (user.gear[degItem.setup].hasEquipped(variant.variant.id, false, false)) {
refundItems = variant.refund;
}
}
// Unequip and delete the users item.
const gear = { ...user.gear[degItem.setup].raw() };
gear[item.equipment!.slot] = null;
await user.update({
[`gear_${degItem.setup}`]: gear
});
if (degItem.itemsToRefundOnBreak) {
await user.addItemsToBank({ items: degItem.itemsToRefundOnBreak, collectionLog: false });
}
// Give the user the uncharged version of their charged item.
await user.addItemsToBank({ items: refundItems, collectionLog: false });
} else if (hasInBank) {
// If its in bank, just remove 1 from bank.
let itemsToAdd = undefined;
if (degItem.itemsToRefundOnBreak) {

Check warning on line 334 in src/lib/degradeableItems.ts

View workflow job for this annotation

GitHub Actions / ESLint 

Unexpected object value in conditional. The condition is always true
itemsToAdd = degItem.itemsToRefundOnBreak;
}
await user.transactItems({ itemsToRemove: new Bank().add(item.id, 1), itemsToAdd });
Expand Down