ctome
/
paimon-moe-fork
mirror of https://github.com/CrimsonTome/paimon-moe-fork.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update weapons

pull/1/head
I Made Setia Baruna 2021-02-26 00:55:53 +08:00
parent 9b5f5772b8
commit 669b5f5be9
9 changed files with 225 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

375
src/data/weaponList.js
View File

@ -2303,183 +2303,183 @@ export const weaponList = {
}, },
], ],
}, },
alley_hunter: { // alley_hunter: {
name: 'Alley Hunter', // name: 'Alley Hunter',
id: 'alley_hunter', // id: 'alley_hunter',
rarity: 4, // rarity: 4,
atk: 41, // atk: 41,
secondary: 'CRIT Rate', // secondary: 'CRIT Rate',
type: weapons.bow, // type: weapons.bow,
source: 'wish', // source: 'wish',
ascension: [ // ascension: [
{ // {
items: [ // items: [
{ item: itemList.boreal_wolfs_milk_tooth, amount: 3 }, // { item: itemList.boreal_wolfs_milk_tooth, amount: 3 },
{ item: itemList.dead_ley_line_branch, amount: 3 }, // { item: itemList.dead_ley_line_branch, amount: 3 },
{ item: itemList.treasure_hoarder_insignia, amount: 2 }, // { item: itemList.treasure_hoarder_insignia, amount: 2 },
], // ],
mora: 5000, // mora: 5000,
}, // },
{ // {
items: [ // items: [
{ item: itemList.boreal_wolfs_cracked_tooth, amount: 3 }, // { item: itemList.boreal_wolfs_cracked_tooth, amount: 3 },
{ item: itemList.dead_ley_line_branch, amount: 12 }, // { item: itemList.dead_ley_line_branch, amount: 12 },
{ item: itemList.treasure_hoarder_insignia, amount: 8 }, // { item: itemList.treasure_hoarder_insignia, amount: 8 },
], // ],
mora: 15000, // mora: 15000,
}, // },
{ // {
items: [ // items: [
{ item: itemList.boreal_wolfs_cracked_tooth, amount: 6 }, // { item: itemList.boreal_wolfs_cracked_tooth, amount: 6 },
{ item: itemList.dead_ley_line_leaves, amount: 6 }, // { item: itemList.dead_ley_line_leaves, amount: 6 },
{ item: itemList.silver_raven_insignia, amount: 6 }, // { item: itemList.silver_raven_insignia, amount: 6 },
], // ],
mora: 20000, // mora: 20000,
}, // },
{ // {
items: [ // items: [
{ item: itemList.boreal_wolfs_broken_fang, amount: 3 }, // { item: itemList.boreal_wolfs_broken_fang, amount: 3 },
{ item: itemList.dead_ley_line_leaves, amount: 12 }, // { item: itemList.dead_ley_line_leaves, amount: 12 },
{ item: itemList.silver_raven_insignia, amount: 9 }, // { item: itemList.silver_raven_insignia, amount: 9 },
], // ],
mora: 30000, // mora: 30000,
}, // },
{ // {
items: [ // items: [
{ item: itemList.boreal_wolfs_broken_fang, amount: 6 }, // { item: itemList.boreal_wolfs_broken_fang, amount: 6 },
{ item: itemList.ley_line_sprouts, amount: 9 }, // { item: itemList.ley_line_sprouts, amount: 9 },
{ item: itemList.golden_raven_insignia, amount: 6 }, // { item: itemList.golden_raven_insignia, amount: 6 },
], // ],
mora: 35000, // mora: 35000,
}, // },
{ // {
items: [ // items: [
{ item: itemList.boreal_wolfs_nostalgia, amount: 4 }, // { item: itemList.boreal_wolfs_nostalgia, amount: 4 },
{ item: itemList.ley_line_sprouts, amount: 18 }, // { item: itemList.ley_line_sprouts, amount: 18 },
{ item: itemList.golden_raven_insignia, amount: 12 }, // { item: itemList.golden_raven_insignia, amount: 12 },
], // ],
mora: 45000, // mora: 45000,
}, // },
], // ],
}, // },
lithic_spear: { lithic_spear: {
name: 'Lithic Spear', name: 'Lithic Spear',
id: 'lithic_spear', id: 'lithic_spear',
rarity: 4, rarity: 4,
atk: 42, atk: 44,
secondary: 'Physical DMG Bonus', secondary: 'ATK',
type: weapons.polearm, type: weapons.polearm,
source: 'wish', source: 'wish',
ascension: [ ascension: [
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.grain_of_aerosiderite, amount: 3 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.fragile_bone_shard, amount: 3 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.firm_arrowhead, amount: 2 },
], ],
mora: 5000, mora: 5000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.piece_of_aerosiderite, amount: 3 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.fragile_bone_shard, amount: 12 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.firm_arrowhead, amount: 8 },
], ],
mora: 15000, mora: 15000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.piece_of_aerosiderite, amount: 6 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.sturdy_bone_shard, amount: 6 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.sharp_arrowhead, amount: 6 },
], ],
mora: 20000, mora: 20000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.bit_of_aerosiderite, amount: 3 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.sturdy_bone_shard, amount: 12 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.sharp_arrowhead, amount: 9 },
], ],
mora: 30000, mora: 30000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.bit_of_aerosiderite, amount: 6 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.fossilized_bone_shard, amount: 9 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.weathered_arrowhead, amount: 6 },
], ],
mora: 35000, mora: 35000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.chunk_of_aerosiderite, amount: 4 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.fossilized_bone_shard, amount: 18 },
{ item: itemList.unknown, amount: 0 }, { 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, 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: { blackcliff_warbow: {
name: 'Blackcliff Warbow', name: 'Blackcliff Warbow',
id: 'blackcliff_warbow', id: 'blackcliff_warbow',
@ -2602,56 +2602,56 @@ export const weaponList = {
name: 'Lithic Blade', name: 'Lithic Blade',
id: 'lithic_blade', id: 'lithic_blade',
rarity: 4, rarity: 4,
atk: 41, atk: 42,
secondary: 'CRIT DMG', secondary: 'ATK',
type: weapons.claymore, type: weapons.claymore,
source: 'wish', source: 'wish',
ascension: [ ascension: [
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.luminous_sands_from_guyun, amount: 3 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.hunters_sacrificial_knife, amount: 3 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.firm_arrowhead, amount: 2 },
], ],
mora: 5000, mora: 5000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.lustrous_stone_from_guyun, amount: 3 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.hunters_sacrificial_knife, amount: 12 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.firm_arrowhead, amount: 8 },
], ],
mora: 15000, mora: 15000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.lustrous_stone_from_guyun, amount: 6 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.agents_sacrificial_knife, amount: 6 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.sharp_arrowhead, amount: 6 },
], ],
mora: 20000, mora: 20000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.relic_from_guyun, amount: 3 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.agents_sacrificial_knife, amount: 12 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.sharp_arrowhead, amount: 9 },
], ],
mora: 30000, mora: 30000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.relic_from_guyun, amount: 6 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.inspectors_sacrificial_knife, amount: 9 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.weathered_arrowhead, amount: 6 },
], ],
mora: 35000, mora: 35000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.divine_body_from_guyun, amount: 4 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.inspectors_sacrificial_knife, amount: 18 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.weathered_arrowhead, amount: 12 },
], ],
mora: 45000, 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,
},
],
},
}; };

5
src/routes/settings.svelte
View File

@ -150,7 +150,10 @@
</p> </p>
{#if changelogOpen} {#if changelogOpen}
<div transition:slide class="mt-4"> <div transition:slide class="mt-4">
<pre class="bg-background rounded-xl py-2 px-4 whitespace-pre-wrap">2021/02/03 <pre class="bg-background rounded-xl py-2 px-4 whitespace-pre-wrap">2021/02/26
- Add Staff of Homa, Lithic Spear, and Lithic Blade
- Change weapon banner 5star pity</pre>
<pre class="bg-background rounded-xl py-2 px-4 whitespace-pre-wrap mt-2">2021/02/03
- Add Xiao - Add Xiao
- Add Primordial Jade Cutter - Add Primordial Jade Cutter
- Bug fixes</pre> - Bug fixes</pre>

5
src/routes/wish/_counter.svelte
View File

@ -18,6 +18,7 @@
export let id = ''; export let id = '';
export let name = ''; export let name = '';
export let legendaryPity = 90;
let isEdit = false; let isEdit = false;
let isDetailOpen = false; let isDetailOpen = false;
@ -160,7 +161,7 @@
} }
legendary += val; legendary += val;
if (legendary >= 90) { if (legendary >= legendaryPity) {
openAddModal(legendary); openAddModal(legendary);
legendary = 0; legendary = 0;
rare = 0; rare = 0;
@ -217,7 +218,7 @@
5 5
<Icon path={mdiStar} size={0.75} className="mb-1" /> <Icon path={mdiStar} size={0.75} className="mb-1" />
Pity Pity
<br /><span class="text-gray-600">Guaranteed at 90</span> <br /><span class="text-gray-600">Guaranteed at {legendaryPity}</span>
</span> </span>
{#if isEdit} {#if isEdit}
<Input type="number" min={1} bind:value={legendaryEdit} /> <Input type="number" min={1} bind:value={legendaryEdit} />

2
src/routes/wish/index.svelte
View File

@ -43,7 +43,7 @@
</div> </div>
<div class="grid gap-4 grid-cols-1 md:grid-cols-2 xl:grid-cols-3 max-w-screen-xl"> <div class="grid gap-4 grid-cols-1 md:grid-cols-2 xl:grid-cols-3 max-w-screen-xl">
<Counter id="character-event" name="Character Event" /> <Counter id="character-event" name="Character Event" />
<Counter id="weapon-event" name="Weapon Event" /> <Counter id="weapon-event" name="Weapon Event" legendaryPity={80} />
<Counter id="standard" name="Standard" /> <Counter id="standard" name="Standard" />
</div> </div>
</div> </div>

BIN
static/images/items/teachings_of_ballad .png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 58 KiB

BIN
static/images/weapons/lithic_blade.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 50 KiB

BIN
static/images/weapons/lithic_spear.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 27 KiB

BIN
static/images/weapons/primordial_jade_cutter.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
static/images/weapons/staff_of_homa.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 51 KiB