diff --git a/src/data/weaponList.js b/src/data/weaponList.js index 50003b29..c0a08a71 100644 --- a/src/data/weaponList.js +++ b/src/data/weaponList.js @@ -2303,183 +2303,183 @@ export const weaponList = { }, ], }, - alley_hunter: { - name: 'Alley Hunter', - id: 'alley_hunter', - rarity: 4, - atk: 41, - secondary: 'CRIT Rate', - type: weapons.bow, - source: 'wish', - ascension: [ - { - items: [ - { item: itemList.boreal_wolfs_milk_tooth, amount: 3 }, - { item: itemList.dead_ley_line_branch, amount: 3 }, - { item: itemList.treasure_hoarder_insignia, amount: 2 }, - ], - mora: 5000, - }, - { - items: [ - { item: itemList.boreal_wolfs_cracked_tooth, amount: 3 }, - { item: itemList.dead_ley_line_branch, amount: 12 }, - { item: itemList.treasure_hoarder_insignia, amount: 8 }, - ], - mora: 15000, - }, - { - items: [ - { item: itemList.boreal_wolfs_cracked_tooth, amount: 6 }, - { item: itemList.dead_ley_line_leaves, amount: 6 }, - { item: itemList.silver_raven_insignia, amount: 6 }, - ], - mora: 20000, - }, - { - items: [ - { item: itemList.boreal_wolfs_broken_fang, amount: 3 }, - { item: itemList.dead_ley_line_leaves, amount: 12 }, - { item: itemList.silver_raven_insignia, amount: 9 }, - ], - mora: 30000, - }, - { - items: [ - { item: itemList.boreal_wolfs_broken_fang, amount: 6 }, - { item: itemList.ley_line_sprouts, amount: 9 }, - { item: itemList.golden_raven_insignia, amount: 6 }, - ], - mora: 35000, - }, - { - items: [ - { item: itemList.boreal_wolfs_nostalgia, amount: 4 }, - { item: itemList.ley_line_sprouts, amount: 18 }, - { item: itemList.golden_raven_insignia, amount: 12 }, - ], - mora: 45000, - }, - ], - }, + // alley_hunter: { + // name: 'Alley Hunter', + // id: 'alley_hunter', + // rarity: 4, + // atk: 41, + // secondary: 'CRIT Rate', + // type: weapons.bow, + // source: 'wish', + // ascension: [ + // { + // items: [ + // { item: itemList.boreal_wolfs_milk_tooth, amount: 3 }, + // { item: itemList.dead_ley_line_branch, amount: 3 }, + // { item: itemList.treasure_hoarder_insignia, amount: 2 }, + // ], + // mora: 5000, + // }, + // { + // items: [ + // { item: itemList.boreal_wolfs_cracked_tooth, amount: 3 }, + // { item: itemList.dead_ley_line_branch, amount: 12 }, + // { item: itemList.treasure_hoarder_insignia, amount: 8 }, + // ], + // mora: 15000, + // }, + // { + // items: [ + // { item: itemList.boreal_wolfs_cracked_tooth, amount: 6 }, + // { item: itemList.dead_ley_line_leaves, amount: 6 }, + // { item: itemList.silver_raven_insignia, amount: 6 }, + // ], + // mora: 20000, + // }, + // { + // items: [ + // { item: itemList.boreal_wolfs_broken_fang, amount: 3 }, + // { item: itemList.dead_ley_line_leaves, amount: 12 }, + // { item: itemList.silver_raven_insignia, amount: 9 }, + // ], + // mora: 30000, + // }, + // { + // items: [ + // { item: itemList.boreal_wolfs_broken_fang, amount: 6 }, + // { item: itemList.ley_line_sprouts, amount: 9 }, + // { item: itemList.golden_raven_insignia, amount: 6 }, + // ], + // mora: 35000, + // }, + // { + // items: [ + // { item: itemList.boreal_wolfs_nostalgia, amount: 4 }, + // { item: itemList.ley_line_sprouts, amount: 18 }, + // { item: itemList.golden_raven_insignia, amount: 12 }, + // ], + // mora: 45000, + // }, + // ], + // }, lithic_spear: { name: 'Lithic Spear', id: 'lithic_spear', rarity: 4, - atk: 42, - secondary: 'Physical DMG Bonus', + atk: 44, + secondary: 'ATK', type: weapons.polearm, source: 'wish', ascension: [ { items: [ - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, + { item: itemList.grain_of_aerosiderite, amount: 3 }, + { item: itemList.fragile_bone_shard, amount: 3 }, + { item: itemList.firm_arrowhead, amount: 2 }, ], mora: 5000, }, { items: [ - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, + { item: itemList.piece_of_aerosiderite, amount: 3 }, + { item: itemList.fragile_bone_shard, amount: 12 }, + { item: itemList.firm_arrowhead, amount: 8 }, ], mora: 15000, }, { items: [ - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, + { item: itemList.piece_of_aerosiderite, amount: 6 }, + { item: itemList.sturdy_bone_shard, amount: 6 }, + { item: itemList.sharp_arrowhead, amount: 6 }, ], mora: 20000, }, { items: [ - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, + { item: itemList.bit_of_aerosiderite, amount: 3 }, + { item: itemList.sturdy_bone_shard, amount: 12 }, + { item: itemList.sharp_arrowhead, amount: 9 }, ], mora: 30000, }, { items: [ - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, + { item: itemList.bit_of_aerosiderite, amount: 6 }, + { item: itemList.fossilized_bone_shard, amount: 9 }, + { item: itemList.weathered_arrowhead, amount: 6 }, ], mora: 35000, }, { items: [ - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - ], - mora: 45000, - }, - ], - }, - wine_and_song: { - name: 'Wine and Song', - id: 'wine_and_song', - rarity: 4, - atk: 42, - secondary: 'Energy Recharge', - type: weapons.catalyst, - source: 'currently unobtainable', - ascension: [ - { - items: [ - { item: itemList.boreal_wolfs_milk_tooth, amount: 3 }, - { item: itemList.dead_ley_line_branch, amount: 3 }, - { item: itemList.divining_scroll, amount: 2 }, - ], - mora: 5000, - }, - { - items: [ - { item: itemList.boreal_wolfs_cracked_tooth, amount: 3 }, - { item: itemList.dead_ley_line_branch, amount: 12 }, - { item: itemList.divining_scroll, amount: 8 }, - ], - mora: 15000, - }, - { - items: [ - { item: itemList.boreal_wolfs_cracked_tooth, amount: 6 }, - { item: itemList.dead_ley_line_leaves, amount: 6 }, - { item: itemList.sealed_scroll, amount: 6 }, - ], - mora: 20000, - }, - { - items: [ - { item: itemList.boreal_wolfs_broken_fang, amount: 3 }, - { item: itemList.dead_ley_line_leaves, amount: 12 }, - { item: itemList.sealed_scroll, amount: 9 }, - ], - mora: 30000, - }, - { - items: [ - { item: itemList.boreal_wolfs_broken_fang, amount: 6 }, - { item: itemList.ley_line_sprouts, amount: 9 }, - { item: itemList.forbidden_curse_scroll, amount: 6 }, - ], - mora: 35000, - }, - { - items: [ - { item: itemList.boreal_wolfs_nostalgia, amount: 4 }, - { item: itemList.ley_line_sprouts, amount: 18 }, - { item: itemList.forbidden_curse_scroll, amount: 12 }, + { item: itemList.chunk_of_aerosiderite, amount: 4 }, + { item: itemList.fossilized_bone_shard, amount: 18 }, + { item: itemList.weathered_arrowhead, amount: 12 }, ], mora: 45000, }, ], }, + // wine_and_song: { + // name: 'Wine and Song', + // id: 'wine_and_song', + // rarity: 4, + // atk: 42, + // secondary: 'Energy Recharge', + // type: weapons.catalyst, + // source: 'currently unobtainable', + // ascension: [ + // { + // items: [ + // { item: itemList.boreal_wolfs_milk_tooth, amount: 3 }, + // { item: itemList.dead_ley_line_branch, amount: 3 }, + // { item: itemList.divining_scroll, amount: 2 }, + // ], + // mora: 5000, + // }, + // { + // items: [ + // { item: itemList.boreal_wolfs_cracked_tooth, amount: 3 }, + // { item: itemList.dead_ley_line_branch, amount: 12 }, + // { item: itemList.divining_scroll, amount: 8 }, + // ], + // mora: 15000, + // }, + // { + // items: [ + // { item: itemList.boreal_wolfs_cracked_tooth, amount: 6 }, + // { item: itemList.dead_ley_line_leaves, amount: 6 }, + // { item: itemList.sealed_scroll, amount: 6 }, + // ], + // mora: 20000, + // }, + // { + // items: [ + // { item: itemList.boreal_wolfs_broken_fang, amount: 3 }, + // { item: itemList.dead_ley_line_leaves, amount: 12 }, + // { item: itemList.sealed_scroll, amount: 9 }, + // ], + // mora: 30000, + // }, + // { + // items: [ + // { item: itemList.boreal_wolfs_broken_fang, amount: 6 }, + // { item: itemList.ley_line_sprouts, amount: 9 }, + // { item: itemList.forbidden_curse_scroll, amount: 6 }, + // ], + // mora: 35000, + // }, + // { + // items: [ + // { item: itemList.boreal_wolfs_nostalgia, amount: 4 }, + // { item: itemList.ley_line_sprouts, amount: 18 }, + // { item: itemList.forbidden_curse_scroll, amount: 12 }, + // ], + // mora: 45000, + // }, + // ], + // }, blackcliff_warbow: { name: 'Blackcliff Warbow', id: 'blackcliff_warbow', @@ -2602,56 +2602,56 @@ export const weaponList = { name: 'Lithic Blade', id: 'lithic_blade', rarity: 4, - atk: 41, - secondary: 'CRIT DMG', + atk: 42, + secondary: 'ATK', type: weapons.claymore, source: 'wish', ascension: [ { items: [ - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, + { item: itemList.luminous_sands_from_guyun, amount: 3 }, + { item: itemList.hunters_sacrificial_knife, amount: 3 }, + { item: itemList.firm_arrowhead, amount: 2 }, ], mora: 5000, }, { items: [ - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, + { item: itemList.lustrous_stone_from_guyun, amount: 3 }, + { item: itemList.hunters_sacrificial_knife, amount: 12 }, + { item: itemList.firm_arrowhead, amount: 8 }, ], mora: 15000, }, { items: [ - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, + { item: itemList.lustrous_stone_from_guyun, amount: 6 }, + { item: itemList.agents_sacrificial_knife, amount: 6 }, + { item: itemList.sharp_arrowhead, amount: 6 }, ], mora: 20000, }, { items: [ - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, + { item: itemList.relic_from_guyun, amount: 3 }, + { item: itemList.agents_sacrificial_knife, amount: 12 }, + { item: itemList.sharp_arrowhead, amount: 9 }, ], mora: 30000, }, { items: [ - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, + { item: itemList.relic_from_guyun, amount: 6 }, + { item: itemList.inspectors_sacrificial_knife, amount: 9 }, + { item: itemList.weathered_arrowhead, amount: 6 }, ], mora: 35000, }, { items: [ - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, - { item: itemList.unknown, amount: 0 }, + { item: itemList.divine_body_from_guyun, amount: 4 }, + { item: itemList.inspectors_sacrificial_knife, amount: 18 }, + { item: itemList.weathered_arrowhead, amount: 12 }, ], mora: 45000, }, @@ -6148,4 +6148,63 @@ export const weaponList = { }, ], }, + staff_of_homa: { + name: "Staff of Homa", + id: "staff_of_homa", + rarity: 5, + type: weapons.polearm, + source: "wish", + atk: 46, + secondary: "CRIT DMG", + ascension: [ + { + items: [ + { item: itemList.grain_of_aerosiderite, amount: 5 }, + { item: itemList.dead_ley_line_branch, amount: 5 }, + { item: itemList.slime_condensate, amount: 3 }, + ], + mora: 10000, + }, + { + items: [ + { item: itemList.piece_of_aerosiderite, amount: 5 }, + { item: itemList.dead_ley_line_branch, amount: 18 }, + { item: itemList.slime_condensate, amount: 12 }, + ], + mora: 20000, + }, + { + items: [ + { item: itemList.piece_of_aerosiderite, amount: 9 }, + { item: itemList.dead_ley_line_leaves, amount: 9 }, + { item: itemList.slime_secretions, amount: 9 }, + ], + mora: 30000, + }, + { + items: [ + { item: itemList.bit_of_aerosiderite, amount: 5 }, + { item: itemList.dead_ley_line_leaves, amount: 18 }, + { item: itemList.slime_secretions, amount: 14 }, + ], + mora: 45000, + }, + { + items: [ + { item: itemList.bit_of_aerosiderite, amount: 9 }, + { item: itemList.ley_line_sprouts, amount: 14 }, + { item: itemList.slime_concentrate, amount: 9 }, + ], + mora: 55000, + }, + { + items: [ + { item: itemList.chunk_of_aerosiderite, amount: 6 }, + { item: itemList.ley_line_sprouts, amount: 27 }, + { item: itemList.slime_concentrate, amount: 18 }, + ], + mora: 65000, + }, + ], + }, }; diff --git a/src/routes/settings.svelte b/src/routes/settings.svelte index c7c3e2c7..391ad3f4 100644 --- a/src/routes/settings.svelte +++ b/src/routes/settings.svelte @@ -150,7 +150,10 @@

{#if changelogOpen}
-
2021/02/03 
+        
2021/02/26 
+- Add Staff of Homa, Lithic Spear, and Lithic Blade
+- Change weapon banner 5star pity
+
2021/02/03 
 - Add Xiao
 - Add Primordial Jade Cutter
 - Bug fixes
diff --git a/src/routes/wish/_counter.svelte b/src/routes/wish/_counter.svelte index 3ec8a6c2..350d74e4 100644 --- a/src/routes/wish/_counter.svelte +++ b/src/routes/wish/_counter.svelte @@ -18,6 +18,7 @@ export let id = ''; export let name = ''; + export let legendaryPity = 90; let isEdit = false; let isDetailOpen = false; @@ -160,7 +161,7 @@ } legendary += val; - if (legendary >= 90) { + if (legendary >= legendaryPity) { openAddModal(legendary); legendary = 0; rare = 0; @@ -217,7 +218,7 @@ 5 Pity -
Guaranteed at 90 +
Guaranteed at {legendaryPity} {#if isEdit} diff --git a/src/routes/wish/index.svelte b/src/routes/wish/index.svelte index 4bc77154..f3f0ef7a 100644 --- a/src/routes/wish/index.svelte +++ b/src/routes/wish/index.svelte @@ -43,7 +43,7 @@
- +
diff --git "a/static/images/items/teachings_of_ballad\n.png" "b/static/images/items/teachings_of_ballad\n.png" deleted file mode 100644 index ea17a57b..00000000 Binary files "a/static/images/items/teachings_of_ballad\n.png" and /dev/null differ diff --git a/static/images/weapons/lithic_blade.png b/static/images/weapons/lithic_blade.png index f2a053bf..9f07f067 100644 Binary files a/static/images/weapons/lithic_blade.png and b/static/images/weapons/lithic_blade.png differ diff --git a/static/images/weapons/lithic_spear.png b/static/images/weapons/lithic_spear.png index d52c79c2..71a7409e 100644 Binary files a/static/images/weapons/lithic_spear.png and b/static/images/weapons/lithic_spear.png differ diff --git a/static/images/weapons/primordial_jade_cutter.png b/static/images/weapons/primordial_jade_cutter.png index b9177ea5..3e2238bd 100644 Binary files a/static/images/weapons/primordial_jade_cutter.png and b/static/images/weapons/primordial_jade_cutter.png differ diff --git a/static/images/weapons/staff_of_homa.png b/static/images/weapons/staff_of_homa.png new file mode 100644 index 00000000..877c09f4 Binary files /dev/null and b/static/images/weapons/staff_of_homa.png differ