diff --git a/src/locales/de-DE.json b/src/locales/de-DE.json index a2dddf8f..3d3dcd40 100644 --- a/src/locales/de-DE.json +++ b/src/locales/de-DE.json @@ -72,6 +72,7 @@ "baseRate": "{rarity}-Star Base Rate:", "maxPity": "{rarity}-Star Max Pity:", "hardPity": "Boost {rarity}-Star rate starts from pity:", + "currentPity": "{rarity}-Star Current Pity", "winRate": "Chance to get Featured Item:", "charRate": "Chance to get Character instead of Weapon", "nonRateup": "(Non RateUp Item)", diff --git a/src/locales/en-US.json b/src/locales/en-US.json index 811e139e..210425c4 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -72,6 +72,7 @@ "baseRate": "{rarity}-Star Base Rate:", "maxPity": "{rarity}-Star Max Pity:", "hardPity": "Boost {rarity}-Star rate starts from pity:", + "currentPity": "{rarity}-Star Current Pity", "winRate": "Chance to get Featured Item:", "charRate": "Chance to get Character instead of Weapon", "nonRateup": "(Non RateUp Item)", diff --git a/src/locales/fr-FR.json b/src/locales/fr-FR.json index 57c43350..4cc3fb7f 100644 --- a/src/locales/fr-FR.json +++ b/src/locales/fr-FR.json @@ -72,6 +72,7 @@ "baseRate": "{rarity}-Star Base Rate:", "maxPity": "{rarity}-Star Max Pity:", "hardPity": "Boost {rarity}-Star rate starts from pity:", + "currentPity": "{rarity}-Star Current Pity", "winRate": "Chance to get Featured Item:", "charRate": "Chance to get Character instead of Weapon", "nonRateup": "(Non RateUp Item)", diff --git a/src/locales/id-ID.json b/src/locales/id-ID.json index 9711ec4d..1ba84539 100644 --- a/src/locales/id-ID.json +++ b/src/locales/id-ID.json @@ -72,6 +72,7 @@ "baseRate": "Probabilitas Dasar {rarity}★:", "maxPity": "Piti Maksimal {rarity}★:", "hardPity": "Tingkatkan probabilitas {rarity}★ pada piti:", + "currentPity": "Pity {rarity}★ saat ini", "winRate": "Probabilitas mendapat item RateUP:", "charRate": "Probabilitas mendapat Karakter dibanding Senjata", "nonRateup": "(Item non-RateUP)", diff --git a/src/locales/it-IT.json b/src/locales/it-IT.json index 666cda3c..db5a6743 100644 --- a/src/locales/it-IT.json +++ b/src/locales/it-IT.json @@ -72,6 +72,7 @@ "baseRate": "{rarity}-Star Base Rate:", "maxPity": "{rarity}-Star Max Pity:", "hardPity": "Boost {rarity}-Star rate starts from pity:", + "currentPity": "{rarity}-Star Current Pity", "winRate": "Chance to get Featured Item:", "charRate": "Chance to get Character instead of Weapon", "nonRateup": "(Non RateUp Item)", diff --git a/src/locales/ja-JP.json b/src/locales/ja-JP.json index d48058c4..1a1ff88b 100644 --- a/src/locales/ja-JP.json +++ b/src/locales/ja-JP.json @@ -72,6 +72,7 @@ "baseRate": "★{rarity} 基礎出現確率:", "maxPity": "★{rarity} 天井:", "hardPity": "★{rarity} 確率上昇が始まる祈願連数:", + "currentPity": "{rarity}-Star Current Pity", "winRate": "ピックアップ獲得確率:", "charRate": "武器ではなくキャラクターを入手する確率", "nonRateup": "(すり抜け時)", diff --git a/src/locales/pt-BR.json b/src/locales/pt-BR.json index adc67f71..31103f7c 100644 --- a/src/locales/pt-BR.json +++ b/src/locales/pt-BR.json @@ -72,6 +72,7 @@ "baseRate": "{rarity}-Star Base Rate:", "maxPity": "{rarity}-Star Max Pity:", "hardPity": "Boost {rarity}-Star rate starts from pity:", + "currentPity": "{rarity}-Star Current Pity", "winRate": "Chance to get Featured Item:", "charRate": "Chance to get Character instead of Weapon", "nonRateup": "(Non RateUp Item)", diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json index 63ddf78a..98a4c282 100644 --- a/src/locales/ru-RU.json +++ b/src/locales/ru-RU.json @@ -73,6 +73,7 @@ "baseRate": "{rarity}-Star Base Rate:", "maxPity": "{rarity}-Star Max Pity:", "hardPity": "Boost {rarity}-Star rate starts from pity:", + "currentPity": "{rarity}-Star Current Pity", "winRate": "Chance to get Featured Item:", "charRate": "Chance to get Character instead of Weapon", "nonRateup": "(Non RateUp Item)", diff --git a/src/locales/th-TH.json b/src/locales/th-TH.json index 42f4dff8..5a7d86d1 100644 --- a/src/locales/th-TH.json +++ b/src/locales/th-TH.json @@ -72,6 +72,7 @@ "baseRate": "{rarity}-Star Base Rate:", "maxPity": "{rarity}-Star Max Pity:", "hardPity": "Boost {rarity}-Star rate starts from pity:", + "currentPity": "{rarity}-Star Current Pity", "winRate": "Chance to get Featured Item:", "charRate": "Chance to get Character instead of Weapon", "nonRateup": "(Non RateUp Item)", diff --git a/src/locales/vi-VN.json b/src/locales/vi-VN.json index 3bea5ca3..666daa2d 100644 --- a/src/locales/vi-VN.json +++ b/src/locales/vi-VN.json @@ -72,6 +72,7 @@ "baseRate": "{rarity}-Star Base Rate:", "maxPity": "{rarity}-Star Max Pity:", "hardPity": "Boost {rarity}-Star rate starts from pity:", + "currentPity": "{rarity}-Star Current Pity", "winRate": "Chance to get Featured Item:", "charRate": "Chance to get Character instead of Weapon", "nonRateup": "(Non RateUp Item)", diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json index f6485d50..21337eec 100644 --- a/src/locales/zh-CN.json +++ b/src/locales/zh-CN.json @@ -72,6 +72,7 @@ "baseRate": "{rarity}-Star Base Rate:", "maxPity": "{rarity}-Star Max Pity:", "hardPity": "Boost {rarity}-Star rate starts from pity:", + "currentPity": "{rarity}-Star Current Pity", "winRate": "Chance to get Featured Item:", "charRate": "Chance to get Character instead of Weapon", "nonRateup": "(Non RateUp Item)", diff --git a/src/routes/_wish/banner-card/_probability-editor.svelte b/src/routes/_wish/banner-card/_probability-editor.svelte index 93f817e7..eb1c140d 100644 --- a/src/routes/_wish/banner-card/_probability-editor.svelte +++ b/src/routes/_wish/banner-card/_probability-editor.svelte @@ -2,6 +2,7 @@ import { getContext } from 'svelte'; import { fade } from 'svelte/transition'; import { t } from 'svelte-i18n'; + import { localPity } from '$lib/store/localstore-manager'; import { getRate, setRate } from '$lib/helpers/gacha/probabilities'; import { playSfx } from '$lib/helpers/audio/audio'; import ButtonGeneral from '$lib/components/ButtonGeneral.svelte'; @@ -91,6 +92,12 @@ if (variable === 'hard5') hard5 = finalVal; } + // Current Pity Changer + if (variable.match('now')) { + if (variable === 'now4') localPity.set(`pity4-${type}`, val); + if (variable === 'now5') localPity.set(`pity5-${type}`, val); + } + setRate(type, variable, finalVal || 1); }; @@ -137,6 +144,19 @@ +
= 100 || !max5 || max5 <= 1}> +
+ {$t('editor.currentPity', { values: { rarity: 5 } })} +
+
+ changePity(e, 'now5')} + /> +
+
+
= 100 || max5 <= 1}>
{$t('editor.baseRate', { values: { rarity: 4 } })}
@@ -178,6 +198,19 @@
+
= 100 || !max5 || max5 <= 1}> +
+ {$t('editor.currentPity', { values: { rarity: 4 } })} +
+
+ changePity(e, 'now4')} + /> +
+
+ {#if type !== 'standard'}
{$t('editor.winRate')}
@@ -250,7 +283,7 @@ flex-direction: column; min-height: 100%; width: 100%; - font-size: 85%; + font-size: 80%; position: relative; } @@ -287,7 +320,7 @@ .footer { margin-top: auto; - padding: 1%; + padding: 0 1% 1%; text-align: right; } @@ -295,9 +328,9 @@ display: flex; align-items: center; width: 100%; - padding: 0.28% 0 0.28% 1%; + padding: 0.2% 0 0.2% 1%; border-bottom: rgba(20, 18, 15, 0.5) 1px solid; - transition: background 0.5s; + transition: background 0.25s; } .fullscreenEditor .item { @@ -328,7 +361,7 @@ } .col:nth-child(2) { - height: 2rem; + height: 1.8rem; flex-basis: 10%; min-width: 5rem; }