mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-06 00:12:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Formatting amendments

Browse Source
This commit is contained in:
David Yang 2025-01-20 22:16:10 +08:00
parent 54b31d3c60
commit e0717f4ae5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ui/egg-gacha-ui-handler.ts
View File

@ -709,9 +709,13 @@ export default class EggGachaUiHandler extends MessageUiHandler {
} }
break; break;
case 5: case 5:
if (!globalScene.gameData.voucherCounts[VoucherType.REGULAR] && !globalScene.gameData.voucherCounts[VoucherType.PLUS] if (
&& !globalScene.gameData.voucherCounts[VoucherType.PREMIUM] && !globalScene.gameData.voucherCounts[VoucherType.GOLDEN] && !globalScene.gameData.voucherCounts[VoucherType.REGULAR]
!Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE) { && !globalScene.gameData.voucherCounts[VoucherType.PLUS]
&& !globalScene.gameData.voucherCounts[VoucherType.PREMIUM]
&& !globalScene.gameData.voucherCounts[VoucherType.GOLDEN]
&& !Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE
) {
error = true; error = true;
this.showError(i18next.t("egg:noVouchers")); this.showError(i18next.t("egg:noVouchers"));
} else if (globalScene.gameData.eggs.length < 99 || Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) { } else if (globalScene.gameData.eggs.length < 99 || Overrides.UNLIMITED_EGG_COUNT_OVERRIDE) {
@ -721,7 +725,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
if (!Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE) { if (!Overrides.EGG_FREE_GACHA_PULLS_OVERRIDE) {
const voucherTypes = [[ VoucherType.GOLDEN, 25 ], [ VoucherType.PREMIUM, 10 ], [ VoucherType.PLUS, 5 ], [ VoucherType.REGULAR, 1 ]]; const voucherTypes = [[ VoucherType.GOLDEN, 25 ], [ VoucherType.PREMIUM, 10 ], [ VoucherType.PLUS, 5 ], [ VoucherType.REGULAR, 1 ]];
voucherTypes.forEach(voucherType => { voucherTypes.forEach(voucherType => {
const vouchersUsed = Math.min(globalScene.gameData.voucherCounts[voucherType[0]], ~~(eggSpace / voucherType[1])); const vouchersUsed = Math.min(globalScene.gameData.voucherCounts[voucherType[0]], Math.floor(eggSpace / voucherType[1]));
this.consumeVouchers(voucherType[0], vouchersUsed); this.consumeVouchers(voucherType[0], vouchersUsed);
const pullsUsed = vouchersUsed * voucherType[1]; const pullsUsed = vouchersUsed * voucherType[1];
pulls += pullsUsed; pulls += pullsUsed;