diff --git a/src/lib/data/buyables/buyables.ts b/src/lib/data/buyables/buyables.ts index eff647fe62..47d6ff5652 100644 --- a/src/lib/data/buyables/buyables.ts +++ b/src/lib/data/buyables/buyables.ts @@ -593,7 +593,7 @@ const questBuyables: Buyable[] = [ name: 'Berserker helm', gpCost: 780_000, qpRequired: 60, - ironmanPrice: 78_000 + ironmanPrice: 98_000 }, { name: 'Archer helm', @@ -795,7 +795,7 @@ const Buyables: Buyable[] = [ { name: 'Bucket', gpCost: 30, - ironmanPrice: 5 + ironmanPrice: 10 }, { name: 'Cup of hot water', @@ -891,7 +891,7 @@ const Buyables: Buyable[] = [ { name: 'Steel pickaxe', gpCost: 2000, - ironmanPrice: 500 + ironmanPrice: 600 }, { name: 'Mithril pickaxe', @@ -961,7 +961,7 @@ const Buyables: Buyable[] = [ { name: 'Adamant halberd', gpCost: 100_000, - ironmanPrice: 9600, + ironmanPrice: 50_000, qpRequired: 150, skillsNeeded: soteSkillRequirements }, @@ -1116,7 +1116,7 @@ for (const cape of allTeamCapes) { Buyables.push({ name: cape.name, outputItems: new Bank().add(cape.id), - gpCost: 5000 + gpCost: 15_000 }); } diff --git a/tests/integration/commands/sacrifice.test.ts b/tests/integration/commands/sacrifice.test.ts index e31b93c1b4..8d722b100b 100644 --- a/tests/integration/commands/sacrifice.test.ts +++ b/tests/integration/commands/sacrifice.test.ts @@ -18,28 +18,28 @@ describe('Sacrifice Command', async () => { expect(result).toEqual( `${Emoji.Incinerator} **Your Sacrifice Stats** ${Emoji.Incinerator}\n\n` + `**Current Minion Icon:** ${Emoji.Minion}\n` + - '**Sacrificed Value:** 1,635 GP\n' + + '**Sacrificed Value:** 1,922 GP\n' + '**Unique Items Sacrificed:** 2 items' ); }); test('No items provided', async () => { const result = await user.runCommand(sacrificeCommand, { items: 'aaaa' }); - expect(result).toEqual('No items were provided.\nYour current sacrificed value is: 1,635 (1.64k)'); + expect(result).toEqual('No items were provided.\nYour current sacrificed value is: 1,922 (1.92k)'); }); test('Successful', async () => { await user.addItemsToBank({ items: new Bank().add('Trout').add('Coal', 10) }); const result = await user.runCommand(sacrificeCommand, { items: '1 trout, 10 coal' }); expect(result).toEqual( - 'You sacrificed 10x Coal, 1x Trout, with a value of 1,635gp (1.64k). Your total amount sacrificed is now: 3,270. ' + 'You sacrificed 10x Coal, 1x Trout, with a value of 1,922gp (1.92k). Your total amount sacrificed is now: 3,844. ' ); const stats = await user.fetchStats({ sacrificed_bank: true }); expect(user.bank.equals(new Bank())).toBe(true); expect(new Bank(stats.sacrificed_bank as ItemBank).equals(new Bank().add('Coal', 20).add('Trout', 2))).toBe( true ); - expect(user.user.sacrificedValue).toEqual(BigInt(3270)); + expect(user.user.sacrificedValue).toEqual(BigInt(3844)); const clientSettings = await mahojiClientSettingsFetch({ economyStats_sacrificedBank: true }); expect( new Bank(clientSettings.economyStats_sacrificedBank as ItemBank).equals( @@ -49,7 +49,7 @@ describe('Sacrifice Command', async () => { await user.addItemsToBank({ items: new Bank().add('Trout').add('Cake') }); const res = await user.runCommand(sacrificeCommand, { items: '1 trout, 1 cake' }); expect(res).toEqual( - 'You sacrificed 1x Trout, 1x Cake, with a value of 206gp (206). Your total amount sacrificed is now: 3,476. ' + 'You sacrificed 1x Trout, 1x Cake, with a value of 169gp (169). Your total amount sacrificed is now: 4,013. ' ); await user.sync(); expect(user.bank.equals(new Bank())).toBe(true); @@ -57,7 +57,7 @@ describe('Sacrifice Command', async () => { expect( new Bank(stats2.sacrificed_bank as ItemBank).equals(new Bank().add('Coal', 20).add('Trout', 3).add('Cake')) ).toBe(true); - expect(user.user.sacrificedValue).toEqual(BigInt(3476)); + expect(user.user.sacrificedValue).toEqual(BigInt(4013)); const clientSettings2 = await mahojiClientSettingsFetch({ economyStats_sacrificedBank: true }); expect( diff --git a/tests/unit/snapshots/banksnapshots.test.ts.snap b/tests/unit/snapshots/banksnapshots.test.ts.snap index 4452333099..78042c047f 100644 --- a/tests/unit/snapshots/banksnapshots.test.ts.snap +++ b/tests/unit/snapshots/banksnapshots.test.ts.snap @@ -123,7 +123,7 @@ exports[`OSB Buyables 1`] = ` }, { "gpCost": 30, - "ironmanPrice": 5, + "ironmanPrice": 10, "itemCost": Bank { "bank": {}, "frozen": false, @@ -323,7 +323,7 @@ exports[`OSB Buyables 1`] = ` }, { "gpCost": 2000, - "ironmanPrice": 500, + "ironmanPrice": 600, "itemCost": Bank { "bank": {}, "frozen": false, @@ -563,7 +563,7 @@ exports[`OSB Buyables 1`] = ` }, { "gpCost": 100000, - "ironmanPrice": 9600, + "ironmanPrice": 50000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -1707,7 +1707,7 @@ exports[`OSB Buyables 1`] = ` }, { "gpCost": 780000, - "ironmanPrice": 78000, + "ironmanPrice": 98000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6275,7 +6275,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6289,7 +6289,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6303,7 +6303,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6317,7 +6317,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6331,7 +6331,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6345,7 +6345,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6359,7 +6359,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6373,7 +6373,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6387,7 +6387,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6401,7 +6401,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6415,7 +6415,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6429,7 +6429,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6443,7 +6443,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6457,7 +6457,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6471,7 +6471,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6485,7 +6485,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6499,7 +6499,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6513,7 +6513,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6527,7 +6527,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6541,7 +6541,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6555,7 +6555,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6569,7 +6569,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6583,7 +6583,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6597,7 +6597,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6611,7 +6611,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6625,7 +6625,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6639,7 +6639,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6653,7 +6653,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6667,7 +6667,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6681,7 +6681,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6695,7 +6695,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6709,7 +6709,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6723,7 +6723,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6737,7 +6737,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6751,7 +6751,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6765,7 +6765,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6779,7 +6779,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6793,7 +6793,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6807,7 +6807,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6821,7 +6821,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6835,7 +6835,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6849,7 +6849,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6863,7 +6863,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6877,7 +6877,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6891,7 +6891,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6905,7 +6905,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6919,7 +6919,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6933,7 +6933,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6947,7 +6947,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, @@ -6961,7 +6961,7 @@ exports[`OSB Buyables 1`] = ` }, }, { - "gpCost": 5000, + "gpCost": 15000, "itemCost": Bank { "bank": {}, "frozen": false, diff --git a/tests/unit/snapshots/clsnapshots.test.ts.snap b/tests/unit/snapshots/clsnapshots.test.ts.snap index 9da493f6c6..b14c1690eb 100644 --- a/tests/unit/snapshots/clsnapshots.test.ts.snap +++ b/tests/unit/snapshots/clsnapshots.test.ts.snap @@ -106,7 +106,7 @@ TzHaar (10) Vardorvis (10) Venenatis and Spindel (6) Vet'ion and Calvar'ion (6) -Volcanic Mine (3) +Volcanic Mine (4) Vorkath (6) Wintertodt (10) Zalcano (4) @@ -595,6 +595,7 @@ Dragon limbs Dragon metal lump Dragon metal slice Dragon pickaxe +Dragon pickaxe (broken) Dragon pickaxe upgrade kit Dragon platebody ornament kit Dragon scimitar ornament kit @@ -1065,7 +1066,7 @@ Olmlet Onyx Orange boater Orange egg sac -Ore pack +Ore pack (Giant's Foundry) Ornate maul handle Osmumten's fang Pantaloons diff --git a/tests/unit/util.test.ts b/tests/unit/util.test.ts index 3ff7e45b4a..84faaba350 100644 --- a/tests/unit/util.test.ts +++ b/tests/unit/util.test.ts @@ -84,7 +84,7 @@ describe('util', () => { const { price } = item; let expected = reduceNumByPercent(price, 20); expect(sellPriceOfItem(item)).toEqual({ price: expected, basePrice: price }); - expect(sellPriceOfItem(getOSItem('A yellow square'))).toEqual({ price: 0, basePrice: 0 }); + expect(sellPriceOfItem(getOSItem('Yellow square'))).toEqual({ price: 0, basePrice: 0 }); }); test('sellStorePriceOfItem', () => { @@ -97,7 +97,7 @@ describe('util', () => { (((0.4 - 0.015 * Math.min(22 - 1, 10)) * Math.min(22, 11) + Math.max(22 - 11, 0) * 0.1) * cost) / 22; expect(sellStorePriceOfItem(item, 1)).toEqual({ price: expectedOneQty, basePrice: cost }); expect(sellStorePriceOfItem(item, 22)).toEqual({ price: expectedTwentytwoQty, basePrice: cost }); - expect(sellStorePriceOfItem(getOSItem('A yellow square'), 1)).toEqual({ price: 0, basePrice: 0 }); + expect(sellStorePriceOfItem(getOSItem('Yellow square'), 1)).toEqual({ price: 0, basePrice: 0 }); }); test('skillingPetRateFunction', () => {