cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to plains arena pool

pull/1/head
Flashfyre 2023-03-29 12:23:52 -04:00
parent a739a1666f
commit 27c0b64a3f
8 changed files with 134 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/arena.ts
View File

@ -33,28 +33,34 @@ enum PoolTier {
export class Arena { export class Arena {
private scene: BattleScene; private scene: BattleScene;
public type: integer; public arenaType: integer;
private bgm: string; private bgm: string;
private pokemonPool: PokemonSpecies[][]; private pokemonPool: PokemonSpecies[][];
constructor(scene: BattleScene, type: integer, bgm: string) { constructor(scene: BattleScene, arenaType: integer, bgm: string) {
this.scene = scene; this.scene = scene;
this.type = type; this.arenaType = arenaType;
this.bgm = bgm; this.bgm = bgm;
const predicate = arenaPoolPredicates[type] || (() => {}); if (arenaPools.hasOwnProperty(arenaType))
this.pokemonPool = arenaPools[arenaType];
else {
const predicate = arenaPoolPredicates[arenaType] || (() => {});
this.pokemonPool = Utils.getEnumValues(PoolTier).map(t => allSpecies.filter(p => predicate(p, t))); this.pokemonPool = Utils.getEnumValues(PoolTier).map(t => allSpecies.filter(p => predicate(p, t)));
} }
}
randomSpecies(waveIndex: integer): PokemonSpecies { randomSpecies(waveIndex: integer): PokemonSpecies {
const tier: PoolTier = Utils.randInt(5); const tierValue = Utils.randInt(512);
const tier = tierValue >= 156 ? PoolTier.COMMON : tierValue >= 32 ? PoolTier.UNCOMMON : tierValue >= 6 ? PoolTier.RARE : tierValue >= 1 ? PoolTier.ULTRA_RARE : PoolTier.LEGENDARY;
const tierPool = this.pokemonPool[tier]; const tierPool = this.pokemonPool[tier];
let ret: PokemonSpecies; let ret: PokemonSpecies;
if (!tierPool.length) if (!tierPool.length)
ret = this.scene.randomSpecies(); ret = this.scene.randomSpecies();
else else {
ret = tierPool[Utils.randInt(tierPool.length)]; const species = tierPool[Utils.randInt(tierPool.length)];
ret = species instanceof PokemonSpecies ? species : getPokemonSpecies(species);
}
const newSpeciesId = ret.getSpeciesForLevel(5); const newSpeciesId = ret.getSpeciesForLevel(5);
if (newSpeciesId !== ret.speciesId) { if (newSpeciesId !== ret.speciesId) {
console.log('Replaced', Species[ret.speciesId], 'with', Species[newSpeciesId]); console.log('Replaced', Species[ret.speciesId], 'with', Species[newSpeciesId]);
@ -69,6 +75,16 @@ export class Arena {
} }
} }
const arenaPools = {
[ArenaType.PLAINS]: {
[PoolTier.COMMON]: [ Species.CATERPIE, Species.METAPOD, Species.WEEDLE, Species.KAKUNA, Species.PIDGEY, Species.RATTATA, Species.SPEAROW, Species.SENTRET, Species.HOOTHOOT, Species.HOPPIP, Species.SUNKERN, Species.POOCHYENA, Species.ZIGZAGOON, Species.WURMPLE, Species.SILCOON, Species.CASCOON, Species.TAILLOW, Species.STARLY, Species.BIDOOF, Species.KRICKETOT, Species.PATRAT, Species.LILLIPUP, Species.PIDOVE, Species.COTTONEE, Species.PETILIL, Species.MINCCINO, Species.FOONGUS ],
[PoolTier.UNCOMMON]: [ Species.EKANS, Species.NIDORAN_F, Species.NIDORAN_M, Species.PARAS, Species.VENONAT, Species.MEOWTH, Species.BELLSPROUT, Species.LEDYBA, Species.SPINARAK, Species.PINECO, Species.LOTAD, Species.SEEDOT, Species.SHROOMISH, Species.NINCADA, Species.AZURILL, Species.WHISMUR, Species.SKITTY, Species.GULPIN, Species.BUDEW, Species.BURMY, Species.COMBEE, Species.CHERUBI, Species.VENIPEDE ],
[PoolTier.RARE]: [ Species.PICHU, Species.CLEFFA, Species.IGGLYBUFF, Species.WOOPER, Species.RALTS, Species.SURSKIT, Species.SLAKOTH, Species.BARBOACH, Species.DUCKLETT ],
[PoolTier.ULTRA_RARE]: [ Species.EEVEE, Species.TOGEPI, Species.TYROGUE ],
[PoolTier.LEGENDARY]: [ Species.DITTO ]
}
};
const arenaPoolPredicates = { const arenaPoolPredicates = {
[ArenaType.PLAINS]: (p, t) => { [ArenaType.PLAINS]: (p, t) => {
if (p.isOfType(Type.GHOST) || p.isOfType(Type.STEEL) || p.isOfType(Type.ICE) || p.isOfType(Type.DRAGON)) if (p.isOfType(Type.GHOST) || p.isOfType(Type.STEEL) || p.isOfType(Type.ICE) || p.isOfType(Type.DRAGON))

6
src/auto-play.ts
View File

@ -66,7 +66,7 @@ export function initAutoPlay(speed: number) {
let bestPartyMemberEffectiveness = 0.5; let bestPartyMemberEffectiveness = 0.5;
for (let p = 0; p < party.length; p++) { for (let p = 0; p < party.length; p++) {
const pokemon = party[p]; const pokemon = party[p];
if ((pokemon.hp / pokemon.getMaxHp()) <= 0.4) if (pokemon.getHpRatio() <= 0.4)
continue; continue;
const effectiveness = getMaxMoveEffectiveness(pokemon, enemyPokemon) / getMaxMoveEffectiveness(enemyPokemon, pokemon); const effectiveness = getMaxMoveEffectiveness(pokemon, enemyPokemon) / getMaxMoveEffectiveness(enemyPokemon, pokemon);
if (effectiveness > bestPartyMemberEffectiveness) { if (effectiveness > bestPartyMemberEffectiveness) {
@ -199,8 +199,8 @@ export function initAutoPlay(speed: number) {
const party = thisArg.getParty(); const party = thisArg.getParty();
const modifierTypes = modifierSelectUiHandler.options.map(o => o.modifierType); const modifierTypes = modifierSelectUiHandler.options.map(o => o.modifierType);
const faintedPartyMemberIndex = party.findIndex(p => !p.hp); const faintedPartyMemberIndex = party.findIndex(p => !p.hp);
const lowHpPartyMemberIndex = party.findIndex(p => (p.hp / p.getMaxHp()) <= 0.5); const lowHpPartyMemberIndex = party.findIndex(p => p.getHpRatio() <= 0.5);
const criticalHpPartyMemberIndex = party.findIndex(p => (p.hp / p.getMaxHp()) <= 0.25); const criticalHpPartyMemberIndex = party.findIndex(p => p.getHpRatio() <= 0.25);
let optionIndex = tryGetBestModifier(modifierTypes, (modifierType: ModifierType) => { let optionIndex = tryGetBestModifier(modifierTypes, (modifierType: ModifierType) => {
if (modifierType instanceof PokemonHpRestoreModifierType) { if (modifierType instanceof PokemonHpRestoreModifierType) {

58
src/battle-info.ts
View File

@ -82,47 +82,47 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
} }
} }
initInfo(battler: Pokemon) { initInfo(pokemon: Pokemon) {
this.nameText.setText(battler.name); this.nameText.setText(pokemon.name);
this.lastName = battler.species.name; this.lastName = pokemon.species.name;
this.hpBar.setScale(battler.hp / battler.getMaxHp(), 1); this.hpBar.setScale(pokemon.getHpRatio(), 1);
if (this.player) if (this.player)
this.setHpNumbers(battler.hp, battler.getMaxHp()); this.setHpNumbers(pokemon.hp, pokemon.getMaxHp());
this.lastHp = battler.hp; this.lastHp = pokemon.hp;
this.lastHpFrame = this.hpBar.scaleX > 0.5 ? 'high' : this.hpBar.scaleX > 0.25 ? 'medium' : 'low'; this.lastHpFrame = this.hpBar.scaleX > 0.5 ? 'high' : this.hpBar.scaleX > 0.25 ? 'medium' : 'low';
this.lastMaxHp = battler.getMaxHp(); this.lastMaxHp = pokemon.getMaxHp();
this.setLevel(battler.level); this.setLevel(pokemon.level);
this.lastLevel = battler.level; this.lastLevel = pokemon.level;
if (this.player) { if (this.player) {
this.expBar.setScale(battler.levelExp / getLevelTotalExp(battler.level, battler.species.growthRate), 1); this.expBar.setScale(pokemon.levelExp / getLevelTotalExp(pokemon.level, pokemon.species.growthRate), 1);
this.lastExp = battler.exp; this.lastExp = pokemon.exp;
this.lastLevelExp = battler.levelExp; this.lastLevelExp = pokemon.levelExp;
} }
} }
updateInfo(battler: Pokemon, callback?: Function) { updateInfo(pokemon: Pokemon, callback?: Function) {
if (!this.scene) if (!this.scene)
return; return;
if (this.lastName !== battler.species.name) { if (this.lastName !== pokemon.species.name) {
this.nameText.setText(battler.name); this.nameText.setText(pokemon.name);
this.lastName = battler.species.name; this.lastName = pokemon.species.name;
} }
const updatePokemonHp = () => { const updatePokemonHp = () => {
const duration = Utils.clampInt(Math.abs((this.lastHp) - battler.hp) * 5, 250, 5000); const duration = Utils.clampInt(Math.abs((this.lastHp) - pokemon.hp) * 5, 250, 5000);
this.scene.tweens.add({ this.scene.tweens.add({
targets: this.hpBar, targets: this.hpBar,
ease: 'Sine.easeOut', ease: 'Sine.easeOut',
scaleX: battler.hp / battler.getMaxHp(), scaleX: pokemon.getHpRatio(),
duration: duration, duration: duration,
onUpdate: () => { onUpdate: () => {
if (this.player && this.lastHp !== battler.hp) { if (this.player && this.lastHp !== pokemon.hp) {
const tweenHp = Math.ceil(this.hpBar.scaleX * battler.getMaxHp()); const tweenHp = Math.ceil(this.hpBar.scaleX * pokemon.getMaxHp());
this.setHpNumbers(tweenHp, battler.getMaxHp()) this.setHpNumbers(tweenHp, pokemon.getMaxHp())
this.lastHp = tweenHp; this.lastHp = tweenHp;
} }
@ -140,20 +140,20 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
} }
}); });
if (!this.player) if (!this.player)
this.lastHp = battler.hp; this.lastHp = pokemon.hp;
this.lastMaxHp = battler.getMaxHp(); this.lastMaxHp = pokemon.getMaxHp();
}; };
if (this.player && this.lastExp !== battler.exp) { if (this.player && this.lastExp !== pokemon.exp) {
const originalCallback = callback; const originalCallback = callback;
callback = () => this.updatePokemonExp(battler, originalCallback); callback = () => this.updatePokemonExp(pokemon, originalCallback);
} }
if (this.lastHp !== battler.hp || this.lastMaxHp !== battler.getMaxHp()) if (this.lastHp !== pokemon.hp || this.lastMaxHp !== pokemon.getMaxHp())
updatePokemonHp(); updatePokemonHp();
else if (!this.player && this.lastLevel !== battler.level) { else if (!this.player && this.lastLevel !== pokemon.level) {
this.setLevel(battler.level); this.setLevel(pokemon.level);
this.lastLevel = battler.level; this.lastLevel = pokemon.level;
if (callback) if (callback)
callback(); callback();
} else if (callback) } else if (callback)

13
src/battle-phase.ts
View File

@ -6,7 +6,7 @@ import { Mode } from './ui/ui';
import { Command } from "./ui/command-ui-handler"; import { Command } from "./ui/command-ui-handler";
import { interp } from "./temp_interpreter"; import { interp } from "./temp_interpreter";
import { Stat } from "./pokemon-stat"; import { Stat } from "./pokemon-stat";
import { ExpBoosterModifier, getNewModifierType, PokemonBaseStatModifier as PokemonBaseStatModifier, PokemonModifierType } from "./modifier"; import { ExpBoosterModifier, getNewModifierType, PokemonBaseStatModifier, PokemonModifierType, regenerateModifierPoolThresholds } from "./modifier";
import PartyUiHandler from "./ui/party-ui-handler"; import PartyUiHandler from "./ui/party-ui-handler";
import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getTintColor as getPokeballTintColor, PokeballType } from "./pokeball"; import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getTintColor as getPokeballTintColor, PokeballType } from "./pokeball";
import { pokemonLevelMoves } from "./pokemon-level-moves"; import { pokemonLevelMoves } from "./pokemon-level-moves";
@ -332,7 +332,7 @@ abstract class MovePhase extends BattlePhase {
this.move = move; this.move = move;
} }
abstract getDamagePhase(): MoveEffectPhase; abstract getEffectPhase(): MoveEffectPhase;
canMove(): boolean { canMove(): boolean {
return !!this.pokemon.hp; return !!this.pokemon.hp;
@ -347,7 +347,7 @@ abstract class MovePhase extends BattlePhase {
console.log(this.pokemon.moveset); console.log(this.pokemon.moveset);
this.scene.ui.showText(`${this.pokemon.name} used\n${this.move.getName()}!`, null, () => this.end(), 500); this.scene.ui.showText(`${this.pokemon.name} used\n${this.move.getName()}!`, null, () => this.end(), 500);
if (this.move.getMove().category !== MOVE_CATEGORY.STATUS) if (this.move.getMove().category !== MOVE_CATEGORY.STATUS)
this.scene.unshiftPhase(this.getDamagePhase()); this.scene.unshiftPhase(this.getEffectPhase());
} }
} }
@ -356,7 +356,7 @@ export class PlayerMovePhase extends MovePhase {
super(scene, pokemon, move); super(scene, pokemon, move);
} }
getDamagePhase(): MoveEffectPhase { getEffectPhase(): MoveEffectPhase {
return new PlayerMoveEffectPhase(this.scene, this.move); return new PlayerMoveEffectPhase(this.scene, this.move);
} }
} }
@ -366,7 +366,7 @@ export class EnemyMovePhase extends MovePhase {
super(scene, pokemon, move); super(scene, pokemon, move);
} }
getDamagePhase(): MoveEffectPhase { getEffectPhase(): MoveEffectPhase {
return new EnemyMoveEffectPhase(this.scene, this.move); return new EnemyMoveEffectPhase(this.scene, this.move);
} }
} }
@ -756,7 +756,8 @@ export class SelectModifierPhase extends BattlePhase {
start() { start() {
super.start(); super.start();
const types = [ getNewModifierType(), getNewModifierType(), getNewModifierType() ]; regenerateModifierPoolThresholds(this.scene.getParty());
const types = [ getNewModifierType(), getNewModifierType(), getNewModifierType(), getNewModifierType(), getNewModifierType(), getNewModifierType() ];
this.scene.ui.setMode(Mode.MODIFIER_SELECT, types, (cursor: integer) => { this.scene.ui.setMode(Mode.MODIFIER_SELECT, types, (cursor: integer) => {
if (cursor < 0) { if (cursor < 0) {

10
src/battle-scene.ts
View File

@ -12,7 +12,7 @@ import { initAutoPlay } from './auto-play';
export default class BattleScene extends Phaser.Scene { export default class BattleScene extends Phaser.Scene {
private auto: boolean; private auto: boolean;
private autoSpeed: integer = 10; private autoSpeed: integer = 3;
private phaseQueue: Array<BattlePhase>; private phaseQueue: Array<BattlePhase>;
private phaseQueuePrepend: Array<BattlePhase>; private phaseQueuePrepend: Array<BattlePhase>;
@ -198,10 +198,10 @@ export default class BattleScene extends Phaser.Scene {
this.arena = arena; this.arena = arena;
this.arenaBg = this.add.image(0, 0, `arena_${Utils.padInt(arena.type, 2)}`); this.arenaBg = this.add.image(0, 0, `arena_${Utils.padInt(arena.arenaType, 2)}`);
this.arenaPlayer = this.add.image(340, 20, `arena_${Utils.padInt(arena.type, 2)}a`); this.arenaPlayer = this.add.image(340, 20, `arena_${Utils.padInt(arena.arenaType, 2)}a`);
this.arenaEnemy = this.add.image(-240, 13, `arena_${Utils.padInt(arena.type, 2)}b`); this.arenaEnemy = this.add.image(-240, 13, `arena_${Utils.padInt(arena.arenaType, 2)}b`);
this.arenaEnemy2 = this.add.image(-240, 13, `arena_${Utils.padInt(arena.type, 2)}b`); this.arenaEnemy2 = this.add.image(-240, 13, `arena_${Utils.padInt(arena.arenaType, 2)}b`);
[this.arenaBg, this.arenaPlayer, this.arenaEnemy, this.arenaEnemy2].forEach(a => { [this.arenaBg, this.arenaPlayer, this.arenaEnemy, this.arenaEnemy2].forEach(a => {
a.setOrigin(0, 0); a.setOrigin(0, 0);

69
src/modifier.ts
View File

@ -232,7 +232,7 @@ export class PokemonHpRestoreModifier extends ConsumablePokemonModifier {
apply(args: any[]): boolean { apply(args: any[]): boolean {
const pokemon = args[0] as Pokemon; const pokemon = args[0] as Pokemon;
pokemon.hp = Math.min(pokemon.hp + (this.restorePercent * 0.01) * pokemon.getMaxHp(), pokemon.getMaxHp()); pokemon.hp = Math.min(pokemon.hp + Math.max((this.restorePercent * 0.01) * pokemon.getMaxHp(), this.restorePercent), pokemon.getMaxHp());
return true; return true;
} }
@ -338,7 +338,7 @@ export class PokemonHpRestoreModifierType extends PokemonModifierType {
protected restorePercent: integer; protected restorePercent: integer;
constructor(name: string, restorePercent: integer, iconImage?: string) { constructor(name: string, restorePercent: integer, iconImage?: string) {
super(name, `Restore ${restorePercent}% HP for one POKéMON`, (_type, args) => new PokemonHpRestoreModifier(this, args[0], this.restorePercent), super(name, `Restore ${restorePercent} HP or ${restorePercent}% HP for one POKéMON, whichever is higher`, (_type, args) => new PokemonHpRestoreModifier(this, args[0], this.restorePercent),
(pokemon: PlayerPokemon) => { (pokemon: PlayerPokemon) => {
if (pokemon.hp >= pokemon.getMaxHp()) if (pokemon.hp >= pokemon.getMaxHp())
return PartyUiHandler.NoEffectMessage; return PartyUiHandler.NoEffectMessage;
@ -372,21 +372,17 @@ export class PokemonBaseStatBoosterModifierType extends PokemonModifierType {
} }
} }
class AllPokemonHpRestoreModifierType extends ModifierType { class AllPokemonFullHpRestoreModifierType extends ModifierType {
private restorePercent: integer; constructor(name: string, iconImage?: string) {
super(name, `Restore 100% HP for all POKéMON`, (_type, _args) => new PokemonHpRestoreModifier(this, -1, 100), iconImage);
constructor(name: string, restorePercent: integer, iconImage?: string) {
super(name, `Restore ${restorePercent}% HP for all POKéMON`, (_type, _args) => new PokemonHpRestoreModifier(this, -1, this.restorePercent), iconImage);
this.restorePercent = restorePercent;
} }
} }
class WeightedModifierType { class WeightedModifierType {
public modifierType: ModifierType; public modifierType: ModifierType;
public weight: integer; public weight: integer | Function;
constructor(modifierType: ModifierType, weight: integer) { constructor(modifierType: ModifierType, weight: integer | Function) {
this.modifierType = modifierType; this.modifierType = modifierType;
this.weight = weight; this.weight = weight;
} }
@ -399,8 +395,15 @@ class WeightedModifierType {
const modifierPool = { const modifierPool = {
[ModifierTier.COMMON]: [ [ModifierTier.COMMON]: [
new WeightedModifierType(new AddPokeballModifierType(PokeballType.POKEBALL, 5, 'pb'), 2), new WeightedModifierType(new AddPokeballModifierType(PokeballType.POKEBALL, 5, 'pb'), 2),
new WeightedModifierType(new PokemonHpRestoreModifierType('POTION', 20), 3), new WeightedModifierType(new PokemonHpRestoreModifierType('POTION', 20), (party: Array<PlayerPokemon>) => {
new PokemonHpRestoreModifierType('SUPER POTION', 50), const thresholdPartyMemberCount = party.filter(p => p.getHpRatio() <= 0.9).length;
console.log(thresholdPartyMemberCount, party.map(p => p.getHpRatio()));
return thresholdPartyMemberCount;
}),
new WeightedModifierType(new PokemonHpRestoreModifierType('SUPER POTION', 50), (party: Array<PlayerPokemon>) => {
const thresholdPartyMemberCount = party.filter(p => p.getHpRatio() <= 0.75).length;
return Math.ceil(thresholdPartyMemberCount / 3);
}),
new PokemonBaseStatBoosterModifierType('HP-UP', Stat.HP), new PokemonBaseStatBoosterModifierType('HP-UP', Stat.HP),
new PokemonBaseStatBoosterModifierType('PROTEIN', Stat.ATK), new PokemonBaseStatBoosterModifierType('PROTEIN', Stat.ATK),
new PokemonBaseStatBoosterModifierType('IRON', Stat.DEF), new PokemonBaseStatBoosterModifierType('IRON', Stat.DEF),
@ -410,12 +413,21 @@ const modifierPool = {
].map(m => { m.setTier(ModifierTier.COMMON); return m; }), ].map(m => { m.setTier(ModifierTier.COMMON); return m; }),
[ModifierTier.GREAT]: [ [ModifierTier.GREAT]: [
new AddPokeballModifierType(PokeballType.GREAT_BALL, 5, 'gb'), new AddPokeballModifierType(PokeballType.GREAT_BALL, 5, 'gb'),
new PokemonReviveModifierType('REVIVE', 50), new WeightedModifierType(new PokemonReviveModifierType('REVIVE', 50), (party: Array<PlayerPokemon>) => {
new PokemonHpRestoreModifierType('HYPER POTION', 100) const faintedPartyMemberCount = party.filter(p => !p.hp).length;
return faintedPartyMemberCount;
}),
new WeightedModifierType(new PokemonHpRestoreModifierType('HYPER POTION', 80), (party: Array<PlayerPokemon>) => {
const thresholdPartyMemberCount = party.filter(p => p.getHpRatio() <= 0.6).length;
return Math.ceil(thresholdPartyMemberCount / 3);
})
].map(m => { m.setTier(ModifierTier.GREAT); return m; }), ].map(m => { m.setTier(ModifierTier.GREAT); return m; }),
[ModifierTier.ULTRA]: [ [ModifierTier.ULTRA]: [
new AddPokeballModifierType(PokeballType.ULTRA_BALL, 5, 'ub'), new AddPokeballModifierType(PokeballType.ULTRA_BALL, 5, 'ub'),
new AllPokemonHpRestoreModifierType('MAX POTION', 100), new WeightedModifierType(new AllPokemonFullHpRestoreModifierType('MAX POTION'), (party: Array<PlayerPokemon>) => {
const thresholdPartyMemberCount = party.filter(p => p.getHpRatio() <= 0.5).length;
return Math.ceil(thresholdPartyMemberCount / 3);
}),
new ModifierType('LUCKY EGG', 'Increases gain of EXP. Points by 25%', (type, _args) => new ExpBoosterModifier(type)) new ModifierType('LUCKY EGG', 'Increases gain of EXP. Points by 25%', (type, _args) => new ExpBoosterModifier(type))
].map(m => { m.setTier(ModifierTier.ULTRA); return m; }), ].map(m => { m.setTier(ModifierTier.ULTRA); return m; }),
[ModifierTier.MASTER]: [ [ModifierTier.MASTER]: [
@ -424,18 +436,36 @@ const modifierPool = {
].map(m => { m.setTier(ModifierTier.MASTER); return m; }) ].map(m => { m.setTier(ModifierTier.MASTER); return m; })
}; };
const modifierPoolThresholds = Object.fromEntries(new Map(Object.keys(modifierPool).map(t => { let modifierPoolThresholds = {};
let ignoredPoolIndexes = {};
export function regenerateModifierPoolThresholds(party: Array<PlayerPokemon>) {
ignoredPoolIndexes = {};
modifierPoolThresholds = Object.fromEntries(new Map(Object.keys(modifierPool).map(t => {
ignoredPoolIndexes[t] = [];
const thresholds = new Map(); const thresholds = new Map();
let i = 0; let i = 0;
modifierPool[t].reduce((total: integer, modifierType: ModifierType | WeightedModifierType) => { modifierPool[t].reduce((total: integer, modifierType: ModifierType | WeightedModifierType) => {
total += modifierType instanceof WeightedModifierType ? (modifierType as WeightedModifierType).weight : 1; if (modifierType instanceof WeightedModifierType) {
const weightedModifierType = modifierType as WeightedModifierType;
const weight = weightedModifierType.weight instanceof Function
? (weightedModifierType.weight as Function)(party)
: weightedModifierType.weight as integer;
if (weight)
total += weight;
else {
ignoredPoolIndexes[t].push(i++);
return total;
}
} else
total++;
thresholds.set(total, i++); thresholds.set(total, i++);
return total; return total;
}, 0); }, 0);
return [ t, Object.fromEntries(thresholds) ] return [ t, Object.fromEntries(thresholds) ]
}))); })));
console.log(modifierPoolThresholds) console.log(modifierPoolThresholds)
}
export function getNewModifierType(): ModifierType { export function getNewModifierType(): ModifierType {
const tierValue = Utils.randInt(256); const tierValue = Utils.randInt(256);
@ -451,6 +481,7 @@ export function getNewModifierType(): ModifierType {
break; break;
} }
} }
console.log(index, ignoredPoolIndexes[tier].filter(i => i <= index).length, ignoredPoolIndexes[tier])
let modifierType: ModifierType | WeightedModifierType = modifierPool[tier][index]; let modifierType: ModifierType | WeightedModifierType = modifierPool[tier][index];
if (modifierType instanceof WeightedModifierType) if (modifierType instanceof WeightedModifierType)
return (modifierType as WeightedModifierType).modifierType; return (modifierType as WeightedModifierType).modifierType;

7
src/pokemon.ts
View File

@ -222,6 +222,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return this.stats[Stat.HP]; return this.stats[Stat.HP];
} }
getHpRatio() {
return Math.floor((this.hp / this.getMaxHp()) * 100) / 100;
}
generateAndPopulateMoveset() { generateAndPopulateMoveset() {
this.moveset = []; this.moveset = [];
const movePool = []; const movePool = [];
@ -450,7 +454,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
// Gen 1-4 formula // Gen 1-4 formula
// return ((this.pokemon.baseExp * this.level) / 7) * (1 / 1) // return ((this.pokemon.baseExp * this.level) / 7) * (1 / 1)
// TODO: Update for exp share // TODO: Update for exp share
return Math.floor(((this.species.baseExp * this.level) / 5) * (1 / 1) * ((Math.round(Math.sqrt(2 * this.level + 10)) * Math.pow(2 * this.level + 10, 2)) / (Math.round(Math.sqrt(this.level + victorLevel + 10)) * Math.pow(this.level + victorLevel + 10, 2)))) + 1; const constantMultiplier = 4;
return Math.floor(((this.species.baseExp * this.level) / 5) * (1 / 1) * constantMultiplier * ((Math.round(Math.sqrt(2 * this.level + 10)) * Math.pow(2 * this.level + 10, 2)) / (Math.round(Math.sqrt(this.level + victorLevel + 10)) * Math.pow(this.level + victorLevel + 10, 2)))) + 1;
} }
tint(color: number, alpha?: number, duration?: integer, ease?: string) { tint(color: number, alpha?: number, duration?: integer, ease?: string) {

2
src/ui/party-ui-handler.ts
View File

@ -285,7 +285,7 @@ class PartySlot extends Phaser.GameObjects.Container {
slotHpBar.setPositionRelative(slotBg, this.slotIndex ? 72 : 8, this.slotIndex ? 7 : 31); slotHpBar.setPositionRelative(slotBg, this.slotIndex ? 72 : 8, this.slotIndex ? 7 : 31);
slotHpBar.setOrigin(0, 0); slotHpBar.setOrigin(0, 0);
const hpRatio = this.pokemon.hp / this.pokemon.getMaxHp(); const hpRatio = this.pokemon.getHpRatio();
const slotHpOverlay = this.scene.add.sprite(0, 0, 'party_slot_hp_overlay', hpRatio > 0.5 ? 'high' : hpRatio > 0.25 ? 'medium' : 'low'); const slotHpOverlay = this.scene.add.sprite(0, 0, 'party_slot_hp_overlay', hpRatio > 0.5 ? 'high' : hpRatio > 0.25 ? 'medium' : 'low');
slotHpOverlay.setPositionRelative(slotHpBar, 16, 2); slotHpOverlay.setPositionRelative(slotHpBar, 16, 2);