mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-05 16:02:20 +02:00
fix error: Lock Capsule not locking rarities consistently
This commit is contained in:
parent
f11e65f550
commit
39937f0cc2
@ -3287,6 +3287,8 @@ export function getModifierTypeFuncById(id: string): ModifierTypeFunc {
|
|||||||
return modifierTypes[id];
|
return modifierTypes[id];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let lockModifierTiers: null | boolean = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generates modifier options for a {@linkcode SelectModifierPhase}
|
* Generates modifier options for a {@linkcode SelectModifierPhase}
|
||||||
* @param count Determines the number of items to generate
|
* @param count Determines the number of items to generate
|
||||||
@ -3312,6 +3314,7 @@ export function getPlayerModifierTypeOptions(
|
|||||||
const options: ModifierTypeOption[] = [];
|
const options: ModifierTypeOption[] = [];
|
||||||
const retryCount = Math.min(count * 5, 50);
|
const retryCount = Math.min(count * 5, 50);
|
||||||
if (!customModifierSettings) {
|
if (!customModifierSettings) {
|
||||||
|
lockModifierTiers = !!modifierTiers && modifierTiers.length >= count;
|
||||||
new Array(count).fill(0).map((_, i) => {
|
new Array(count).fill(0).map((_, i) => {
|
||||||
options.push(
|
options.push(
|
||||||
getModifierTypeOptionWithRetry(
|
getModifierTypeOptionWithRetry(
|
||||||
@ -3322,6 +3325,8 @@ export function getPlayerModifierTypeOptions(
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
// init lockModifierTiers
|
||||||
|
lockModifierTiers = null;
|
||||||
} else {
|
} else {
|
||||||
// Guaranteed mod options first
|
// Guaranteed mod options first
|
||||||
if (
|
if (
|
||||||
@ -3640,7 +3645,7 @@ function getNewModifierTypeOption(
|
|||||||
}
|
}
|
||||||
tier += upgradeCount;
|
tier += upgradeCount;
|
||||||
}
|
}
|
||||||
} else if (retryCount === 10 && tier) {
|
} else if (retryCount === 10 && tier && lockModifierTiers !== true) {
|
||||||
retryCount = 0;
|
retryCount = 0;
|
||||||
tier--;
|
tier--;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user