mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-26 09:19:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Less console logging

Browse Source 
Disables console logging for the rerolls list, to make the console more readable
This commit is contained in:
RedstonewolfX 2024-08-11 09:09:14 -04:00
parent c138d1b4e1
commit a7d9fc028e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modifier/modifier-type.ts
View File

@ -2042,14 +2042,14 @@ export function getModifierTypeFuncById(id: string): ModifierTypeFunc {
return modifierTypes[id]; return modifierTypes[id];
} }
export function getPlayerModifierTypeOptions(count: integer, party: PlayerPokemon[], modifierTiers?: ModifierTier[], scene?: BattleScene): ModifierTypeOption[] { export function getPlayerModifierTypeOptions(count: integer, party: PlayerPokemon[], modifierTiers?: ModifierTier[], scene?: BattleScene, shutUpBro?: boolean): ModifierTypeOption[] {
const options: ModifierTypeOption[] = []; const options: ModifierTypeOption[] = [];
const retryCount = Math.min(count * 5, 50); const retryCount = Math.min(count * 5, 50);
new Array(count).fill(0).map((_, i) => { new Array(count).fill(0).map((_, i) => {
let candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, modifierTiers?.length > i ? modifierTiers[i] : undefined, undefined, undefined, scene); let candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, modifierTiers?.length > i ? modifierTiers[i] : undefined, undefined, undefined, scene, shutUpBro);
let r = 0; let r = 0;
while (options.length && ++r < retryCount && options.filter(o => o.type.name === candidate.type.name || o.type.group === candidate.type.group).length) { while (options.length && ++r < retryCount && options.filter(o => o.type.name === candidate.type.name || o.type.group === candidate.type.group).length) {
candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, candidate.type.tier, candidate.upgradeCount, undefined, scene); candidate = getNewModifierTypeOption(party, ModifierPoolType.PLAYER, candidate.type.tier, candidate.upgradeCount, undefined, scene, shutUpBro);
} }
options.push(candidate); options.push(candidate);
}); });
@ -2138,7 +2138,7 @@ export function getDailyRunStarterModifiers(party: PlayerPokemon[], scene?: Batt
return ret; return ret;
} }
function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType, tier?: ModifierTier, upgradeCount?: integer, retryCount: integer = 0, scene?: BattleScene): ModifierTypeOption { function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType, tier?: ModifierTier, upgradeCount?: integer, retryCount: integer = 0, scene?: BattleScene, shutUpBro?: boolean): ModifierTypeOption {
const player = !poolType; const player = !poolType;
const pool = getModifierPoolForType(poolType); const pool = getModifierPoolForType(poolType);
let thresholds: object; let thresholds: object;
@ -2233,20 +2233,20 @@ function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType,
} }
if (player) { if (player) {
console.log(index, ignoredPoolIndexes[tier].filter(i => i <= index).length, ignoredPoolIndexes[tier]); if (!shutUpBro) console.log(index, ignoredPoolIndexes[tier].filter(i => i <= index).length, ignoredPoolIndexes[tier]);
} }
let modifierType: ModifierType = (pool[tier][index]).modifierType; let modifierType: ModifierType = (pool[tier][index]).modifierType;
if (modifierType instanceof ModifierTypeGenerator) { if (modifierType instanceof ModifierTypeGenerator) {
modifierType = (modifierType as ModifierTypeGenerator).generateType(party); modifierType = (modifierType as ModifierTypeGenerator).generateType(party);
if (modifierType === null) { if (modifierType === null) {
if (player) { if (player) {
console.log(ModifierTier[tier], upgradeCount); if (!shutUpBro) console.log(ModifierTier[tier], upgradeCount);
} }
return getNewModifierTypeOption(party, poolType, tier, upgradeCount, ++retryCount, scene); return getNewModifierTypeOption(party, poolType, tier, upgradeCount, ++retryCount, scene, shutUpBro);
} }
} }
console.log(modifierType, !player ? "(enemy)" : ""); if (!shutUpBro) console.log(modifierType, !player ? "(enemy)" : "");
return new ModifierTypeOption(modifierType as ModifierType, upgradeCount); return new ModifierTypeOption(modifierType as ModifierType, upgradeCount);
} }

6
src/phases.ts
View File

@ -6754,7 +6754,7 @@ export class SelectModifierPhase extends BattlePhase {
if (modifierOverride) { if (modifierOverride) {
//modifierCount.value = modifierOverride //modifierCount.value = modifierOverride
} }
const typeOptions: ModifierTypeOption[] = this.getModifierTypeOptions(modifierCount.value); const typeOptions: ModifierTypeOption[] = this.getModifierTypeOptions(modifierCount.value, true);
typeOptions.forEach((option, idx) => { typeOptions.forEach((option, idx) => {
//console.log(option.type.name) //console.log(option.type.name)
}) })
@ -7021,8 +7021,8 @@ export class SelectModifierPhase extends BattlePhase {
return ModifierPoolType.PLAYER; return ModifierPoolType.PLAYER;
} }
getModifierTypeOptions(modifierCount: integer): ModifierTypeOption[] { getModifierTypeOptions(modifierCount: integer, shutUpBro?: boolean): ModifierTypeOption[] {
return getPlayerModifierTypeOptions(modifierCount, this.scene.getParty(), this.scene.lockModifierTiers ? this.modifierTiers : undefined, this.scene); return getPlayerModifierTypeOptions(modifierCount, this.scene.getParty(), this.scene.lockModifierTiers ? this.modifierTiers : undefined, this.scene, shutUpBro);
} }
addModifier(modifier: Modifier): Promise<boolean> { addModifier(modifier: Modifier): Promise<boolean> {