mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-06 08:22:16 +02:00
Compare commits
No commits in common. "655e3ba24c9ddd0f35a032f8debe71b8432e1fc8" and "dcbe479001cc355c25791f59965bf80e19009456" have entirely different histories.
655e3ba24c
...
dcbe479001
@ -198,7 +198,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
|
|||||||
"HEALING_CHARM": { name: "Heilungspin", description: "Erhöht die Effektivität von Heilungsattacken sowie Heilitems um 10% (Beleber ausgenommen)" },
|
"HEALING_CHARM": { name: "Heilungspin", description: "Erhöht die Effektivität von Heilungsattacken sowie Heilitems um 10% (Beleber ausgenommen)" },
|
||||||
"CANDY_JAR": { name: "Bonbonglas", description: "Erhöht die Anzahl der Level die ein Sonderbonbon erhöht um 1" },
|
"CANDY_JAR": { name: "Bonbonglas", description: "Erhöht die Anzahl der Level die ein Sonderbonbon erhöht um 1" },
|
||||||
|
|
||||||
"BERRY_POUCH": { name: "Beerentüte", description: "Fügt eine 30% Chance hinzu, dass Beeren nicht verbraucht werden" },
|
"BERRY_POUCH": { name: "Beerentüte", description: "Fügt eine 33% Chance hinzu, dass Beeren nicht verbraucht werden" },
|
||||||
|
|
||||||
"FOCUS_BAND": { name: "Fokusband", description: "Fügt eine 10% Chance hinzu, dass Angriffe die zur Kampfunfähigkeit führen mit 1 KP überlebt werden" },
|
"FOCUS_BAND": { name: "Fokusband", description: "Fügt eine 10% Chance hinzu, dass Angriffe die zur Kampfunfähigkeit führen mit 1 KP überlebt werden" },
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
|
|||||||
"HEALING_CHARM": { name: "Healing Charm", description: "Increases the effectiveness of HP restoring moves and items by 10% (excludes Revives)" },
|
"HEALING_CHARM": { name: "Healing Charm", description: "Increases the effectiveness of HP restoring moves and items by 10% (excludes Revives)" },
|
||||||
"CANDY_JAR": { name: "Candy Jar", description: "Increases the number of levels added by Rare Candy items by 1" },
|
"CANDY_JAR": { name: "Candy Jar", description: "Increases the number of levels added by Rare Candy items by 1" },
|
||||||
|
|
||||||
"BERRY_POUCH": { name: "Berry Pouch", description: "Adds a 30% chance that a used berry will not be consumed" },
|
"BERRY_POUCH": { name: "Berry Pouch", description: "Adds a 33% chance that a used berry will not be consumed" },
|
||||||
|
|
||||||
"FOCUS_BAND": { name: "Focus Band", description: "Adds a 10% chance to survive with 1 HP after being damaged enough to faint" },
|
"FOCUS_BAND": { name: "Focus Band", description: "Adds a 10% chance to survive with 1 HP after being damaged enough to faint" },
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
|
|||||||
"HEALING_CHARM": { name: "Amuleto curación", description: "Aumenta la efectividad de los movimientos y objetos de curacion de PS en un 10% (excepto revivir)" },
|
"HEALING_CHARM": { name: "Amuleto curación", description: "Aumenta la efectividad de los movimientos y objetos de curacion de PS en un 10% (excepto revivir)" },
|
||||||
"CANDY_JAR": { name: "Candy Jar", description: "Aumenta en 1 el número de niveles añadidos por los carameloraros" },
|
"CANDY_JAR": { name: "Candy Jar", description: "Aumenta en 1 el número de niveles añadidos por los carameloraros" },
|
||||||
|
|
||||||
"BERRY_POUCH": { name: "Saco Bayas", description: "Agrega un 30% de posibilidades de que una baya usada no se consuma" },
|
"BERRY_POUCH": { name: "Saco Bayas", description: "Agrega un 33% de posibilidades de que una baya usada no se consuma" },
|
||||||
|
|
||||||
"FOCUS_BAND": { name: "Cinta Focus", description: "Agrega un 10% de probabilidad de resistir un ataque que lo debilitaría" },
|
"FOCUS_BAND": { name: "Cinta Focus", description: "Agrega un 10% de probabilidad de resistir un ataque que lo debilitaría" },
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
|
|||||||
"HEALING_CHARM": { name: "Charme Soin", description: "Augmente de 10% l’efficacité des capacités et objets de soin de PV (hors Rappels)" },
|
"HEALING_CHARM": { name: "Charme Soin", description: "Augmente de 10% l’efficacité des capacités et objets de soin de PV (hors Rappels)" },
|
||||||
"CANDY_JAR": { name: "Bonbonnière", description: "Augmente de 1 le nombre de niveaux gagnés à l’utilisation d’un Super Bonbon" },
|
"CANDY_JAR": { name: "Bonbonnière", description: "Augmente de 1 le nombre de niveaux gagnés à l’utilisation d’un Super Bonbon" },
|
||||||
|
|
||||||
"BERRY_POUCH": { name: "Sac à Baies", description: "Ajoute 30% de chances qu’une Baie utilisée ne soit pas consommée" },
|
"BERRY_POUCH": { name: "Sac à Baies", description: "Ajoute 33% de chances qu’une Baie utilisée ne soit pas consommée" },
|
||||||
|
|
||||||
"FOCUS_BAND": { name: "Bandeau", description: "Ajoute 10% de chances de survivre avec 1 PV si les dégâts reçus pouvaient mettre K.O." },
|
"FOCUS_BAND": { name: "Bandeau", description: "Ajoute 10% de chances de survivre avec 1 PV si les dégâts reçus pouvaient mettre K.O." },
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
|
|||||||
"HEALING_CHARM": { name: "Curamuleto", description: "Aumenta del 10% l'efficacia delle mosse e degli oggetti che ripristinano i PS (escluse le rianimazioni)" },
|
"HEALING_CHARM": { name: "Curamuleto", description: "Aumenta del 10% l'efficacia delle mosse e degli oggetti che ripristinano i PS (escluse le rianimazioni)" },
|
||||||
"CANDY_JAR": { name: "Barattolo di caramelle", description: "Aumenta di 1 il numero di livelli aggiunti dalle Caramelle Rare" },
|
"CANDY_JAR": { name: "Barattolo di caramelle", description: "Aumenta di 1 il numero di livelli aggiunti dalle Caramelle Rare" },
|
||||||
|
|
||||||
"BERRY_POUCH": { name: "Porta Bacche", description: "Aggiunge il 30% di possibilità che una bacca usata non venga consumata" },
|
"BERRY_POUCH": { name: "Porta Bacche", description: "Aggiunge il 33% di possibilità che una bacca usata non venga consumata" },
|
||||||
|
|
||||||
"FOCUS_BAND": { name: "Bandana", description: "Chi ce l'ha ottiene il 10% di possibilità aggiuntivo di evitare un potenziale KO e rimanere con un solo PS" },
|
"FOCUS_BAND": { name: "Bandana", description: "Chi ce l'ha ottiene il 10% di possibilità aggiuntivo di evitare un potenziale KO e rimanere con un solo PS" },
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
|
|||||||
"HEALING_CHARM": { name: "Amuleto de Cura", description: "Aumenta a eficácia dos movimentos e itens que restauram PS em 10% (exceto Reanimador)" },
|
"HEALING_CHARM": { name: "Amuleto de Cura", description: "Aumenta a eficácia dos movimentos e itens que restauram PS em 10% (exceto Reanimador)" },
|
||||||
"CANDY_JAR": { name: "Pote de Doces", description: "Aumenta o número de níveis adicionados pelo Doce Raro em 1" },
|
"CANDY_JAR": { name: "Pote de Doces", description: "Aumenta o número de níveis adicionados pelo Doce Raro em 1" },
|
||||||
|
|
||||||
"BERRY_POUCH": { name: "Bolsa de Berries", description: "Adiciona uma chance de 30% de que uma berry usada não seja consumida" },
|
"BERRY_POUCH": { name: "Bolsa de Berries", description: "Adiciona uma chance de 33% de que uma berry usada não seja consumida" },
|
||||||
|
|
||||||
"FOCUS_BAND": { name: "Bandana", description: "Adiciona uma chance de 10% de sobreviver com 1 PS após ser danificado o suficiente para desmaiar" },
|
"FOCUS_BAND": { name: "Bandana", description: "Adiciona uma chance de 10% de sobreviver com 1 PS após ser danificado o suficiente para desmaiar" },
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
|
|||||||
"HEALING_CHARM": { name: "治愈护符", description: "HP回复量增加10% (含复活)" },
|
"HEALING_CHARM": { name: "治愈护符", description: "HP回复量增加10% (含复活)" },
|
||||||
"CANDY_JAR": { name: "糖果罐", description: "神奇糖果提供的升级额外增加1级" },
|
"CANDY_JAR": { name: "糖果罐", description: "神奇糖果提供的升级额外增加1级" },
|
||||||
|
|
||||||
"BERRY_POUCH": { name: "树果袋", description: "使用树果时有30%的几率不会消耗树果" },
|
"BERRY_POUCH": { name: "树果袋", description: "使用树果时有33%的几率不会消耗树果" },
|
||||||
|
|
||||||
"FOCUS_BAND": { name: "气势头带", description: "携带该道具的宝可梦有10%几率在受到\n攻击而将陷入濒死状态时,保留1点HP不陷入濒死状态" },
|
"FOCUS_BAND": { name: "气势头带", description: "携带该道具的宝可梦有10%几率在受到\n攻击而将陷入濒死状态时,保留1点HP不陷入濒死状态" },
|
||||||
|
|
||||||
|
@ -213,7 +213,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
|
|||||||
CANDY_JAR: { name: "糖果罐", description: "神奇糖果提供的升級提升1級" },
|
CANDY_JAR: { name: "糖果罐", description: "神奇糖果提供的升級提升1級" },
|
||||||
BERRY_POUCH: {
|
BERRY_POUCH: {
|
||||||
name: "樹果袋",
|
name: "樹果袋",
|
||||||
description: "使用樹果時有30%的幾率不會消耗樹果",
|
description: "使用樹果時有33%的幾率不會消耗樹果",
|
||||||
},
|
},
|
||||||
FOCUS_BAND: {
|
FOCUS_BAND: {
|
||||||
name: "氣勢頭帶",
|
name: "氣勢頭帶",
|
||||||
|
@ -1359,7 +1359,6 @@ const modifierPool: ModifierPool = {
|
|||||||
new WeightedModifierType(modifierTypes.EXP_BALANCE, 4),
|
new WeightedModifierType(modifierTypes.EXP_BALANCE, 4),
|
||||||
new WeightedModifierType(modifierTypes.TERA_ORB, (party: Pokemon[]) => Math.min(Math.max(Math.floor(party[0].scene.currentBattle.waveIndex / 50) * 2, 1), 4), 4),
|
new WeightedModifierType(modifierTypes.TERA_ORB, (party: Pokemon[]) => Math.min(Math.max(Math.floor(party[0].scene.currentBattle.waveIndex / 50) * 2, 1), 4), 4),
|
||||||
new WeightedModifierType(modifierTypes.VOUCHER, (party: Pokemon[], rerollCount: integer) => !party[0].scene.gameMode.isDaily ? Math.max(3 - rerollCount, 0) : 0, 3),
|
new WeightedModifierType(modifierTypes.VOUCHER, (party: Pokemon[], rerollCount: integer) => !party[0].scene.gameMode.isDaily ? Math.max(3 - rerollCount, 0) : 0, 3),
|
||||||
new WeightedModifierType(modifierTypes.WIDE_LENS, 4),
|
|
||||||
].map(m => {
|
].map(m => {
|
||||||
m.setTier(ModifierTier.ULTRA); return m;
|
m.setTier(ModifierTier.ULTRA); return m;
|
||||||
}),
|
}),
|
||||||
@ -1370,6 +1369,7 @@ const modifierPool: ModifierPool = {
|
|||||||
new WeightedModifierType(modifierTypes.SHELL_BELL, 3),
|
new WeightedModifierType(modifierTypes.SHELL_BELL, 3),
|
||||||
new WeightedModifierType(modifierTypes.BERRY_POUCH, 4),
|
new WeightedModifierType(modifierTypes.BERRY_POUCH, 4),
|
||||||
new WeightedModifierType(modifierTypes.GRIP_CLAW, 5),
|
new WeightedModifierType(modifierTypes.GRIP_CLAW, 5),
|
||||||
|
new WeightedModifierType(modifierTypes.WIDE_LENS, 4),
|
||||||
new WeightedModifierType(modifierTypes.BATON, 2),
|
new WeightedModifierType(modifierTypes.BATON, 2),
|
||||||
new WeightedModifierType(modifierTypes.SOUL_DEW, 8),
|
new WeightedModifierType(modifierTypes.SOUL_DEW, 8),
|
||||||
//new WeightedModifierType(modifierTypes.OVAL_CHARM, 6),
|
//new WeightedModifierType(modifierTypes.OVAL_CHARM, 6),
|
||||||
|
@ -1011,10 +1011,7 @@ export class BerryModifier extends PokemonHeldItemModifier {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getMaxHeldItemCount(pokemon: Pokemon): integer {
|
getMaxHeldItemCount(pokemon: Pokemon): integer {
|
||||||
if ([BerryType.LUM, BerryType.LEPPA, BerryType.SITRUS, BerryType.ENIGMA].includes(this.berryType)) {
|
return 10;
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
return 3;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1037,7 +1034,7 @@ export class PreserveBerryModifier extends PersistentModifier {
|
|||||||
|
|
||||||
apply(args: any[]): boolean {
|
apply(args: any[]): boolean {
|
||||||
if (!(args[1] as Utils.BooleanHolder).value) {
|
if (!(args[1] as Utils.BooleanHolder).value) {
|
||||||
(args[1] as Utils.BooleanHolder).value = (args[0] as Pokemon).randSeedInt(10) < this.getStackCount() * 3;
|
(args[1] as Utils.BooleanHolder).value = (args[0] as Pokemon).randSeedInt(this.getMaxStackCount(null)) < this.getStackCount();
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import BattleScene from "../battle-scene";
|
import BattleScene from "../battle-scene";
|
||||||
import { TrainerType } from "../data/enums/trainer-type";
|
import { TrainerType } from "../data/enums/trainer-type";
|
||||||
|
import { Achv, AchvTier, achvs } from "./achv";
|
||||||
import i18next from "../plugins/i18n";
|
import i18next from "../plugins/i18n";
|
||||||
import { Achv, AchvTier, achvs, getAchievementDescription } from "./achv";
|
|
||||||
|
|
||||||
export enum VoucherType {
|
export enum VoucherType {
|
||||||
REGULAR,
|
REGULAR,
|
||||||
@ -96,7 +96,7 @@ const voucherAchvs: Achv[] = [ achvs.CLASSIC_VICTORY ];
|
|||||||
: achv.score >= 75
|
: achv.score >= 75
|
||||||
? VoucherType.PLUS
|
? VoucherType.PLUS
|
||||||
: VoucherType.REGULAR;
|
: VoucherType.REGULAR;
|
||||||
vouchers[achv.id] = new Voucher(voucherType, getAchievementDescription(achv.localizationKey));
|
vouchers[achv.id] = new Voucher(voucherType, achv.description);
|
||||||
}
|
}
|
||||||
|
|
||||||
const bossTrainerTypes = Object.keys(trainerConfigs)
|
const bossTrainerTypes = Object.keys(trainerConfigs)
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
import BattleScene from "../battle-scene";
|
import BattleScene from "../battle-scene";
|
||||||
import { Button } from "../enums/buttons";
|
|
||||||
import i18next from "../plugins/i18n";
|
|
||||||
import { Voucher, getVoucherTypeIcon, getVoucherTypeName, vouchers } from "../system/voucher";
|
import { Voucher, getVoucherTypeIcon, getVoucherTypeName, vouchers } from "../system/voucher";
|
||||||
import MessageUiHandler from "./message-ui-handler";
|
import MessageUiHandler from "./message-ui-handler";
|
||||||
import { TextStyle, addTextObject } from "./text";
|
import { TextStyle, addTextObject } from "./text";
|
||||||
import { Mode } from "./ui";
|
import { Mode } from "./ui";
|
||||||
import { addWindow } from "./ui-theme";
|
import { addWindow } from "./ui-theme";
|
||||||
|
import {Button} from "../enums/buttons";
|
||||||
|
import i18next from "../plugins/i18n";
|
||||||
|
|
||||||
const itemRows = 4;
|
const itemRows = 4;
|
||||||
const itemCols = 17;
|
const itemCols = 17;
|
||||||
|
Loading…
Reference in New Issue
Block a user