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

Add new weapon

pull/1/head
Made Baruna 2021-03-17 22:42:36 +08:00
parent d160bb6820
commit 533fb5d7fa
6 changed files with 212 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/WishImportModal.svelte
View File

@ -31,18 +31,18 @@
let genshinLink = ''; let genshinLink = '';
let types = { let types = {
100: { // 100: {
name: "Beginners' Wish", // name: "Beginners' Wish",
id: 'beginners', // id: 'beginners',
}, // },
200: { // 200: {
name: 'Standard', // name: 'Standard',
id: 'standard', // id: 'standard',
}, // },
301: { // 301: {
name: 'Character Event', // name: 'Character Event',
id: 'character-event', // id: 'character-event',
}, // },
302: { 302: {
name: 'Weapon Event', name: 'Weapon Event',
id: 'weapon-event', id: 'weapon-event',
@ -135,7 +135,7 @@
console.log(wishNumber, type); console.log(wishNumber, type);
url.searchParams.set('auth_appid', 'webview_gacha'); url.searchParams.set('auth_appid', 'webview_gacha');
url.searchParams.set('init_type', '301'); url.searchParams.set('init_type', '301');
url.searchParams.set('gacha_id', 'd610857102f9256ba143ccf2e03b964c76a6ed'); url.searchParams.set('gacha_id', 'b8fd0d8a6c940c7a16a486367de5f6d2232f53');
url.searchParams.set('lang', 'en'); url.searchParams.set('lang', 'en');
url.searchParams.set('device_type', getDeviceType()); url.searchParams.set('device_type', getDeviceType());
if (region !== '') url.searchParams.set('region', region); if (region !== '') url.searchParams.set('region', region);

331
src/data/weaponList.js
View File

@ -2137,49 +2137,49 @@ export const weaponList = {
ascension: [ ascension: [
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.tile_of_decarabians_tower, amount: 3 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.heavy_horn, amount: 3 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.divining_scroll, amount: 2 },
], ],
mora: 5000, mora: 5000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.debris_of_decarabians_city, amount: 3 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.heavy_horn, amount: 12 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.divining_scroll, amount: 8 },
], ],
mora: 15000, mora: 15000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.debris_of_decarabians_city, amount: 6 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.black_bronze_horn, amount: 6 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.sealed_scroll, amount: 6 },
], ],
mora: 20000, mora: 20000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.fragment_of_decarabians_epic, amount: 3 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.black_bronze_horn, amount: 12 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.sealed_scroll, amount: 9 },
], ],
mora: 30000, mora: 30000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.fragment_of_decarabians_epic, amount: 6 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.black_crystal_horn, amount: 9 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.forbidden_curse_scroll, amount: 6 },
], ],
mora: 35000, mora: 35000,
}, },
{ {
items: [ items: [
{ item: itemList.unknown, amount: 0 }, { item: itemList.scattered_piece_of_decarabians_dream, amount: 4 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.black_crystal_horn, amount: 18 },
{ item: itemList.unknown, amount: 0 }, { item: itemList.forbidden_curse_scroll, amount: 12 },
], ],
mora: 45000, mora: 45000,
}, },
@ -2303,65 +2303,65 @@ 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',
@ -2421,65 +2421,65 @@ export const weaponList = {
}, },
], ],
}, },
// wine_and_song: { wine_and_song: {
// name: 'Wine and Song', name: 'Wine and Song',
// id: 'wine_and_song', id: 'wine_and_song',
// rarity: 4, rarity: 4,
// atk: 42, atk: 42,
// secondary: 'Energy Recharge', secondary: 'Energy Recharge',
// type: weapons.catalyst, type: weapons.catalyst,
// source: 'currently unobtainable', source: 'currently unobtainable',
// 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.divining_scroll, 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.divining_scroll, 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.sealed_scroll, 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.sealed_scroll, 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.forbidden_curse_scroll, 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.forbidden_curse_scroll, amount: 12 }, { item: itemList.golden_raven_insignia, amount: 12 },
// ], ],
// mora: 45000, mora: 45000,
// }, },
// ], ],
// }, },
blackcliff_warbow: { blackcliff_warbow: {
name: 'Blackcliff Warbow', name: 'Blackcliff Warbow',
id: 'blackcliff_warbow', id: 'blackcliff_warbow',
@ -6256,4 +6256,63 @@ export const weaponList = {
}, },
], ],
}, },
elegy_for_the_end: {
name: "Elegy for the End",
id: "elegy_for_the_end",
rarity: 5,
type: weapons.bow,
source: "wish",
atk: 46,
secondary: "Energy Recharge",
ascension: [
{
items: [
{ item: itemList.boreal_wolfs_milk_tooth, amount: 3 },
{ item: itemList.heavy_horn, amount: 3 },
{ item: itemList.recruits_insignia, amount: 2 },
],
mora: 10000,
},
{
items: [
{ item: itemList.boreal_wolfs_cracked_tooth, amount: 3 },
{ item: itemList.heavy_horn, amount: 12 },
{ item: itemList.recruits_insignia, amount: 8 },
],
mora: 20000,
},
{
items: [
{ item: itemList.boreal_wolfs_cracked_tooth, amount: 6 },
{ item: itemList.black_bronze_horn, amount: 6 },
{ item: itemList.sergeants_insignia, amount: 6 },
],
mora: 30000,
},
{
items: [
{ item: itemList.boreal_wolfs_broken_fang, amount: 3 },
{ item: itemList.black_bronze_horn, amount: 12 },
{ item: itemList.sergeants_insignia, amount: 9 },
],
mora: 45000,
},
{
items: [
{ item: itemList.boreal_wolfs_broken_fang, amount: 6 },
{ item: itemList.black_crystal_horn, amount: 9 },
{ item: itemList.lieutenants_insignia, amount: 6 },
],
mora: 55000,
},
{
items: [
{ item: itemList.boreal_wolfs_nostalgia, amount: 4 },
{ item: itemList.black_crystal_horn, amount: 18 },
{ item: itemList.lieutenants_insignia, amount: 12 },
],
mora: 65000,
},
],
},
}; };

5
src/routes/settings/index.svelte
View File

@ -343,7 +343,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/03/13 <pre class="bg-background rounded-xl py-2 px-4 whitespace-pre-wrap">2021/03/17
- Fix wish import
- Add new 1.4 weapons</pre>
<pre class="bg-background rounded-xl py-2 px-4 whitespace-pre-wrap mt-2">2021/03/13
- Add timeline page</pre> - Add timeline page</pre>
<pre <pre
class="bg-background rounded-xl py-2 px-4 whitespace-pre-wrap mt-2">2021/03/09 class="bg-background rounded-xl py-2 px-4 whitespace-pre-wrap mt-2">2021/03/09

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 64 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 58 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 59 KiB