From 51d26cd13eb6cecf6c93844a3d047b9ea6de1a86 Mon Sep 17 00:00:00 2001 From: nwjgit Date: Thu, 22 Aug 2024 16:02:47 -0500 Subject: [PATCH 1/3] bones --- src/lib/data/creatables/bsoItems.ts | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/lib/data/creatables/bsoItems.ts b/src/lib/data/creatables/bsoItems.ts index 820439ba3d..075b84268a 100644 --- a/src/lib/data/creatables/bsoItems.ts +++ b/src/lib/data/creatables/bsoItems.ts @@ -1192,23 +1192,7 @@ const dragonBoneCreatables: Createable[] = [ } ]; -const divineWaterBones = [ - 'Bones', - 'Big bones', - 'Jogre bones', - 'Babydragon bones', - 'Dragon bones', - 'Wyrm bones', - 'Wyvern bones', - 'Drake bones', - 'Lava dragon bones', - 'Hydra bones', - 'Dagannoth bones', - 'Superior dragon bones', - 'Abyssal dragon bones', - 'Frost dragon bones', - 'Royal dragon bones' -]; +const divineWaterBones = bones.map(bone => bone.name); function divineWaterInputItems(user: MUser, preferredBone?: Bone) { const userBank = user.bank; From 21e055a8cfa08048af1e1ae77d980300c324d8ff Mon Sep 17 00:00:00 2001 From: nwjgit Date: Thu, 22 Aug 2024 21:54:08 -0500 Subject: [PATCH 2/3] unit tests --- .../unit/snapshots/banksnapshots.test.ts.snap | 92 ++++++++++++++++++- 1 file changed, 90 insertions(+), 2 deletions(-) diff --git a/tests/unit/snapshots/banksnapshots.test.ts.snap b/tests/unit/snapshots/banksnapshots.test.ts.snap index ebae1572aa..bef042ce30 100644 --- a/tests/unit/snapshots/banksnapshots.test.ts.snap +++ b/tests/unit/snapshots/banksnapshots.test.ts.snap @@ -23897,6 +23897,39 @@ exports[`BSO Creatables 1`] = ` "frozen": false, }, }, + { + "cantHaveItems": undefined, + "inputItems": "function", + "name": "Divine water (Wolf bones)", + "outputItems": Bank { + "bank": { + "50599": 1, + }, + "frozen": false, + }, + }, + { + "cantHaveItems": undefined, + "inputItems": "function", + "name": "Divine water (Monkey bones)", + "outputItems": Bank { + "bank": { + "50599": 1, + }, + "frozen": false, + }, + }, + { + "cantHaveItems": undefined, + "inputItems": "function", + "name": "Divine water (Bat bones)", + "outputItems": Bank { + "bank": { + "50599": 1, + }, + "frozen": false, + }, + }, { "cantHaveItems": undefined, "inputItems": "function", @@ -23922,7 +23955,7 @@ exports[`BSO Creatables 1`] = ` { "cantHaveItems": undefined, "inputItems": "function", - "name": "Divine water (Babydragon bones)", + "name": "Divine water (Zogre bones)", "outputItems": Bank { "bank": { "50599": 1, @@ -23933,7 +23966,18 @@ exports[`BSO Creatables 1`] = ` { "cantHaveItems": undefined, "inputItems": "function", - "name": "Divine water (Dragon bones)", + "name": "Divine water (Shaikahan bones)", + "outputItems": Bank { + "bank": { + "50599": 1, + }, + "frozen": false, + }, + }, + { + "cantHaveItems": undefined, + "inputItems": "function", + "name": "Divine water (Babydragon bones)", "outputItems": Bank { "bank": { "50599": 1, @@ -23952,6 +23996,17 @@ exports[`BSO Creatables 1`] = ` "frozen": false, }, }, + { + "cantHaveItems": undefined, + "inputItems": "function", + "name": "Divine water (Dragon bones)", + "outputItems": Bank { + "bank": { + "50599": 1, + }, + "frozen": false, + }, + }, { "cantHaveItems": undefined, "inputItems": "function", @@ -23974,6 +24029,17 @@ exports[`BSO Creatables 1`] = ` "frozen": false, }, }, + { + "cantHaveItems": undefined, + "inputItems": "function", + "name": "Divine water (Fayrg bones)", + "outputItems": Bank { + "bank": { + "50599": 1, + }, + "frozen": false, + }, + }, { "cantHaveItems": undefined, "inputItems": "function", @@ -23985,6 +24051,17 @@ exports[`BSO Creatables 1`] = ` "frozen": false, }, }, + { + "cantHaveItems": undefined, + "inputItems": "function", + "name": "Divine water (Raurg bones)", + "outputItems": Bank { + "bank": { + "50599": 1, + }, + "frozen": false, + }, + }, { "cantHaveItems": undefined, "inputItems": "function", @@ -24007,6 +24084,17 @@ exports[`BSO Creatables 1`] = ` "frozen": false, }, }, + { + "cantHaveItems": undefined, + "inputItems": "function", + "name": "Divine water (Ourg bones)", + "outputItems": Bank { + "bank": { + "50599": 1, + }, + "frozen": false, + }, + }, { "cantHaveItems": undefined, "inputItems": "function", From 4d7757564b5be11e68580f20e506fdac66e5d6b9 Mon Sep 17 00:00:00 2001 From: nwjgit Date: Thu, 22 Aug 2024 22:04:24 -0500 Subject: [PATCH 3/3] more tests --- src/lib/data/creatablesTable.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/data/creatablesTable.txt b/src/lib/data/creatablesTable.txt index 79bc325bd8..e3531b722e 100644 --- a/src/lib/data/creatablesTable.txt +++ b/src/lib/data/creatablesTable.txt @@ -828,16 +828,24 @@ | Revert masori chaps | 1x Masori chaps | 3x Masori components | 0 | | Divine water | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Bones) | Unknown/Dynamic | 1x Divine water | 0 | +| Divine water (Wolf bones) | Unknown/Dynamic | 1x Divine water | 0 | +| Divine water (Monkey bones) | Unknown/Dynamic | 1x Divine water | 0 | +| Divine water (Bat bones) | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Big bones) | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Jogre bones) | Unknown/Dynamic | 1x Divine water | 0 | +| Divine water (Zogre bones) | Unknown/Dynamic | 1x Divine water | 0 | +| Divine water (Shaikahan bones) | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Babydragon bones) | Unknown/Dynamic | 1x Divine water | 0 | -| Divine water (Dragon bones) | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Wyrm bones) | Unknown/Dynamic | 1x Divine water | 0 | +| Divine water (Dragon bones) | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Wyvern bones) | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Drake bones) | Unknown/Dynamic | 1x Divine water | 0 | +| Divine water (Fayrg bones) | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Lava dragon bones) | Unknown/Dynamic | 1x Divine water | 0 | +| Divine water (Raurg bones) | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Hydra bones) | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Dagannoth bones) | Unknown/Dynamic | 1x Divine water | 0 | +| Divine water (Ourg bones) | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Superior dragon bones) | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Abyssal dragon bones) | Unknown/Dynamic | 1x Divine water | 0 | | Divine water (Frost dragon bones) | Unknown/Dynamic | 1x Divine water | 0 |