diff --git a/src/locales/en.json b/src/locales/en.json index 70aadb44..92d12c35 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -162,6 +162,21 @@ "totalThisBanner": "Total pull on this banner", "worth": "Worth", "loading": "Loading... (If this stuck, change your server on settings page)" + }, + "tally": { + "title": "Wish Tally", + "subtitle": "Global average pity from paimon.moe users submission", + "update": "Updated", + "summoned": "Summoned", + "fromFiveStar": "from all 5*", + "name": "Name", + "total": "Total", + "wishTotal": "Wish Total", + "worth": "Worth", + "weapon": "Weapons", + "character": "Characters", + "error": "Data is not available yet 😞", + "pity": "Pity" } }, "calculator": { diff --git a/src/locales/id.json b/src/locales/id.json index 1d2a7482..957a33e9 100644 --- a/src/locales/id.json +++ b/src/locales/id.json @@ -162,6 +162,21 @@ "totalThisBanner": "Total pull di banner ini", "worth": "Setara dengan", "loading": "Loading... (Kalau tidak selesai-selesai, ganti server di halaman settings)" + }, + "tally": { + "title": "Perhitungan Pity Wish", + "subtitle": "Rata-rata pity dari kiriman pengguna paimon.moe", + "update": "Diupdate", + "summoned": "Pulang", + "fromFiveStar": "dari semua 5*", + "name": "Nama", + "total": "Total", + "wishTotal": "Total Wish", + "worth": "Bernilai", + "weapon": "Senjata", + "character": "Karakter", + "error": "Data belum tersedia 😞", + "pity": "Pity" } }, "calculator": { diff --git a/src/routes/wish/tally/_item.svelte b/src/routes/wish/tally/_item.svelte new file mode 100644 index 00000000..481ce391 --- /dev/null +++ b/src/routes/wish/tally/_item.svelte @@ -0,0 +1,564 @@ + + +
+
+ {banner.name} + {#if loading} + + {:else if !error} +
+
+ {#if id === 200001} + + + + + + + + + +
+ {featuredValues[0].total} + +

+ {$t('wish.tally.character')} + {$t('wish.tally.summoned')} +

+

+ {numberFormat.format(featuredValues[0].percentage)}% {$t('wish.tally.fromFiveStar')} +

+
+ {featuredValues[1].total} + +

+ {$t('wish.tally.weapon')} + {$t('wish.tally.summoned')} +

+

+ {numberFormat.format(featuredValues[1].percentage)}% {$t('wish.tally.fromFiveStar')} +

+
+ {:else} + + {#each featured as feat, i} + + + + + {/each} +
+ {featuredValues[i].total} + +

+ {type === 'character' ? characters[feat].name : weaponList[feat].name} + {$t('wish.tally.summoned')} +

+

{numberFormat.format(featuredValues[i].percentage)}% from all 5*

+
+ {/if} +
+ +
+
+
+

+ {numberFormat.format(legendary.percentage)}% +

+
+

+ + + + + +

+

Total {numberFormat.format(legendary.total)}

+
+
+
+

+ {numberFormat.format(rare.percentage)}% +

+
+

+ + + + +

+

Total {numberFormat.format(rare.total)}

+
+
+
+ {#if openLegendaryList} +
+ + + + + + {#each legendaryList as item} + + + + + {/each} +
{$t('wish.tally.name')}{$t('wish.tally.total')}
+ {item.type === 'character' ? characters[item.name].name : weaponList[item.name].name} + {item.count}
+
+ {/if} + {/if} +
+ {#if !loading && !error} +
+ + + + + + + {#each legendaryStep as label, i} + + + + + + {/each} +
5 {$t('wish.tally.pity')}{$t('wish.tally.total')}%
+ {#if Array.isArray(label)} + {label[0]} - {label[1]} + {:else} + {label} + {/if} + + {numberFormat.format(legendaryPity[i].total)} + + {numberFormat.format(legendaryPity[i].percentage * 100)} +
+
+
+ + + + + + + {#each rarePity as pity, i} + + + + + + {/each} +
4 {$t('wish.tally.pity')}{$t('wish.tally.total')}%
+ {i + 1} + + {numberFormat.format(pity.total)} + + {numberFormat.format(pity.percentage * 100)} +
+
+ +
+ +
+
+ {$t('wish.tally.wishTotal')} {numberFormat.format(data.total.all)} +
+
+ {$t('wish.tally.worth')} primogem + {numberFormat.format(data.total.all * 160)} +
+
+
+ {$t('wish.tally.update')} {updateTime} +
+
+ {/if} + {#if error} +
{$t('wish.tally.error')}
+ {/if} +
+ + diff --git a/src/routes/wish/tally/index.svelte b/src/routes/wish/tally/index.svelte new file mode 100644 index 00000000..e8218adb --- /dev/null +++ b/src/routes/wish/tally/index.svelte @@ -0,0 +1,33 @@ + + + + Wish Counter - Paimon.moe + + + +
+
+

{$t('wish.tally.title')}

+

+ ※ {$t('wish.tally.subtitle')} +

+ +
+ + + + + +
+
+