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

Compare commits

base: mika:5f82449120b16290a812ac964e38f0327c33e245
Branches Tags
mika:main
mika:beta
mika:modifier-rework
mika:minor-adds
mika:wild-ghost-goo
mika:gh-pages
mika:frog/dev
mika:2024-12-3-balanced-friendship
mika:2024-11-17-carpe-diem
mika:2024-10-26-halloween
mika:2024-09-07-egg-summary
mika:2024-09-27-mystery-encounter
mika:2024-08-16-august-variant-update
mika:2024-09-01-run-history
mika:beginning
..
compare: mika:a2996cdd6689882396c14aa4a7687dbd1fd64607
Branches Tags
mika:beta
mika:modifier-rework
mika:minor-adds
mika:wild-ghost-goo
mika:gh-pages
mika:main
mika:frog/dev
mika:2024-12-3-balanced-friendship
mika:2024-11-17-carpe-diem
mika:2024-10-26-halloween
mika:2024-09-07-egg-summary
mika:2024-09-27-mystery-encounter
mika:2024-08-16-august-variant-update
mika:2024-09-01-run-history
mika:beginning

No commits in common. "5f82449120b16290a812ac964e38f0327c33e245" and "a2996cdd6689882396c14aa4a7687dbd1fd64607" have entirely different histories.
5f82449120 ... a2996cdd66

4 changed files with 8091 additions and 1667 deletions
Show Stats Expand all files Collapse all files

9738
public/images/trainer/tate.json
View File

File diff suppressed because it is too large Load Diff

6
src/data/ability.ts
View File

@ -3410,11 +3410,9 @@ export function initAbilities() {
new Ability(Abilities.CUTE_CHARM, 3)
.attr(PostDefendContactApplyTagChanceAbAttr, 30, BattlerTagType.INFATUATED),
new Ability(Abilities.PLUS, 3)
.conditionalAttr(p => p.scene.currentBattle.double && [Abilities.PLUS, Abilities.MINUS].some(a => p.getAlly().hasAbility(a)), BattleStatMultiplierAbAttr, BattleStat.SPATK, 1.5)
.ignorable(),
.unimplemented(),
new Ability(Abilities.MINUS, 3)
.conditionalAttr(p => p.scene.currentBattle.double && [Abilities.PLUS, Abilities.MINUS].some(a => p.getAlly().hasAbility(a)), BattleStatMultiplierAbAttr, BattleStat.SPATK, 1.5)
.ignorable(),
.unimplemented(),
new Ability(Abilities.FORECAST, 3)
.attr(UncopiableAbilityAbAttr)
.attr(NoFusionAbilityAbAttr)

4
src/data/pokemon-species.ts
View File

@ -2150,8 +2150,8 @@ export function initSpecies() {
new PokemonForm("Ultra", "ultra", Type.PSYCHIC, Type.DRAGON, 7.5, 230, Abilities.NEUROFORCE, Abilities.NONE, Abilities.NONE, 754, 97, 167, 97, 167, 97, 129, 255, 0, 300),
),
new PokemonSpecies(Species.MAGEARNA, 7, false, false, true, "Artificial Pokémon", Type.STEEL, Type.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, GrowthRate.SLOW, null, false, false,
new PokemonForm("Normal", "", Type.STEEL, Type.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, false, null, true),
new PokemonForm("Original", "original", Type.STEEL, Type.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300, false, null, true),
new PokemonForm("Normal", "", Type.STEEL, Type.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300),
new PokemonForm("Original", "original", Type.STEEL, Type.FAIRY, 1, 80.5, Abilities.SOUL_HEART, Abilities.NONE, Abilities.NONE, 600, 80, 95, 115, 130, 115, 65, 3, 0, 300),
),
new PokemonSpecies(Species.MARSHADOW, 7, false, false, true, "Gloomdweller Pokémon", Type.FIGHTING, Type.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300, GrowthRate.SLOW, null, false, true,
new PokemonForm("Normal", "", Type.FIGHTING, Type.GHOST, 0.7, 22.2, Abilities.TECHNICIAN, Abilities.NONE, Abilities.NONE, 600, 90, 125, 80, 90, 90, 125, 3, 0, 300),

8
src/locales/fr/biome.ts
View File

@ -1,7 +1,7 @@
import { SimpleTranslationEntries } from "#app/plugins/i18n";
export const biome: SimpleTranslationEntries = {
"unknownLocation": "vous avez oublié où",
"unknownLocation": "Dans un endroit inconnu",
"TOWN": "Ville",
"PLAINS": "Plaines",
"GRASS": "Herbes",
@ -17,9 +17,9 @@ export const biome: SimpleTranslationEntries = {
"BADLANDS": "Terres Sauvages",
"CAVE": "Grotte",
"DESERT": "Desert",
"ICE_CAVE": "Caverne Gelée",
"ICE_CAVE": "Caverne Glaciale",
"MEADOW": "Prairie",
"POWER_PLANT": "Centrale",
"POWER_PLANT": "Centrale Électrique",
"VOLCANO": "Volcan",
"GRAVEYARD": "Cimetière",
"DOJO": "Dojo",
@ -34,7 +34,7 @@ export const biome: SimpleTranslationEntries = {
"TEMPLE": "Temple",
"SLUM": "Bidonville",
"SNOWY_FOREST": "Forêt Enneigée",
"ISLAND": "Ile",
"ISLAND": "Île",
"LABORATORY": "Laboratoire",
"END": "???",
} as const;