Change percentage to 50:50 on wish tally

This commit is contained in:
Made Baruna 2021-04-12 00:27:18 +08:00
parent 984d6dfd1d
commit a61fa8ac10
3 changed files with 15 additions and 3 deletions

View file

@ -257,6 +257,7 @@
"subtitle": "Global average pity from paimon.moe users submission", "subtitle": "Global average pity from paimon.moe users submission",
"update": "Updated", "update": "Updated",
"summoned": "Summoned", "summoned": "Summoned",
"wonFiftyFifty": "won 50:50",
"fromFiveStar": "from all 5★", "fromFiveStar": "from all 5★",
"fromFourStar": "from all 4★", "fromFourStar": "from all 4★",
"show": "Show", "show": "Show",

View file

@ -257,6 +257,7 @@
"subtitle": "Rata-rata pity dari kiriman pengguna paimon.moe", "subtitle": "Rata-rata pity dari kiriman pengguna paimon.moe",
"update": "Diupdate", "update": "Diupdate",
"summoned": "Pulang", "summoned": "Pulang",
"wonFiftyFifty": "menang 50:50",
"fromFiveStar": "dari semua 5★", "fromFiveStar": "dari semua 5★",
"fromFourStar": "dari semua 4★", "fromFourStar": "dari semua 4★",
"show": "Tampilkan", "show": "Tampilkan",

View file

@ -134,6 +134,7 @@
if (item) { if (item) {
featuredValues[i] = { featuredValues[i] = {
total: item.count, total: item.count,
guaranteed: item.guaranteed,
percentage: percentage:
(item.count / (item.count /
(type === 'character' && id !== 200001 && i === 1 ? data.total.rare : data.total.legendary)) * (type === 'character' && id !== 200001 && i === 1 ? data.total.rare : data.total.legendary)) *
@ -309,9 +310,18 @@
<span class="text-gray-400">{$t('wish.tally.summoned')}</span> <span class="text-gray-400">{$t('wish.tally.summoned')}</span>
</p> </p>
<p class="text-gray-400"> <p class="text-gray-400">
{numberFormat.format(featuredValues[i].percentage)}% {$t( {#if id === 300011 && i === 0}
type === 'character' && i === 1 ? 'wish.tally.fromFourStar' : 'wish.tally.fromFiveStar', {numberFormat.format(
)} ((featuredValues[i].total - featuredValues[i].guaranteed) /
(data.total.legendary - featuredValues[i].guaranteed)) *
100,
)}%
{$t('wish.tally.wonFiftyFifty')}
{:else}
{numberFormat.format(featuredValues[i].percentage)}% {$t(
type === 'character' && i === 1 ? 'wish.tally.fromFourStar' : 'wish.tally.fromFiveStar',
)}
{/if}
</p> </p>
</td> </td>
</tr> </tr>