Merge branch 'beta' into MergeFix

This commit is contained in:
Jesse M Chung 2024-08-29 08:13:59 -07:00 committed by GitHub
commit 9ccfc8dd43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
118 changed files with 5110 additions and 2028 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -4312,6 +4312,11 @@
1,
1
],
"99-gigantamax": [
0,
1,
1
],
"100": [
0,
1,

View File

@ -0,0 +1,32 @@
{
"1": {
"c56a5a": "6232a9",
"f6c58b": "9f60d5",
"832908": "3b1c69",
"ee8b4a": "8853bf",
"101010": "101010",
"735210": "534681",
"fdfdfd": "ffdbdb",
"e1d0db": "d5869b",
"ffe6b4": "c3d6ff",
"eebd8b": "9ba3d9",
"b47b5a": "7c72b6",
"b5a6b5": "b65782",
"9a859a": "872d65"
},
"2": {
"c56a5a": "2d6f9e",
"f6c58b": "75e0e8",
"832908": "22447d",
"ee8b4a": "43adc4",
"101010": "101010",
"735210": "1e1743",
"fdfdfd": "b1f1cf",
"e1d0db": "73c1c2",
"ffe6b4": "464d89",
"eebd8b": "31296f",
"b47b5a": "231b4e",
"b5a6b5": "44778a",
"9a859a": "2f4c6b"
}
}

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "aether_grunt_f.png",
"format": "RGBA8888",
"size": {
"w": 69,
"h": 69
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 23,
"y": 10,
"w": 35,
"h": 69
},
"frame": {
"x": 0,
"y": 0,
"w": 35,
"h": 69
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:0c9e77856d3b434e719021572bcb93de:f9c45dc5d67009b134dd1bbc5593f6ec:a694f8828aff21c718e5161e2fd63ade$"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 849 B

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "aether_grunt_m.png",
"format": "RGBA8888",
"size": {
"w": 65,
"h": 65
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 16,
"y": 14,
"w": 47,
"h": 65
},
"frame": {
"x": 0,
"y": 0,
"w": 47,
"h": 65
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:963887cf29549ad3c123b8055cb4d701:68004c4a6e04c93bd21c26a6f8921f0c:d2241fc11d0fc31b26ecbedae6da74f4$"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 819 B

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "faba.png",
"format": "RGBA8888",
"size": {
"w": 74,
"h": 74
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 25,
"y": 5,
"w": 31,
"h": 74
},
"frame": {
"x": 0,
"y": 0,
"w": 31,
"h": 74
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:47622708d99a504998950bd9c389a504:fe1c51be191dd9fafb5b6f309c08ae1a:8d64db18930325b8b513740c1d83ce4c$"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 814 B

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "guzma.png",
"format": "RGBA8888",
"size": {
"w": 58,
"h": 58
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 21,
"y": 20,
"w": 37,
"h": 58
},
"frame": {
"x": 0,
"y": 0,
"w": 37,
"h": 58
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:c3b08a562a2882d1ca8b5e031e245da9:72a8305e547f091d15abccd2b142e401:3b302c7f9eb6ea81b65bcaeead4a95a9$"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "lusamine.png",
"format": "RGBA8888",
"size": {
"w": 74,
"h": 74
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 22,
"y": 5,
"w": 36,
"h": 74
},
"frame": {
"x": 0,
"y": 0,
"w": 36,
"h": 74
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:41da3a1299e3831be70016dc91e49313:2413ba06767fb10fdc6fde8cc736c51c:4012333084c529872232c8d052561dc1$"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 996 B

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "macro_grunt_f.png",
"format": "RGBA8888",
"size": {
"w": 74,
"h": 74
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 24,
"y": 5,
"w": 31,
"h": 74
},
"frame": {
"x": 0,
"y": 0,
"w": 31,
"h": 74
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:a015c43d80f8fd1932758e0e2cfcec61:59fc8205ea5ca04295831b4a2eb623ec:30df2ea8e9dac9e95f70534ec43d5ecd$"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 837 B

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "macro_grunt_m.png",
"format": "RGBA8888",
"size": {
"w": 75,
"h": 75
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 15,
"y": 4,
"w": 48,
"h": 75
},
"frame": {
"x": 0,
"y": 0,
"w": 48,
"h": 75
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:52fccff2a0675b4e10139ddb7067d4cf:10d254175d2d8a9111cce096ffb55fa3:d57016467aa07cafdfaf13e0ff643c1b$"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 919 B

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "oleana.png",
"format": "RGBA8888",
"size": {
"w": 79,
"h": 79
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 10,
"y": 1,
"w": 53,
"h": 79
},
"frame": {
"x": 0,
"y": 0,
"w": 53,
"h": 79
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:30987a671771127a38491a588c465964:38b28effcfd5c6cbc0f358912a775af3:82e2a1f8afed29be57f6c2473f4c5be2$"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "plumeria.png",
"format": "RGBA8888",
"size": {
"w": 72,
"h": 72
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 23,
"y": 7,
"w": 36,
"h": 72
},
"frame": {
"x": 0,
"y": 0,
"w": 36,
"h": 72
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:5527e7b646932d429928b53f055e9d27:c0640510780d2974f9b74a7f8e6b29aa:7bfec029bae78c9d483f59c35b73afad$"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 934 B

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "rose.png",
"format": "RGBA8888",
"size": {
"w": 79,
"h": 79
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 80,
"h": 80
},
"spriteSourceSize": {
"x": 16,
"y": 1,
"w": 52,
"h": 79
},
"frame": {
"x": 0,
"y": 0,
"w": 52,
"h": 79
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:2b4ccaff7255c7d72661eac13de83ff8:72ee3660cdf470bd67375d355307e19d:8d35b104fc841baa4443581e6cea979e$"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "skull_grunt_f.png",
"format": "RGBA8888",
"size": {
"w": 74,
"h": 74
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 31,
"h": 74
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 31,
"h": 74
},
"frame": {
"x": 0,
"y": 0,
"w": 31,
"h": 74
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:71a1f5b1981674c6e81163ac8ea576c3:a5e612d58e5f0a1489e111212baea09d:dd369353af16e4c5eb6547e129dfac18$"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 905 B

View File

@ -0,0 +1,41 @@
{
"textures": [
{
"image": "skull_grunt_m.png",
"format": "RGBA8888",
"size": {
"w": 72,
"h": 72
},
"scale": 1,
"frames": [
{
"filename": "0001.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 51,
"h": 72
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 51,
"h": 72
},
"frame": {
"x": 0,
"y": 0,
"w": 51,
"h": 72
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:4deb2a68e4d168bb1a40cb5d190a7d1f:be3d7b29f4b544ba51cf907691fef51d:df57ca2c9bf5f80d930306e15a851d4d$"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 966 B

View File

@ -6,6 +6,7 @@ export interface UserInfo {
lastSessionSlot: integer;
discordId: string;
googleId: string;
hasAdminRole: boolean;
}
export let loggedInUser: UserInfo | null = null;
@ -13,13 +14,13 @@ export let loggedInUser: UserInfo | null = null;
export const clientSessionId = Utils.randomString(32);
export function initLoggedInUser(): void {
loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: ""};
loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "", hasAdminRole: false };
}
export function updateUserInfo(): Promise<[boolean, integer]> {
return new Promise<[boolean, integer]>(resolve => {
if (bypassLogin) {
loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "" };
loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "", hasAdminRole: false};
let lastSessionSlot = -1;
for (let s = 0; s < 5; s++) {
if (localStorage.getItem(`sessionData${s ? s : ""}_${loggedInUser.username}`)) {

View File

@ -844,14 +844,13 @@ export default class BattleScene extends SceneBase {
if (Overrides.OPP_SPECIES_OVERRIDE) {
species = getPokemonSpecies(Overrides.OPP_SPECIES_OVERRIDE);
}
const pokemon = new EnemyPokemon(this, species, level, trainerSlot, boss, dataSource);
if (Overrides.OPP_LEVEL_OVERRIDE !== 0) {
pokemon.level = Overrides.OPP_LEVEL_OVERRIDE;
level = Overrides.OPP_LEVEL_OVERRIDE;
}
if (Overrides.OPP_GENDER_OVERRIDE !== null) {
pokemon.gender = Overrides.OPP_GENDER_OVERRIDE;
}
const pokemon = new EnemyPokemon(this, species, level, trainerSlot, boss, dataSource);
overrideModifiers(this, false);
overrideHeldItems(this, pokemon, false);
if (boss && !dataSource) {
@ -1807,7 +1806,7 @@ export default class BattleScene extends SceneBase {
case "cry":
config["volume"] = this.masterVolume * this.fieldVolume;
//PRSFX sound files are unusually loud
if (key.startsWith("PRSFX- ")) {
if (keyDetails[1].startsWith("PRSFX- ")) {
config["volume"] *= 0.5;
}
break;
@ -2004,6 +2003,18 @@ export default class BattleScene extends SceneBase {
return 12.974;
case "battle_flare_grunt": //XY Team Flare Battle
return 4.228;
case "battle_aether_grunt": // SM Aether Foundation Battle
return 16.00;
case "battle_skull_grunt": // SM Team Skull Battle
return 20.87;
case "battle_macro_grunt": // SWSH Trainer Battle
return 11.56;
case "battle_galactic_admin": //BDSP Team Galactic Admin Battle
return 11.997;
case "battle_skull_admin": //SM Team Skull Admin Battle
return 15.463;
case "battle_oleana": //SWSH Oleana Battle
return 14.110;
case "battle_rocket_boss": //USUM Giovanni Battle
return 9.115;
case "battle_aqua_magma_boss": //ORAS Archie & Maxie Battle
@ -2014,6 +2025,12 @@ export default class BattleScene extends SceneBase {
return 25.624;
case "battle_flare_boss": //XY Lysandre Battle
return 8.085;
case "battle_aether_boss": //SM Lusamine Battle
return 11.33;
case "battle_skull_boss": //SM Guzma Battle
return 13.13;
case "battle_macro_boss": //SWSH Rose Battle
return 11.42;
}
return 0;

View File

@ -495,27 +495,27 @@ export const classicFixedBattles: FixedBattleConfigs = {
[25]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
.setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_2, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
[35]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT ], true)),
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT ], true)),
[55]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
.setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_3, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
[62]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT ], true)),
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT ], true)),
[64]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT ], true)),
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT ], true)),
[66]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
.setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.ROOD ], [ TrainerType.XEROSIC, TrainerType.BRYONY ] ], true)),
.setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.ROOD ], [ TrainerType.XEROSIC, TrainerType.BRYONY ], TrainerType.FABA, TrainerType.PLUMERIA, TrainerType.OLEANA ], true)),
[95]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
.setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_4, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
[112]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT ], true)),
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT ], true)),
[114]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
.setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.ROOD ], [ TrainerType.XEROSIC, TrainerType.BRYONY ] ], true, 1)),
.setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.ROOD ], [ TrainerType.XEROSIC, TrainerType.BRYONY ], TrainerType.FABA, TrainerType.PLUMERIA, TrainerType.OLEANA ], true, 1)),
[115]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_1, TrainerType.MAXIE, TrainerType.ARCHIE, TrainerType.CYRUS, TrainerType.GHETSIS, TrainerType.LYSANDRE ])),
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_1, TrainerType.MAXIE, TrainerType.ARCHIE, TrainerType.CYRUS, TrainerType.GHETSIS, TrainerType.LYSANDRE, TrainerType.LUSAMINE, TrainerType.GUZMA, TrainerType.ROSE ])),
[145]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
.setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_5, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
[165]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_2, TrainerType.MAXIE_2, TrainerType.ARCHIE_2, TrainerType.CYRUS_2, TrainerType.GHETSIS_2, TrainerType.LYSANDRE_2 ])),
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_2, TrainerType.MAXIE_2, TrainerType.ARCHIE_2, TrainerType.CYRUS_2, TrainerType.GHETSIS_2, TrainerType.LYSANDRE_2, TrainerType.LUSAMINE_2, TrainerType.GUZMA_2, TrainerType.ROSE_2 ])),
[182]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
.setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.LORELEI, TrainerType.WILL, TrainerType.SIDNEY, TrainerType.AARON, TrainerType.SHAUNTAL, TrainerType.MALVA, [ TrainerType.HALA, TrainerType.MOLAYNE ], TrainerType.MARNIE_ELITE, TrainerType.RIKA, TrainerType.CRISPIN ])),
[184]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(182)

View File

@ -753,6 +753,98 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
]
}
],
[TrainerType.AETHER_GRUNT]: [
{
encounter: [
"dialogue:aether_grunt.encounter.1",
"dialogue:aether_grunt.encounter.2",
"dialogue:aether_grunt.encounter.3",
"dialogue:aether_grunt.encounter.4",
"dialogue:aether_grunt.encounter.5",
],
victory: [
"dialogue:aether_grunt.victory.1",
"dialogue:aether_grunt.victory.2",
"dialogue:aether_grunt.victory.3",
"dialogue:aether_grunt.victory.4",
"dialogue:aether_grunt.victory.5",
]
}
],
[TrainerType.FABA]: [
{
encounter: [
"dialogue:faba.encounter.1",
"dialogue:faba.encounter.2",
"dialogue:faba.encounter.3",
],
victory: [
"dialogue:faba.victory.1",
"dialogue:faba.victory.2",
"dialogue:faba.victory.3",
]
}
],
[TrainerType.SKULL_GRUNT]: [
{
encounter: [
"dialogue:skull_grunt.encounter.1",
"dialogue:skull_grunt.encounter.2",
"dialogue:skull_grunt.encounter.3",
"dialogue:skull_grunt.encounter.4",
"dialogue:skull_grunt.encounter.5",
],
victory: [
"dialogue:skull_grunt.victory.1",
"dialogue:skull_grunt.victory.2",
"dialogue:skull_grunt.victory.3",
"dialogue:skull_grunt.victory.4",
"dialogue:skull_grunt.victory.5",
]
}
],
[TrainerType.PLUMERIA]: [
{
encounter: [
"dialogue:plumeria.encounter.1",
"dialogue:plumeria.encounter.2",
"dialogue:plumeria.encounter.3",
],
victory: [
"dialogue:plumeria.victory.1",
"dialogue:plumeria.victory.2",
"dialogue:plumeria.victory.3",
]
}
],
[TrainerType.MACRO_GRUNT]: [
{
encounter: [
"dialogue:macro_grunt.encounter.1",
"dialogue:macro_grunt.encounter.2",
"dialogue:macro_grunt.encounter.3",
],
victory: [
"dialogue:macro_grunt.victory.1",
"dialogue:macro_grunt.victory.2",
"dialogue:macro_grunt.victory.3",
]
}
],
[TrainerType.OLEANA]: [
{
encounter: [
"dialogue:oleana.encounter.1",
"dialogue:oleana.encounter.2",
"dialogue:oleana.encounter.3",
],
victory: [
"dialogue:oleana.victory.1",
"dialogue:oleana.victory.2",
"dialogue:oleana.victory.3",
]
}
],
[TrainerType.ROCKET_BOSS_GIOVANNI_1]: [
{
encounter: [
@ -909,6 +1001,84 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
]
}
],
[TrainerType.LUSAMINE]: [
{
encounter: [
"dialogue:aether_boss_lusamine_1.encounter.1"
],
victory: [
"dialogue:aether_boss_lusamine_1.victory.1"
],
defeat: [
"dialogue:aether_boss_lusamine_1.defeat.1"
]
}
],
[TrainerType.LUSAMINE_2]: [
{
encounter: [
"dialogue:aether_boss_lusamine_2.encounter.1"
],
victory: [
"dialogue:aether_boss_lusamine_2.victory.1"
],
defeat: [
"dialogue:aether_boss_lusamine_2.defeat.1"
]
}
],
[TrainerType.GUZMA]: [
{
encounter: [
"dialogue:skull_boss_guzma_1.encounter.1"
],
victory: [
"dialogue:skull_boss_guzma_1.victory.1"
],
defeat: [
"dialogue:skull_boss_guzma_1.defeat.1"
]
}
],
[TrainerType.GUZMA_2]: [
{
encounter: [
"dialogue:skull_boss_guzma_2.encounter.1"
],
victory: [
"dialogue:skull_boss_guzma_2.victory.1"
],
defeat: [
"dialogue:skull_boss_guzma_2.defeat.1"
]
}
],
[TrainerType.ROSE]: [
{
encounter: [
"dialogue:macro_boss_rose_1.encounter.1"
],
victory: [
"dialogue:macro_boss_rose_1.victory.1"
],
defeat: [
"dialogue:macro_boss_rose_1.defeat.1"
]
}
],
[TrainerType.ROSE_2]: [
{
encounter: [
"dialogue:macro_boss_rose_2.encounter.1"
],
victory: [
"dialogue:macro_boss_rose_2.victory.1"
],
defeat: [
"dialogue:macro_boss_rose_2.defeat.1"
]
}
],
[TrainerType.BROCK]: {
encounter: [
"dialogue:brock.encounter.1",

View File

@ -601,11 +601,13 @@ export default class Move implements Localizable {
return true;
}
}
break;
case MoveFlags.IGNORE_PROTECT:
if (user.hasAbilityWithAttr(IgnoreProtectOnContactAbAttr) &&
this.checkFlag(MoveFlags.MAKES_CONTACT, user, target)) {
return true;
}
break;
}
return !!(this.flags & flag);
@ -8568,7 +8570,8 @@ export function initMoves() {
new AttackMove(Moves.BODY_PRESS, Type.FIGHTING, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 8)
.attr(DefAtkAttr),
new StatusMove(Moves.DECORATE, Type.FAIRY, -1, 15, -1, 0, 8)
.attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.SPATK ], 2),
.attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.SPATK ], 2)
.ignoresProtect(),
new AttackMove(Moves.DRUM_BEATING, Type.GRASS, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 8)
.attr(StatChangeAttr, BattleStat.SPD, -1)
.makesContact(false),

View File

@ -306,7 +306,7 @@ export abstract class PokemonSpeciesForm {
let variantDataIndex: integer | string = this.speciesId;
const species = getPokemonSpecies(this.speciesId);
if (species.forms.length > 0 && formIndex !== undefined) {
formkey = species.forms[formIndex]?.formSpriteKey;
formkey = species.forms[formIndex]?.getFormSpriteKey(formIndex);
if (formkey) {
variantDataIndex = `${this.speciesId}-${formkey}`;
}

View File

@ -16,6 +16,7 @@ import {Moves} from "#enums/moves";
import {PartyMemberStrength} from "#enums/party-member-strength";
import {Species} from "#enums/species";
import {TrainerType} from "#enums/trainer-type";
import {Gender} from "./gender";
export enum TrainerPoolTier {
COMMON,
@ -323,6 +324,15 @@ export class TrainerConfig {
case TrainerType.LYSANDRE_2:
trainerType = TrainerType.LYSANDRE;
break;
case TrainerType.LUSAMINE_2:
trainerType = TrainerType.LUSAMINE;
break;
case TrainerType.GUZMA_2:
trainerType = TrainerType.GUZMA;
break;
case TrainerType.ROSE_2:
trainerType = TrainerType.ROSE;
break;
case TrainerType.MARNIE_ELITE:
trainerType = TrainerType.MARNIE;
break;
@ -553,9 +563,9 @@ export class TrainerConfig {
}
case "magma": {
return {
[TrainerPoolTier.COMMON]: [Species.NUMEL, Species.POOCHYENA, Species.SLUGMA, Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.SWINUB, Species.GLIGAR],
[TrainerPoolTier.COMMON]: [Species.NUMEL, Species.POOCHYENA, Species.SLUGMA, Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.ROLYCOLY, Species.GLIGAR],
[TrainerPoolTier.UNCOMMON]: [Species.TRAPINCH, Species.HEATMOR],
[TrainerPoolTier.RARE]: [Species.TURTONATOR, Species.CHARCADET]
[TrainerPoolTier.RARE]: [Species.CAPSAKID, Species.CHARCADET]
};
}
case "aqua": {
@ -586,6 +596,27 @@ export class TrainerConfig {
[TrainerPoolTier.RARE]: [Species.NOIVERN, Species.DRUDDIGON]
};
}
case "aether": {
return {
[TrainerPoolTier.COMMON]: [ Species.BRUXISH, Species.SLOWPOKE, Species.BALTOY, Species.EXEGGCUTE, Species.ABRA, Species.ALOLA_RAICHU, Species.ELGYEM, Species.NATU],
[TrainerPoolTier.UNCOMMON]: [Species.GALAR_SLOWKING, Species.MEDITITE, Species.BELDUM, Species.ORANGURU, Species.HATTERENE, Species.INKAY, Species.RALTS],
[TrainerPoolTier.RARE]: [Species.ARMAROUGE, Species.GIRAFARIG, Species.PORYGON]
};
}
case "skull": {
return {
[TrainerPoolTier.COMMON]: [ Species.MAREANIE, Species.ALOLA_GRIMER, Species.GASTLY, Species.ZUBAT, Species.LURANTIS, Species.VENIPEDE, Species.BUDEW, Species.KOFFING],
[TrainerPoolTier.UNCOMMON]: [Species.GALAR_SLOWBRO, Species.SKORUPI, Species.PALDEA_WOOPER, Species.NIDORAN_F, Species.CROAGUNK, Species.MANDIBUZZ],
[TrainerPoolTier.RARE]: [Species.DRAGALGE, Species.HISUI_SNEASEL]
};
}
case "macro": {
return {
[TrainerPoolTier.COMMON]: [ Species.HATTERENE, Species.MILOTIC, Species.TSAREENA, Species.SALANDIT, Species.GALAR_PONYTA, Species.GOTHITA, Species.FROSLASS],
[TrainerPoolTier.UNCOMMON]: [Species.MANDIBUZZ, Species.MAREANIE, Species.ALOLA_VULPIX, Species.TOGEPI, Species.GALAR_CORSOLA, Species.SINISTEA, Species.APPLIN],
[TrainerPoolTier.RARE]: [Species.TINKATINK, Species.HISUI_LILLIGANT]
};
}
}
console.warn(`Evil team admin for ${team} not found. Returning empty species pools.`);
@ -1309,9 +1340,9 @@ export const trainerConfigs: TrainerConfigs = {
[TrainerType.MAGMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Magma Grunt Female").setHasDouble("Magma Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
.setSpeciesPools({
[TrainerPoolTier.COMMON]: [Species.SLUGMA, Species.POOCHYENA, Species.NUMEL, Species.ZIGZAGOON, Species.DIGLETT, Species.MAGBY, Species.TORKOAL, Species.BALTOY, Species.BARBOACH],
[TrainerPoolTier.UNCOMMON]: [Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.SWINUB, Species.GLIGAR],
[TrainerPoolTier.UNCOMMON]: [Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.ROLYCOLY, Species.GLIGAR],
[TrainerPoolTier.RARE]: [Species.TRAPINCH, Species.HEATMOR],
[TrainerPoolTier.SUPER_RARE]: [Species.TURTONATOR, Species.CHARCADET]
[TrainerPoolTier.SUPER_RARE]: [Species.CAPSAKID, Species.CHARCADET]
}),
[TrainerType.TABITHA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("magma_admin", "magma", [Species.CAMERUPT]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.COURTNEY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("magma_admin_female", "magma", [Species.CAMERUPT]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
@ -1331,10 +1362,9 @@ export const trainerConfigs: TrainerConfigs = {
[TrainerPoolTier.RARE]: [Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.HISUI_SNEASEL],
[TrainerPoolTier.SUPER_RARE]: [Species.HISUI_ZORUA, Species.HISUI_SLIGGOO]
}),
[TrainerType.JUPITER]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.SKUNTANK]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.MARS]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.PURUGLY]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.SATURN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander", "galactic", [Species.TOXICROAK]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.JUPITER]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.SKUNTANK]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.MARS]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.PURUGLY]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.SATURN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander", "galactic", [Species.TOXICROAK]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.PLASMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Plasma Grunt Female").setHasDouble("Plasma Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
.setSpeciesPools({
[TrainerPoolTier.COMMON]: [Species.PATRAT, Species.LILLIPUP, Species.PURRLOIN, Species.SCRAFTY, Species.WOOBAT, Species.VANILLITE, Species.SANDILE, Species.TRUBBISH],
@ -1344,7 +1374,6 @@ export const trainerConfigs: TrainerConfigs = {
}),
[TrainerType.ZINZOLIN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("plasma_sage", "plasma", [Species.CRYOGONAL]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.ROOD]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("plasma_sage", "plasma", [Species.SWOOBAT]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.FLARE_GRUNT]: new TrainerConfig(++t).setHasGenders("Flare Grunt Female").setHasDouble("Flare Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
.setSpeciesPools({
[TrainerPoolTier.COMMON]: [Species.FLETCHLING, Species.LITLEO, Species.PONYTA, Species.INKAY, Species.HOUNDOUR, Species.SKORUPI, Species.SCRAFTY, Species.CROAGUNK],
@ -1354,6 +1383,31 @@ export const trainerConfigs: TrainerConfigs = {
}),
[TrainerType.BRYONY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("flare_admin_female", "flare", [Species.LIEPARD]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.XEROSIC]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("flare_admin", "flare", [Species.MALAMAR]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.AETHER_GRUNT]: new TrainerConfig(++t).setHasGenders("Aether Grunt Female").setHasDouble("Aether Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aether_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
.setSpeciesPools({
[TrainerPoolTier.COMMON]: [ Species.PIKIPEK, Species.ROCKRUFF, Species.ALOLA_DIGLETT, Species.YUNGOOS, Species.CORSOLA, Species.ALOLA_GEODUDE, Species.BOUNSWEET, Species.LILLIPUP, Species.ALOLA_MAROWAK],
[TrainerPoolTier.UNCOMMON]: [ Species.POLIWAG, Species.STUFFUL, Species.ALOLA_EXEGGUTOR, Species.CRABRAWLER, Species.CUTIEFLY, Species.ALOLA_RAICHU, Species.ORICORIO, Species.MUDBRAY],
[TrainerPoolTier.RARE]: [ Species.ORANGURU, Species.PASSIMIAN, Species.GALAR_CORSOLA, Species.ALOLA_SANDSHREW, Species.ALOLA_VULPIX, Species.TURTONATOR, Species.DRAMPA],
[TrainerPoolTier.SUPER_RARE]: [Species.JANGMO_O, Species.PORYGON]
}),
[TrainerType.FABA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aether_admin", "aether", [Species.HYPNO]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aether_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.SKULL_GRUNT]: new TrainerConfig(++t).setHasGenders("Skull Grunt Female").setHasDouble("Skull Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_skull_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
.setSpeciesPools({
[TrainerPoolTier.COMMON]: [ Species.SALANDIT, Species.ALOLA_RATTATA, Species.ALOLA_MEOWTH, Species.SCRAGGY, Species.KOFFING, Species.ALOLA_GRIMER, Species.MAREANIE, Species.SPINARAK, Species.TRUBBISH],
[TrainerPoolTier.UNCOMMON]: [ Species.FOMANTIS, Species.SABLEYE, Species.SANDILE, Species.ALOLA_MAROWAK, Species.PANCHAM, Species.DROWZEE, Species.ZUBAT, Species.VENIPEDE, Species.VULLABY],
[TrainerPoolTier.RARE]: [Species.SANDYGAST, Species.PAWNIARD, Species.MIMIKYU, Species.DHELMISE, Species.GASTLY, Species.WISHIWASHI],
[TrainerPoolTier.SUPER_RARE]: [Species.GRUBBIN, Species.DEWPIDER]
}),
[TrainerType.PLUMERIA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("skull_admin", "skull", [Species.SALAZZLE]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_skull_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.MACRO_GRUNT]: new TrainerConfig(++t).setHasGenders("Macro Grunt Female").setHasDouble("Macro Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_macro_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
.setSpeciesPools({
[TrainerPoolTier.COMMON]: [ Species.CUFANT, Species.GALAR_MEOWTH, Species.KLINK, Species.ROOKIDEE, Species.CRAMORANT, Species.GALAR_ZIGZAGOON, Species.SKWOVET, Species.STEELIX, Species.MAWILE, Species.FERROSEED],
[TrainerPoolTier.UNCOMMON]: [ Species.DRILBUR, Species.MAGNEMITE, Species.HATENNA, Species.ARROKUDA, Species.APPLIN, Species.GALAR_PONYTA, Species.GALAR_YAMASK, Species.SINISTEA, Species.RIOLU],
[TrainerPoolTier.RARE]: [Species.FALINKS, Species.BELDUM, Species.GALAR_FARFETCHD, Species.GALAR_MR_MIME, Species.HONEDGE, Species.SCIZOR, Species.GALAR_DARUMAKA],
[TrainerPoolTier.SUPER_RARE]: [Species.DURALUDON, Species.DREEPY]
}),
[TrainerType.OLEANA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("macro_admin", "macro", [Species.GARBODOR]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_oleana").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.BROCK]: new TrainerConfig((t = TrainerType.BROCK)).initForGymLeader(signatureSpecies["BROCK"], true, Type.ROCK).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
[TrainerType.MISTY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MISTY"], false, Type.WATER).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
[TrainerType.LT_SURGE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["LT_SURGE"], true, Type.ELECTRIC).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
@ -1730,7 +1784,7 @@ export const trainerConfigs: TrainerConfigs = {
p.generateName();
})),
[TrainerType.ARCHIE_2]: new TrainerConfig(++t).setName("Archie").initForEvilTeamLeader("Aqua Boss", [], true).setMixedBattleBgm("battle_aqua_magma_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.KINGDRA, Species.LUDICOLO], TrainerSlot.TRAINER, true, p => {
.setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.EMPOLEON, Species.LUDICOLO], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL;
@ -1743,9 +1797,9 @@ export const trainerConfigs: TrainerConfigs = {
p.generateAndPopulateMoveset();
p.abilityIndex = 2; // Swift Swim
}))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.HUNTAIL, Species.GOREBYSS], TrainerSlot.TRAINER, true, p => {
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.OVERQWIL ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.abilityIndex = 0; // Swift Swim
p.abilityIndex = 1; // Swift Swim
}))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SHARPEDO], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
@ -1760,11 +1814,11 @@ export const trainerConfigs: TrainerConfigs = {
p.pokeball = PokeballType.MASTER_BALL;
})),
[TrainerType.CYRUS]: new TrainerConfig(++t).setName("Cyrus").initForEvilTeamLeader("Galactic Boss", []).setMixedBattleBgm("battle_galactic_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.GYARADOS, Species.BASCULEGION]))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.HONCHKROW, Species.HISUI_BRAVIARY]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.CROBAT, Species.OVERQWIL]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.AZELF, Species.UXIE, Species.MESPRIT]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.HOUNDOOM], TrainerSlot.TRAINER, true, p => {
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GYARADOS ]))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HONCHKROW, Species.HISUI_BRAVIARY ]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.CROBAT, Species.GLISCOR ]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.AZELF, Species.UXIE, Species.MESPRIT ]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.HOUNDOOM ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL;
p.formIndex = 1;
@ -1810,15 +1864,20 @@ export const trainerConfigs: TrainerConfigs = {
p.pokeball = PokeballType.ULTRA_BALL;
})),
[TrainerType.GHETSIS_2]: new TrainerConfig(++t).setName("Ghetsis").initForEvilTeamLeader("Plasma Boss", [], true).setMixedBattleBgm("battle_plasma_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SLITHER_WING, Species.IRON_MOTH], TrainerSlot.TRAINER, true, p => {
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GENESECT ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL;
p.pokeball = PokeballType.MASTER_BALL;
p.formIndex = Utils.randSeedInt(5);
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.DURANT]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.DARMANITAN, Species.GALAR_DARMANITAN]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.KINGAMBIT]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.HYDREIGON, Species.IRON_JUGULIS], TrainerSlot.TRAINER, true, p => {
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BASCULEGION, Species.JELLICENT ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.gender = Gender.MALE;
p.formIndex = 1;
}))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.KINGAMBIT ]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.VOLCARONA, Species.SLITHER_WING ]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.HYDREIGON, Species.IRON_JUGULIS ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL;
@ -1829,12 +1888,15 @@ export const trainerConfigs: TrainerConfigs = {
p.pokeball = PokeballType.MASTER_BALL;
})),
[TrainerType.LYSANDRE]: new TrainerConfig(++t).setName("Lysandre").initForEvilTeamLeader("Flare Boss", []).setMixedBattleBgm("battle_flare_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.MIENSHAO]))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.HONCHKROW, Species.TALONFLAME]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.PYROAR]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.MILOTIC]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.HELIOLISK]))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.GYARADOS], TrainerSlot.TRAINER, true, p => {
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.MIENSHAO ]))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HONCHKROW, Species.TALONFLAME ]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.PYROAR ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.gender = Gender.MALE;
}))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.CLAWITZER, Species.DRAGALGE ]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.HELIOLISK, Species.MALAMAR ]))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GYARADOS ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL;
@ -1847,10 +1909,13 @@ export const trainerConfigs: TrainerConfigs = {
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL;
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.GHOLDENGO, Species.AEGISLASH]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.PYROAR]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GOODRA, Species.HISUI_GOODRA]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.GYARADOS], TrainerSlot.TRAINER, true, p => {
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PYROAR ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.gender = Gender.MALE;
}))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.IRON_MOTH ]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GOODRA, Species.HISUI_GOODRA ]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GYARADOS ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL;
@ -1862,4 +1927,111 @@ export const trainerConfigs: TrainerConfigs = {
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.MASTER_BALL;
})),
[TrainerType.LUSAMINE]: new TrainerConfig(++t).setName("Lusamine").initForEvilTeamLeader("Aether Boss", []).setMixedBattleBgm("battle_aether_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CLEFABLE ]))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.LILLIGANT, Species.HISUI_LILLIGANT ]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.MILOTIC, Species.PRIMARINA ]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING ]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.BEWEAR ]))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.NIHILEGO ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
})),
[TrainerType.LUSAMINE_2]: new TrainerConfig(++t).setName("Lusamine").initForEvilTeamLeader("Aether Boss", [], true).setMixedBattleBgm("battle_aether_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CLEFABLE ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MILOTIC, Species.PRIMARINA ]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.PHEROMOSA ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.MASTER_BALL;
}))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.STAKATAKA, Species.CELESTEELA, Species.GUZZLORD ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.MASTER_BALL;
}))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.NIHILEGO ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.MASTER_BALL;
}))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.NECROZMA ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.MASTER_BALL;
})),
[TrainerType.GUZMA]: new TrainerConfig(++t).setName("Guzma").initForEvilTeamLeader("Skull Boss", []).setMixedBattleBgm("battle_skull_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LOKIX, Species.YANMEGA ]))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HERACROSS ]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SCIZOR, Species.KLEAVOR ]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GALVANTULA, Species.VIKAVOLT]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.PINSIR ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.formIndex = 1;
p.generateName();
}))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GOLISOPOD ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
})),
[TrainerType.GUZMA_2]: new TrainerConfig(++t).setName("Guzma").initForEvilTeamLeader("Skull Boss", [], true).setMixedBattleBgm("battle_skull_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GOLISOPOD ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.abilityIndex = 2; //Anticipation
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HISUI_SAMUROTT, Species.CRAWDAUNT ], TrainerSlot.TRAINER, true, p => {
p.abilityIndex = 2; //Sharpness, Adaptability
}))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SCIZOR, Species.KLEAVOR ]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.PINSIR ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.formIndex = 1;
p.generateName();
}))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.BUZZWOLE ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.MASTER_BALL;
}))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.XURKITREE ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.MASTER_BALL;
})),
[TrainerType.ROSE]: new TrainerConfig(++t).setName("Rose").initForEvilTeamLeader("Macro Boss", []).setMixedBattleBgm("battle_macro_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCHALUDON ]))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.FERROTHORN, Species.ESCAVALIER ]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SIRFETCHD, Species.MR_RIME ]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.CORVIKNIGHT ]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.PERRSERKER, Species.KLINKLANG ]))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.COPPERAJAH ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.formIndex = 1;
p.generateName();
})),
[TrainerType.ROSE_2]: new TrainerConfig(++t).setName("Rose").initForEvilTeamLeader("Macro Boss", [], true).setMixedBattleBgm("battle_macro_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCHALUDON ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.AEGISLASH, Species.GHOLDENGO ]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.DRACOVISH, Species.DRACOZOLT ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.abilityIndex = 1; //Strong Jaw, Hustle
}))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.MELMETAL ]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GALAR_ARTICUNO, Species.GALAR_ZAPDOS, Species.GALAR_MOLTRES ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.MASTER_BALL;
}))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.COPPERAJAH ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.formIndex = 1;
p.generateName();
})),
};

View File

@ -72,6 +72,12 @@ export enum TrainerType {
FLARE_GRUNT,
BRYONY,
XEROSIC,
AETHER_GRUNT,
FABA,
SKULL_GRUNT,
PLUMERIA,
MACRO_GRUNT,
OLEANA,
ROCKET_BOSS_GIOVANNI_1,
ROCKET_BOSS_GIOVANNI_2,
MAXIE,
@ -84,6 +90,12 @@ export enum TrainerType {
GHETSIS_2,
LYSANDRE,
LYSANDRE_2,
LUSAMINE,
LUSAMINE_2,
GUZMA,
GUZMA_2,
ROSE,
ROSE_2,
BROCK = 200,
MISTY,

View File

@ -3761,6 +3761,18 @@ export class EnemyPokemon extends Pokemon {
this.status = new Status(Overrides.OPP_STATUS_OVERRIDE);
}
if (Overrides.OPP_GENDER_OVERRIDE) {
this.gender = Overrides.OPP_GENDER_OVERRIDE;
}
const speciesId = this.species.speciesId;
if (speciesId in Overrides.OPP_FORM_OVERRIDES
&& Overrides.OPP_FORM_OVERRIDES[speciesId]
&& this.species.forms[Overrides.OPP_FORM_OVERRIDES[speciesId]]) {
this.formIndex = Overrides.OPP_FORM_OVERRIDES[speciesId] ?? 0;
}
if (!dataSource) {
this.generateAndPopulateMoveset();

View File

@ -38,7 +38,7 @@
"learnMoveNotLearned": "{{pokemonName}} hat {{moveName}} nicht erlernt.",
"learnMoveForgetQuestion": "Welche Attacke soll vergessen werden?",
"learnMoveForgetSuccess": "{{pokemonName}} hat {{moveName}} vergessen.",
"countdownPoof": "@d{32}Eins, @d{15}zwei @d{15}und@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}schwupp!",
"countdownPoof": "@d{32}Eins, @d{15}zwei @d{15}und@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}schwupp!",
"learnMoveAnd": "Und…",
"levelCapUp": "Die Levelbeschränkung wurde auf {{levelCap}} erhöht!",
"moveNotImplemented": "{{moveName}} ist noch nicht implementiert und kann nicht ausgewählt werden.",

View File

@ -80,11 +80,21 @@
"battle_galactic_grunt": "BDSP Vs. Team Galaktik Rüpel",
"battle_plasma_grunt": "SW Vs. Team Plasma Rüpel",
"battle_flare_grunt": "XY Vs. Team Flare Rüpel",
"battle_aether_grunt": "SM Vs. Æther Foundation",
"battle_skull_grunt": "SM Vs. Team Skull Rüpel",
"battle_macro_grunt": "SWSH Vs. Trainer",
"battle_galactic_admin": "BDSP Vs. Team Galactic Commander",
"battle_skull_admin": "SM Vs. Team Skull Vorstand",
"battle_oleana": "SWSH Vs. Oleana",
"battle_rocket_boss": "USUM Vs. Giovanni",
"battle_aqua_magma_boss": "ORAS Vs. Team Aqua & Magma Boss",
"battle_galactic_boss": "BDSP Vs. Zyrus",
"battle_plasma_boss": "S2W2 Vs. G-Cis",
"battle_flare_boss": "XY Vs. Flordelis",
"battle_aether_boss": "SM Vs. Samantha",
"battle_skull_boss": "SM Vs. Bromley",
"battle_macro_boss": "SWSH Vs. Rose",
"abyss": "PMD Erkundungsteam Himmel Dunkelkrater",
"badlands": "PMD Erkundungsteam Himmel Kargtal",
"beach": "PMD Erkundungsteam Himmel Feuchtklippe",

View File

@ -441,7 +441,7 @@
},
"courtney": {
"encounter": {
"1": "Das Ding... Das Ding, das du hältst... Das ist es, was...\n$Das ist es, wonach wir von Team Magma suchen...",
"1": "Stellt euch...Mir NICHT...IN DEN WEEEG...!!",
"2": "... Nun dann... Auslöschen...",
"3": "...?! Du... Hm... ♪ Das trifft sich ausgezeichnet... ♪\n$Dann hole ich mir eben zuerst deine Pokémon... Her damit..."
},
@ -470,7 +470,7 @@
"3": "Was machst du hier? Bist du uns gefolgt?"
},
"victory": {
"1": "Na gut, bis der Boss Zeit für dich hat, werde ich dein Gegner sein!",
"1": "Bwaarharharharhar!! Ich hab zwar verloren, aber das hat Spaß gemacht!",
"2": "Ich kann es fühlen! Ich kann es spüren, das ist klar! Die Stärke, die von dir ausgeht!\n$Mehr! Ich will noch mehr! Aber es sieht so aus, als hätten wir keine Zeit mehr...",
"3": "Das war Spaß! Ich wusste, dass du mir eine gute Zeit bieten würdest!\n$Ich freue mich darauf, dich eines Tages wieder zu treffen!"
}
@ -655,6 +655,86 @@
"5": "Du hast mich besiegt, aber Team Flare wird immer in Glanz und Stil erstrahlen."
}
},
"aether_grunt": {
"encounter": {
"1": "Ich werde dich mit allem, was ich habe, bekämpfen. Ich werde dich auslöschen!",
"2": "Mir ist egal, ob du ein simpler Trainer bist oder nicht.\n$Ich werde dich hochkant rauswerfen, wenn du uns bedrohst!",
"3": "Mir wurde gesagt, Trainer abzuweisen, egal wer sie sind!",
"4": "Ich zeige dir die Macht des Æther-Paradies",
"5": "Jetzt da du die Wahre Natur des Æther-Paradies kennst, müssen wir dich leider beseitigen!"
},
"victory": {
"1": "Hmph! Du scheinst ziemlich geschickt zu sein.",
"2": "Was hat das zu bedeuten? Was hat das zu bedeuten!",
"3": "Hey, du bist so stark, dass ich dich nicht abweisen kann!",
"4": "Hmm... Es scheint, als hätte ich verloren.",
"5": "Ich hätte das Blitzdings benutzen sollen..."
}
},
"faba": {
"encounter": {
"1": "Ich bin Regionalleiter Fabian und ich werde dir zeigen, wie hart die Welt sein kann!",
"2": "Die letzte Verteidigungslinie des Æther-Paradieses kämpft gegen einen simplen Trainer?",
"3": "Ich Fabian, bin der Regionalleiter der Æther Foundation.\n$Der einzige auf der Welt, ich bin unersetzlich."
},
"victory": {
"1": "Aiyee!",
"2": "W-w-wie kann das sein?! Wie konnte dieser Trainer...",
"3": "Das ist der Grund... warum ich andere Menschen nicht ausstehen kann."
}
},
"skull_grunt": {
"encounter": {
"1": "Wir sind nicht böse, wir sind einfach nur nicht nett!",
"2": "Willst du Stress, oder was? Das ist unsere Art, Hallo zu sagen! Tschüss, du Punk!",
"3": "Wir sind nur ein paar Typen und Mädels mit großem Interesse an den Pokémon anderer Leute!",
"4": "Wieso machst du einen auf hart, wenn wir schon hart wie Knochen sind, Homie?",
"5": "Yo, platz hier nich rein, ♪ wien wildes Kleinstein! ♪ Wenn du meinst, dass Team Skull ♪\n$an nix denkt als Krawall, ♪ hast du leider nen Knall, ♪ denn das is nich der Fall! ♪\n$Wir wolln hier nur gammeln ♪ und gechillt Staub ansammeln! ♪"
},
"victory": {
"1": "Wie jetzt? Schon vorbei?",
"2": "Woah, lass uns lieber die Kurve kratzen, yo! Kein Bock, hier meinen Schädel zu riskieren...",
"3": "Wir brauchen deine schwachen Pokémon eh nicht!",
"4": "Was? Deine Stärke spür ich bis in die Knochen...",
"5": "Mein Homie und ich sind also weniger wert als Pokémon? Willste uns dissen, oder was?"
}
},
"plumeria": {
"encounter": {
"1": "..Hmph. Du siehst nicht so aus, als wärst du etwas Besonderes.",
"2": "Die blöden Rüpel brauchen viel zu lange, um mit euch gewöhnlichen Trainern fertig zu werden...",
"3": "Lege dich mit irgendjemandem in Team Skull an, und ich zeige dir, wie ernst ich werden kann."
},
"victory": {
"1": "Du bist ziemlich stark. Das muss ich zugeben.",
"2": "Jetzt versteh ich, warum meine Rüpel so viel Zeit damit verschwenden...",
"3": "Ich denke, ich muss diese Niederlage einfach hinnehmen."
}
},
"macro_grunt": {
"encounter": {
"1": "Achtung hier ist Endstation für dich!",
"2": "Du bist ein Trainer, oder? Wir von MC Wertpapiere wissen so etwas.\n$Ich fürchte, das gibt dir trotzdem nicht das Recht, sich in unsere Arbeit einzumischen.",
"3": "Ich bin von MC Versicherungen! Hast du eine Lebensversicherung?"
},
"victory": {
"1": "Ich habe keine andere Wahl, als respektvoll zurückzutreten.",
"2": "Mein Erspartes aufzugeben bringt mich in die roten Zahlen...",
"3": "Okay zurück an die Arbeit. Versicherungen verkauft sich nicht von alleine."
}
},
"oleana": {
"encounter": {
"1": "Ich werde keine Störung von Präsident Roses Plänen zulassen!",
"2": "Du hast es also durch die Mitarbeiter der Tochterunternehmen geschafft,\n$die ich beauftragt habe, um dich aufzuhalten. Ich hätte nichts anderes erwartet.",
"3": "Für den Präsidenten! Ich werde nicht verlieren! \n$Mach dich bereit mit Macro Cosmos Airlines nach Hause zu fliegen!"
},
"victory": {
"1": "Ich habe es nicht geschafft... Olivia... du bist wirklich eine hoffnungslose Frau.",
"2": "Arghhh! Das ist unentschuldbar... Was habe ich mir dabei gedacht...\n$Jeder Trainer, der es so weit geschafft hat, muss ein harter Brocken sein...",
"3": "Ich bin eine müde Olivia... Ob es Macro Cosmos Betten gibt?"
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "Ich bin beeindruckt, du hast es bis hierher geschafft!\n$Ich bin Giovanni, der Anführer von Team Rocket!\n$Wir regieren den Untergrund von Kanto!\n$Und wir lassen sicherlich nicht zu, dass ein Kind uns aufhält!"
@ -787,6 +867,72 @@
"1": "Narren ohne Vision werden weiterhin diese wunderschöne Welt verunreinigen."
}
},
"aether_boss_lusamine_1": {
"encounter": {
"1": "Du wirst mein süßes Biest erschrecken! Wie kannst du nur? Ultra-Besiten sind so niedlich!\n$Es sieht so aus, als müsste ich dich zuerst zum Schweigen bringen."
},
"victory": {
"1": "Wie kann eine Person nur so grausam sein?!"
},
"defeat": {
"1": "Und jetzt, mein süßes Biest, komm zu Mama!"
}
},
"aether_boss_lusamine_2": {
"encounter": {
"1": "Wieso musst du mich weiterhin belästigen?! Ich habe die Nase voll von dir.\n$Du machst mich krank! Genug mit diesem nutzlosen Gerede... \n$Mit der Kraft von Anego, von uns als UB-01 Schmarotzer klassifiziert,\n$werde ich dir zeigen, wie falsch du warst, hierher zu kommen!"
},
"victory": {
"1": "Aaauuuggghhhhhhhhh!!!"
},
"defeat": {
"1": "Alles, was ich will, ist mein kostbares Biest! Der Rest von euch ist mir egal!"
}
},
"skull_boss_guzma_1": {
"encounter": {
"1": "Kein Erbarmen! Keine Gnade! Ich bin dein schlimmster Alptraum! \n$Oh yeah, ich bin der große, böse Bromley!"
},
"victory": {
"1": "Irgendwann mach ich dich platt! Ich hab noch ein Ass im Ärmel. Du wirst schon sehen."
},
"defeat": {
"1": "Du hast den langen Weg hierher DAFÜR aufgenommen? Pah!"
}
},
"skull_boss_guzma_2": {
"encounter": {
"1": "Mir ist egal, wer du bist. Ich mach dich platt!! Das schreibt mir mein Ego vor. Ich bin Bromley!"
},
"victory": {
"1": "Bromley!!! Was ist falsch mit dir?!"
},
"defeat": {
"1": "Ihr seid wirklich selten dämlich."
}
},
"macro_boss_rose_1": {
"encounter": {
"1": "Mein Name ist Rose. Ich bin der Präsident der Galar Pokémon-Liga und Geschäftsführer von Macro Cosmos\n$Ich habe eine Aufgabe, eine Berufung! Ich muss die Galar-Region mit unbegrenzter Energie versorgen,\n$damit sie sich bis in alle Ewigkeit in Frieden fortentwickeln kann!"
},
"victory": {
"1": "Du versteht es einfach nicht...So können wir die Geschichte nicht verändern!"
},
"defeat": {
"1": "Ohne deine Einmischung kann ich jetzt endlich weiterarbeiten!"
}
},
"macro_boss_rose_2": {
"encounter": {
"1": "Ich bin fest entschlossen, das Energieproblem in der Galar-Region\n$und natürlich auf der ganzen Welt zu lösen.\n$Meine Erfahrungen und Erfolge, die Macro Cosmos zu einem Erfolg gemacht haben,\n$sind der Beweis, dass meine Methoden funktionieren.\n$Ich habe nicht vor, meine Meinung zu ändern, selbst wenn ich verliere."
},
"victory": {
"1": "Ich hatte vergessen, wie großartig Pokémon-Kämpfe sind! Es ist so lange her, dass ich gekämpft habe...\n$Das war wirklich befriedigend, ich akzeptiere die Niederlage für diesen Kampf."
},
"defeat": {
"1": "Ich nehme an, es muss den Anschein haben, dass ich etwas Schreckliches tue.\n$Ich erwarte nicht, dass du es verstehst. Aber ich muss der Galar-Region grenzenlose Energie\n$bereitstellen, um ewigen Wohlstand zu gewährleisten."
}
},
"brock": {
"encounter": {
"1": "Meine Expertise in Bezug auf Gesteins-Pokémon wird dich besiegen! Komm schon!",

View File

@ -441,7 +441,7 @@
},
"courtney": {
"encounter": {
"1": "Das Ding... Das Ding, das du hältst... Das ist es, was...\n$Das ist es, wonach wir von Team Magma suchen...",
"1": "Stellt euch...Mir NICHT...IN DEN WEEEG...!!",
"2": "... Nun dann... Auslöschen...",
"3": "...?! Du... Hm... ♪ Das trifft sich ausgezeichnet... ♪\n$Dann hole ich mir eben zuerst deine Pokémon... Her damit..."
},
@ -470,7 +470,7 @@
"3": "Was machst du hier? Bist du uns gefolgt?"
},
"victory": {
"1": "Na gut, bis der Boss Zeit für dich hat, werde ich dein Gegner sein!",
"1": "Bwaarharharharhar!! Ich hab zwar verloren, aber das hat Spaß gemacht!",
"2": "Ich kann es fühlen! Ich kann es spüren, das ist klar! Die Stärke, die von dir ausgeht!\n$Mehr! Ich will noch mehr! Aber es sieht so aus, als hätten wir keine Zeit mehr...",
"3": "Das war Spaß! Ich wusste, dass du mir eine gute Zeit bieten würdest!\n$Ich freue mich darauf, dich eines Tages wieder zu treffen!"
}
@ -655,6 +655,86 @@
"5": "Du hast mich besiegt, aber Team Flare wird immer in Glanz und Stil erstrahlen."
}
},
"aether_grunt": {
"encounter": {
"1": "Ich werde dich mit allem, was ich habe, bekämpfen. Ich werde dich auslöschen!",
"2": "Mir ist egal, ob du ein simpler Trainer bist oder nicht.\n$Ich werde dich hochkant rauswerfen, wenn du uns bedrohst!",
"3": "Mir wurde gesagt, Trainer abzuweisen, egal wer sie sind!",
"4": "Ich zeige dir die Macht des Æther-Paradies",
"5": "Jetzt da du die Wahre Natur des Æther-Paradies kennst, müssen wir dich leider beseitigen!"
},
"victory": {
"1": "Hmph! Du scheinst ziemlich geschickt zu sein.",
"2": "Was hat das zu bedeuten? Was hat das zu bedeuten!",
"3": "Hey, du bist so stark, dass ich dich nicht abweisen kann!",
"4": "Hmm... Es scheint, als hätte ich verloren.",
"5": "Ich hätte das Blitzdings benutzen sollen..."
}
},
"faba": {
"encounter": {
"1": "Ich bin Regionalleiter Fabian und ich werde dir zeigen, wie hart die Welt sein kann!",
"2": "Die letzte Verteidigungslinie des Æther-Paradieses kämpft gegen einen simplen Trainer?",
"3": "Ich Fabian, bin der Regionalleiter der Æther Foundation.\n$Der einzige auf der Welt, ich bin unersetzlich."
},
"victory": {
"1": "Aiyee!",
"2": "W-w-wie kann das sein?! Wie konnte dieser Trainer...",
"3": "Das ist der Grund... warum ich andere Menschen nicht ausstehen kann."
}
},
"skull_grunt": {
"encounter": {
"1": "Wir sind nicht böse, wir sind einfach nur nicht nett!",
"2": "Willst du Stress, oder was? Das ist unsere Art, Hallo zu sagen! Tschüss, du Punk!",
"3": "Wir sind nur ein paar Typen und Mädels mit großem Interesse an den Pokémon anderer Leute!",
"4": "Wieso machst du einen auf hart, wenn wir schon hart wie Knochen sind, Homie?",
"5": "Yo, platz hier nich rein, ♪ wien wildes Kleinstein! ♪ Wenn du meinst, dass Team Skull ♪\n$an nix denkt als Krawall, ♪ hast du leider nen Knall, ♪ denn das is nich der Fall! ♪\n$Wir wolln hier nur gammeln ♪ und gechillt Staub ansammeln! ♪"
},
"victory": {
"1": "Wie jetzt? Schon vorbei?",
"2": "Woah, lass uns lieber die Kurve kratzen, yo! Kein Bock, hier meinen Schädel zu riskieren...",
"3": "Wir brauchen deine schwachen Pokémon eh nicht!",
"4": "Was? Deine Stärke spür ich bis in die Knochen...",
"5": "Mein Homie und ich sind also weniger wert als Pokémon? Willste uns dissen, oder was?"
}
},
"plumeria": {
"encounter": {
"1": "..Hmph. Du siehst nicht so aus, als wärst du etwas Besonderes.",
"2": "Die blöden Rüpel brauchen viel zu lange, um mit euch gewöhnlichen Trainern fertig zu werden...",
"3": "Lege dich mit irgendjemandem in Team Skull an, und ich zeige dir, wie ernst ich werden kann."
},
"victory": {
"1": "Du bist ziemlich stark. Das muss ich zugeben.",
"2": "Jetzt versteh ich, warum meine Rüpel so viel Zeit damit verschwenden...",
"3": "Ich denke, ich muss diese Niederlage einfach hinnehmen."
}
},
"macro_grunt": {
"encounter": {
"1": "Achtung hier ist Endstation für dich!",
"2": "Du bist ein Trainer, oder? Wir von MC Wertpapiere wissen so etwas.\n$Ich fürchte, das gibt dir trotzdem nicht das Recht, sich in unsere Arbeit einzumischen.",
"3": "Ich bin von MC Versicherungen! Hast du eine Lebensversicherung?"
},
"victory": {
"1": "Ich habe keine andere Wahl, als respektvoll zurückzutreten.",
"2": "Mein Erspartes aufzugeben bringt mich in die roten Zahlen...",
"3": "Okay zurück an die Arbeit. Versicherungen verkauft sich nicht von alleine."
}
},
"oleana": {
"encounter": {
"1": "Ich werde keine Störung von Präsident Roses Plänen zulassen!",
"2": "Du hast es also durch die Mitarbeiter der Tochterunternehmen geschafft,\n$die ich beauftragt habe, um dich aufzuhalten. Ich hätte nichts anderes erwartet.",
"3": "Für den Präsidenten! Ich werde nicht verlieren! \n$Mach dich bereit mit Macro Cosmos Airlines nach Hause zu fliegen!"
},
"victory": {
"1": "Ich habe es nicht geschafft... Olivia... du bist wirklich eine hoffnungslose Frau.",
"2": "Arghhh! Das ist unentschuldbar... Was habe ich mir dabei gedacht...\n$Jeder Trainer, der es so weit geschafft hat, muss ein harter Brocken sein...",
"3": "Ich bin eine müde Olivia... Ob es Macro Cosmos Betten gibt?"
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "Ich bin beeindruckt, du hast es bis hierher geschafft!\n$Ich bin Giovanni, der Anführer von Team Rocket!\n$Wir regieren den Untergrund von Kanto!\n$Und wir lassen sicherlich nicht zu, dass ein Kind uns aufhält!"
@ -787,6 +867,72 @@
"1": "Narren ohne Vision werden weiterhin diese wunderschöne Welt verunreinigen."
}
},
"aether_boss_lusamine_1": {
"encounter": {
"1": "Du wirst mein süßes Biest erschrecken! Wie kannst du nur? Ultra-Besiten sind so niedlich!\n$Es sieht so aus, als müsste ich dich zuerst zum Schweigen bringen."
},
"victory": {
"1": "Wie kann eine Person nur so grausam sein?!"
},
"defeat": {
"1": "Und jetzt, mein süßes Biest, komm zu Mama!"
}
},
"aether_boss_lusamine_2": {
"encounter": {
"1": "Wieso musst du mich weiterhin belästigen?! Ich habe die Nase voll von dir.\n$Du machst mich krank! Genug mit diesem nutzlosen Gerede... \n$Mit der Kraft von Anego, von uns als UB-01 Schmarotzer klassifiziert,\n$werde ich dir zeigen, wie falsch du warst, hierher zu kommen!"
},
"victory": {
"1": "Aaauuuggghhhhhhhhh!!!"
},
"defeat": {
"1": "Alles, was ich will, ist mein kostbares Biest! Der Rest von euch ist mir egal!"
}
},
"skull_boss_guzma_1": {
"encounter": {
"1": "Kein Erbarmen! Keine Gnade! Ich bin dein schlimmster Alptraum! \n$Oh yeah, ich bin der große, böse Bromley!"
},
"victory": {
"1": "Irgendwann mach ich dich platt! Ich hab noch ein Ass im Ärmel. Du wirst schon sehen."
},
"defeat": {
"1": "Du hast den langen Weg hierher DAFÜR aufgenommen? Pah!"
}
},
"skull_boss_guzma_2": {
"encounter": {
"1": "Mir ist egal, wer du bist. Ich mach dich platt!! Das schreibt mir mein Ego vor. Ich bin Bromley!"
},
"victory": {
"1": "Bromley!!! Was ist falsch mit dir?!"
},
"defeat": {
"1": "Ihr seid wirklich selten dämlich."
}
},
"macro_boss_rose_1": {
"encounter": {
"1": "Mein Name ist Rose. Ich bin der Präsident der Galar Pokémon-Liga und Geschäftsführer von Macro Cosmos\n$Ich habe eine Aufgabe, eine Berufung! Ich muss die Galar-Region mit unbegrenzter Energie versorgen,\n$damit sie sich bis in alle Ewigkeit in Frieden fortentwickeln kann!"
},
"victory": {
"1": "Du versteht es einfach nicht...So können wir die Geschichte nicht verändern!"
},
"defeat": {
"1": "Ohne deine Einmischung kann ich jetzt endlich weiterarbeiten!"
}
},
"macro_boss_rose_2": {
"encounter": {
"1": "Ich bin fest entschlossen, das Energieproblem in der Galar-Region\n$und natürlich auf der ganzen Welt zu lösen.\n$Meine Erfahrungen und Erfolge, die Macro Cosmos zu einem Erfolg gemacht haben,\n$sind der Beweis, dass meine Methoden funktionieren.\n$Ich habe nicht vor, meine Meinung zu ändern, selbst wenn ich verliere."
},
"victory": {
"1": "Ich hatte vergessen, wie großartig Pokémon-Kämpfe sind! Es ist so lange her, dass ich gekämpft habe...\n$Das war wirklich befriedigend, ich akzeptiere die Niederlage für diesen Kampf."
},
"defeat": {
"1": "Ich nehme an, es muss den Anschein haben, dass ich etwas Schreckliches tue.\n$Ich erwarte nicht, dass du es verstehst. Aber ich muss der Galar-Region grenzenlose Energie\n$bereitstellen, um ewigen Wohlstand zu gewährleisten."
}
},
"brock": {
"encounter": {
"1": "Meine Expertise in Bezug auf Gesteins-Pokémon wird dich besiegen! Komm schon!",
@ -2463,7 +2609,7 @@
"1": "@c{smile_wave}Oh, wie schön dich hier zu trefen. Sieht so aus als wärst du noch ungeschlagen. @c{angry_mopen}Hmm… Nicht schlecht!\n$@c{angry_mopen}Ich weiß was du denkst, und nein, ich habe dich nicht verfolgt. @c{smile_eclosed}Ich bin einfach in der Gegend gewesen.\n$@c{smile_ehalf}Ich freu mich für dich, aber ich muss dich wissen lassen, dass es auch Ok ist ab und zu mal zu verlieren.\n$@c{smile}Wir lernen oft mehr aus unseren Fehlern, als aus unseren Erfolgen.\n$@c{angry_mopen}Auf jeden Fall habe ich für unseren Rückkampf hart traniert. Also zeig mir was du drauf hast!"
},
"victory": {
"1": "@c{neutral}Ich… sollte dieses Mal doch nicht verlieren…\n$@c{smile}Na gut. Das bedeutet ich muss noch härter tranieren!\n$@c{smile_wave}Ich habe noch eins von diesen Dingern!\n@c{smile_wave_wink}Kein Grund mir zu danken~.\n$@c{angry_mopen}Das ist aber das Letzte! Du bekommst ab jett keine Geschenke mehr von mir!\n$@c{smile_wave}Bleib stark"
"1": "@c{neutral}Ich… sollte dieses Mal doch nicht verlieren…\n$@c{smile}Na gut. Das bedeutet ich muss noch härter tranieren!\n$@c{smile_wave}Ich habe noch eins von diesen Dingern!\n@c{smile_wave_wink}Kein Grund mir zu danken~.\n$@c{angry_mopen}Das ist aber das Letzte! Du bekommst ab jett keine Geschenke mehr von mir!\n$@c{smile_wave}Bleib stark!"
},
"defeat": {
"1": "Es ist Ok manchmal zu verlieren…"

View File

@ -13,5 +13,32 @@
"metFragment": {
"normal": "Herkunft: {{biome}}\nMit Lv. {{level}} erhalten.",
"apparently": "Herkunft: {{biome}}\nOffenbar mit Lv. {{level}} erhalten."
},
"natureFragment": {
"Hardy": "{{nature}}",
"Lonely": "{{nature}}",
"Brave": "{{nature}}",
"Adamant": "{{nature}}",
"Naughty": "{{nature}}",
"Bold": "{{nature}}",
"Docile": "{{nature}}",
"Relaxed": "{{nature}}",
"Impish": "{{nature}}",
"Lax": "{{nature}}",
"Timid": "{{nature}}",
"Hasty": "{{nature}}",
"Serious": "{{nature}}",
"Jolly": "{{nature}}",
"Naive": "{{nature}}",
"Modest": "{{nature}}",
"Mild": "{{nature}}",
"Quiet": "{{nature}}",
"Bashful": "{{nature}}",
"Rash": "{{nature}}",
"Calm": "{{nature}}",
"Gentle": "{{nature}}",
"Sassy": "{{nature}}",
"Careful": "{{nature}}",
"Quirky": "{{nature}}"
}
}

View File

@ -117,5 +117,14 @@
"plasma_grunts": "Rüpel von Team Plasma",
"flare_grunt": "Rüpel von Team Flare",
"flare_grunt_female": "Rüpel von Team Flare",
"flare_grunts": "Rüpel von Team Flare"
"flare_grunts": "Rüpel von Team Flare",
"aether_grunt": "Æther Foundation Personal",
"aether_grunt_female": "Æther Foundation Personal",
"aether_grunts": "Æther Foundation Personal",
"skull_grunt": "Rüpel von Team Skull",
"skull_grunt_female": "Rüpel von Team Skull",
"skull_grunts": "Rüpel von Team Skull",
"macro_grunt": "Angestellter von Macro Cosmos",
"macro_grunt_female": "Angestellte von Macro Cosmos",
"macro_grunts": "Angestellte von Macro Cosmos"
}

View File

@ -139,12 +139,18 @@
"rood": "Rubius",
"xerosic": "Xeros",
"bryony": "Begonia",
"faba": "Fabian",
"plumeria": "Fran",
"oleana": "Olivia",
"maxie": "Marc",
"archie": "Adrian",
"cyrus": "Zyrus",
"ghetsis": "G-Cis",
"lysandre": "Flordelis",
"lusamine": "Samantha",
"guzma": "Bromley",
"rose": "Rose",
"blue_red_double": "Blau & Rot",
"red_blue_double": "Rot & Blau",

View File

@ -16,6 +16,9 @@
"galactic_boss": "Galaktik-Boss",
"plasma_boss": "Weiser von Team Plasma",
"flare_boss": "Flare-Boss",
"aether_boss": "Æther-Präsidentin",
"skull_boss": "Skull-Boss",
"macro_boss": "Geschäftsführer von Macro Cosmos",
"rocket_admin": "Team Rocket Vorstand",
"rocket_admin_female": "Team Rocket Vorstand",
"magma_admin": "Team Magma Vorstand",
@ -27,5 +30,9 @@
"plasma_sage": "Weiser von Team Plasma",
"plasma_admin": "Team Plasma Vorstand",
"flare_admin": "Team Flare Vorstand",
"flare_admin_female": "Team Flare Vorstand"
"flare_admin_female": "Team Flare Vorstand",
"aether_admin": "Æther-Regionalleiter",
"skull_admin": "Team Skull Vorstand",
"macro_admin": "Vizepräsidentin von Macro Cosmos"
}

View File

@ -38,7 +38,7 @@
"learnMoveNotLearned": "{{pokemonName}} did not learn the\nmove {{moveName}}.",
"learnMoveForgetQuestion": "Which move should be forgotten?",
"learnMoveForgetSuccess": "{{pokemonName}} forgot how to\nuse {{moveName}}.",
"countdownPoof": "@d{32}1, @d{15}2, and@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}Poof!",
"countdownPoof": "@d{32}1, @d{15}2, and@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}Poof!",
"learnMoveAnd": "And…",
"levelCapUp": "The level cap\nhas increased to {{levelCap}}!",
"moveNotImplemented": "{{moveName}} is not yet implemented and cannot be selected.",

View File

@ -80,11 +80,21 @@
"battle_galactic_grunt": "BDSP Team Galactic Battle",
"battle_plasma_grunt": "BW Team Plasma Battle",
"battle_flare_grunt": "XY Team Flare Battle",
"battle_aether_grunt": "SM Aether Foundation Battle",
"battle_skull_grunt": "SM Team Skull Battle",
"battle_macro_grunt": "SWSH Trainer Battle",
"battle_galactic_admin": "BDSP Team Galactic Admin Battle",
"battle_skull_admin": "SM Team Skull Admin Battle",
"battle_oleana": "SWSH Oleana Battle",
"battle_rocket_boss": "USUM Giovanni Battle",
"battle_aqua_magma_boss": "ORAS Archie & Maxie Battle",
"battle_galactic_boss": "BDSP Cyrus Battle",
"battle_plasma_boss": "B2W2 Ghetsis Battle",
"battle_flare_boss": "XY Lysandre Battle",
"battle_aether_boss": "SM Lusamine Battle",
"battle_skull_boss": "SM Guzma Battle",
"battle_macro_boss": "SWSH Rose Battle",
"abyss": "PMD EoS Dark Crater",
"badlands": "PMD EoS Barren Valley",
"beach": "PMD EoS Drenched Bluff",

View File

@ -655,6 +655,86 @@
"5": "You may have beaten me, but when I lose, I go out in style!"
}
},
"aether_grunt": {
"encounter": {
"1": "I'll fight you with all I have to wipe you out!",
"2": "I don't care if you're a kid or what. I'll send you flying if you threaten us!",
"3": "I was told to turn away Trainers, whomever they might be!",
"4": "I'll show you the power of Aether Paradise!",
"5": "Now that you've learned of the darkness at the heart of Aether Paradise, we'll need you to conveniently disappear!"
},
"victory": {
"1": "Hmph! You seem to have a lot of skill.",
"2": "What does this mean? What does this mean!",
"3": "Hey! You're so strong that there's no way I can turn you away!",
"4": "Hmm... It seems as though I may have lost.",
"5": "Here's an impression for you: Aiyee!"
}
},
"faba": {
"encounter": {
"1": "I, Branch Chief Faba, shall show you the harshness of the real world!",
"2": "The man who is called Aether Paradise's last line of defense is to battle a mere child?",
"3": "I, Faba, am the Aether Branch Chief. The only one in the world, I'm irreplaceable."
},
"victory": {
"1": "Aiyee!",
"2": "H-h-how can this be?! How could this child...",
"3": "This is why... This is why I can't bring myself to like children."
}
},
"skull_grunt": {
"encounter": {
"1": "We're not bad-we're just hard!",
"2": "You want some? That's how we say hello! Nice knowing you, punks!",
"3": "We're just a bunch of guys and gals with a great interest in other people's Pokémon!",
"4": "Why you trying to act hard when we're already hard as bones out here, homie?",
"5": "Team Skull represent! We can't pay the rent! Had a lot of fun, but our youth was misspent!"
},
"victory": {
"1": "Huh? Is it over already?",
"2": "Time for us to break out, yo! Gotta tell y'all peace out, yo!",
"3": "We don't need your wack Pokémon anyway!",
"4": "Wha-?! This kid's way too strong-no bones about it!",
"5": "So, what? I'm lower than a Pokémon?! I already got self-esteem issues, man."
}
},
"plumeria": {
"encounter": {
"1": " ...Hmph. You don't look like anything special to me.",
"2": "It takes these dumb Grunts way too long to deal with you kids...",
"3": "Mess with anyone in Team Skull, and I'll show you how serious I can get."
},
"victory": {
"1": "Hmmph! You're pretty strong. I'll give you that.",
"2": "Hmmph. Guess you are pretty tough. Now I understand why my Grunts waste so much time battling kids.",
"3": "Hmmph! I guess I just have to hold that loss."
}
},
"macro_grunt": {
"encounter": {
"1": "It looks like this is the end of the line for you!",
"2": "You are a trainer aren't you? I'm afraid that doesn't give you the right to interfere in our work.",
"3": "I'm from Macro Cosmos Insurance! Do you have a life insurance policy?"
},
"victory": {
"1": "I have little choice but to respectfully retreat.",
"2": "Having to give up my pocket money... Losing means I'm back in the red...",
"3": "Nobody can beat Macro Cosmos when it comes to our dedication to our work!"
}
},
"oleana": {
"encounter": {
"1": "I won't let anyone interfere with Mr. Rose's plan!",
"2": "So, you got through all of the special staff that I had ordered to stop you. I would expect nothing less.",
"3": "For the chairman! I won't lose!"
},
"victory": {
"1": "*sigh* I wasn't able to win... Oleana...you really are a hopeless woman.",
"2": "Arghhh! This is inexcusable... What was I thinking... Any trainer who's made it this far would be no pushover..",
"3": "*sigh* I am one tired Oleana..."
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "So! I must say, I am impressed you got here!"
@ -787,6 +867,72 @@
"1": "Fools with no vision will continue to befoul this beautiful world."
}
},
"aether_boss_lusamine_1": {
"encounter": {
"1": "You're going to startle my sweet beast! It looks like I'll need to silence you first."
},
"victory": {
"1": "How... how can you be so awful!"
},
"defeat": {
"1": "Hmph..."
}
},
"aether_boss_lusamine_2": {
"encounter": {
"1": "Why must you continue to pester me?! I am sick of you. Sick through and through!\n$Enough with this useless talk.. with Nihilego's power I will show you how wrong you were to come here!"
},
"victory": {
"1": "Aaauuuggghhhhhhhhh!!!"
},
"defeat": {
"1": "All that I want is my precious beast! I don't care about any of the rest of you!"
}
},
"skull_boss_guzma_1": {
"encounter": {
"1": "The hated boss who beats you down and beats you down and never lets up...\n$Yeah. Big bad Guzma is here!"
},
"victory": {
"1": "Tch. I'm gonna beat you down one of these days!"
},
"defeat": {
"1": "And you came all the way out here just for that, huh?"
}
},
"skull_boss_guzma_2": {
"encounter": {
"1": "Doesn't matter who I'm up against, I'm gonna beat them down!\n$That's what big bad Guzma is all about!"
},
"victory": {
"1": "Guzma!!! What is wrong with you?!"
},
"defeat": {
"1": "Y'all are stupid!"
}
},
"macro_boss_rose_1": {
"encounter": {
"1": "I must provide limitless energy to ensure everlasting prosperity for everyone...\n$It is my purpose, my duty, my destiny!"
},
"victory": {
"1": "You still don't understand, trainer...\n$We... No, I am going to change the course of history!"
},
"defeat": {
"1": "You still don't understand a thing!"
}
},
"macro_boss_rose_2": {
"encounter": {
"1": "I'm committed to solving the energy problem in the Galar region—and, of course, around the world.\n$My experience and accomplishments that made Macro Cosmos a success are proof my methods work.\n$I don't intend to change my mind, even if I lose."
},
"victory": {
"1": "I'd forgotten how great Pokémon battles are! It's been so long since I battled...\n$That sure was satisfying, I accept defeat for this battle."
},
"defeat": {
"1": "I suppose it must seem that I am doing something terrible. I don't expect you to understand.\n$But I must provide the Galar region with limitless energy to ensure everlasting prosperity."
}
},
"brock": {
"encounter": {
"1": "My expertise on Rock-type Pokémon will take you down! Come on!",

View File

@ -655,6 +655,86 @@
"5": "You may have beaten me, but when I lose, I go out in style!"
}
},
"aether_grunt": {
"encounter": {
"1": "I'll fight you with all I have to wipe you out!",
"2": "I don't care if you're a kid or what. I'll send you flying if you threaten us!",
"3": "I was told to turn away Trainers, whomever they might be!",
"4": "I'll show you the power of Aether Paradise!",
"5": "Now that you've learned of the darkness at the heart of Aether Paradise, we'll need you to conveniently disappear!"
},
"victory": {
"1": "Hmph! You seem to have a lot of skill.",
"2": "What does this mean? What does this mean!",
"3": "Hey! You're so strong that there's no way I can turn you away!",
"4": "Hmm... It seems as though I may have lost.",
"5": "Here's an impression for you: Aiyee!"
}
},
"faba": {
"encounter": {
"1": "I, Branch Chief Faba, shall show you the harshness of the real world!",
"2": "The man who is called Aether Paradise's last line of defense is to battle a mere child?",
"3": "I, Faba, am the Aether Branch Chief. The only one in the world, I'm irreplaceable."
},
"victory": {
"1": "Aiyee!",
"2": "H-h-how can this be?! How could this child...",
"3": "This is why... This is why I can't bring myself to like children."
}
},
"skull_grunt": {
"encounter": {
"1": "We're not bad-we're just hard!",
"2": "You want some? That's how we say hello! Nice knowing you, punks!",
"3": "We're just a bunch of guys and gals with a great interest in other people's Pokémon!",
"4": "Why you trying to act hard when we're already hard as bones out here, homie?",
"5": "Team Skull represent! We can't pay the rent! Had a lot of fun, but our youth was misspent!"
},
"victory": {
"1": "Huh? Is it over already?",
"2": "Time for us to break out, yo! Gotta tell y'all peace out, yo!",
"3": "We don't need your wack Pokémon anyway!",
"4": "Wha-?! This kid's way too strong-no bones about it!",
"5": "So, what? I'm lower than a Pokémon?! I already got self-esteem issues, man."
}
},
"plumeria": {
"encounter": {
"1": " ...Hmph. You don't look like anything special to me.",
"2": "It takes these dumb Grunts way too long to deal with you kids..",
"3": "Mess with anyone in Team Skull, and I'll show you how serious I can get."
},
"victory": {
"1": "Hmmph! You're pretty strong. I'll give you that.",
"2": "Hmmph. Guess you are pretty tough. Now I understand why my Grunts waste so much time battling kids.",
"3": "Hmmph! I guess I just have to hold that loss."
}
},
"macro_grunt": {
"encounter": {
"1": "It looks like this is the end of the line for you!",
"2": "You are a trainer aren't you? I'm afraid that doesn't give you the right to interfere in our work.",
"3": "I'm from Macro Cosmos Insurance! Do you have a life insurance policy?"
},
"victory": {
"1": "I have little choice but to respectfully retreat.",
"2": "Having to give up my pocket money... Losing means I'm back in the red...",
"3": "Nobody can beat Macro Cosmos when it comes to our dedication to our work!"
}
},
"oleana": {
"encounter": {
"1": "I won't let anyone interfere with Mr. Rose's plan!",
"2": "So, you got through all of the special staff that I had ordered to stop you. I would expect nothing less.",
"3": "For the chairman! I won't lose!"
},
"victory": {
"1": "*sigh* I wasn't able to win... Oleana...you really are a hopeless woman.",
"2": "Arghhh! This is inexcusable... What was I thinking... Any trainer who's made it this far would be no pushover..",
"3": "*sigh* I am one tired Oleana..."
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "So! I must say, I am impressed you got here!"
@ -787,6 +867,72 @@
"1": "Fools with no vision will continue to befoul this beautiful world."
}
},
"aether_boss_lusamine_1": {
"encounter": {
"1": "You're going to startle my sweet beast! It looks like I'll need to silence you first."
},
"victory": {
"1": "How... how can you be so awful!"
},
"defeat": {
"1": "Hmph..."
}
},
"aether_boss_lusamine_2": {
"encounter": {
"1": "Why must you continue to pester me?! I am sick of you. Sick through and through!\n$Enough with this useless talk.. with Nihilego's power I will show you how wrong you were to come here!"
},
"victory": {
"1": "Aaauuuggghhhhhhhhh!!!"
},
"defeat": {
"1": "All that I want is my precious beast! I don't care about any of the rest of you!"
}
},
"skull_boss_guzma_1": {
"encounter": {
"1": "The hated boss who beats you down and beats you down and never lets up...\n$Yeah. Big bad Guzma is here!"
},
"victory": {
"1": "Tch. I'm gonna beat you down one of these days!"
},
"defeat": {
"1": "And you came all the way out here just for that, huh?"
}
},
"skull_boss_guzma_2": {
"encounter": {
"1": "Doesn't matter who I'm up against, I'm gonna beat them down!\n$That's what big bad Guzma is all about!"
},
"victory": {
"1": "Guzma!!! What is wrong with you?!"
},
"defeat": {
"1": "Y'all are stupid!"
}
},
"macro_boss_rose_1": {
"encounter": {
"1": "I must provide limitless energy to ensure everlasting prosperity for everyone...\n$It is my purpose, my duty, my destiny!"
},
"victory": {
"1": "You still don't understand, trainer...\n$We... No, I am going to change the course of history!"
},
"defeat": {
"1": "You still don't understand a thing!"
}
},
"macro_boss_rose_2": {
"encounter": {
"1": "I'm committed to solving the energy problem in the Galar region—and, of course, around the world.\n$My experience and accomplishments that made Macro Cosmos a success are proof my methods work.\n$I don't intend to change my mind, even if I lose."
},
"victory": {
"1": "I'd forgotten how great Pokémon battles are! It's been so long since I battled...\n$That sure was satisfying, I accept defeat for this battle."
},
"defeat": {
"1": "I suppose it must seem that I am doing something terrible. I don't expect you to understand.\n$But I must provide the Galar region with limitless energy to ensure everlasting prosperity."
}
},
"brock": {
"encounter": {
"1": "My expertise on Rock-type Pokémon will take you down! Come on!",

View File

@ -13,5 +13,32 @@
"metFragment": {
"normal": "met at Lv{{level}},\n{{biome}}.",
"apparently": "apparently met at Lv{{level}},\n{{biome}}."
},
"natureFragment": {
"Hardy": "{{nature}}",
"Lonely": "{{nature}}",
"Brave": "{{nature}}",
"Adamant": "{{nature}}",
"Naughty": "{{nature}}",
"Bold": "{{nature}}",
"Docile": "{{nature}}",
"Relaxed": "{{nature}}",
"Impish": "{{nature}}",
"Lax": "{{nature}}",
"Timid": "{{nature}}",
"Hasty": "{{nature}}",
"Serious": "{{nature}}",
"Jolly": "{{nature}}",
"Naive": "{{nature}}",
"Modest": "{{nature}}",
"Mild": "{{nature}}",
"Quiet": "{{nature}}",
"Bashful": "{{nature}}",
"Rash": "{{nature}}",
"Calm": "{{nature}}",
"Gentle": "{{nature}}",
"Sassy": "{{nature}}",
"Careful": "{{nature}}",
"Quirky": "{{nature}}"
}
}

View File

@ -117,5 +117,14 @@
"plasma_grunts": "Plasma Grunts",
"flare_grunt": "Flare Grunt",
"flare_grunt_female": "Flare Grunt",
"flare_grunts": "Flare Grunts"
"flare_grunts": "Flare Grunts",
"aether_grunt": "Aether Foundation Employee",
"aether_grunt_female": "Aether Foundation Employee",
"aether_grunts": "Aether Foundation Employees",
"skull_grunt": "Team Skull Grunt",
"skull_grunt_female": "Team Skull Grunt",
"skull_grunts": "Team Skull Grunts",
"macro_grunt": "Macro Cosmos Trainer",
"macro_grunt_female": "Macro Cosmos Trainer",
"macro_grunts": "Macro Cosmos Trainers"
}

View File

@ -138,11 +138,19 @@
"rood": "Rood",
"xerosic": "Xerosic",
"bryony": "Bryony",
"faba": "Faba",
"plumeria": "Plumeria",
"oleana": "Oleana",
"maxie": "Maxie",
"archie": "Archie",
"cyrus": "Cyrus",
"ghetsis": "Ghetsis",
"lysandre": "Lysandre",
"lusamine": "Lusamine",
"guzma": "Guzma",
"rose": "Rose",
"blue_red_double": "Blue & Red",
"red_blue_double": "Red & Blue",
"tate_liza_double": "Tate & Liza",

View File

@ -16,6 +16,10 @@
"galactic_boss": "Team Galactic Boss",
"plasma_boss": "Team Plasma Boss",
"flare_boss": "Team Flare Boss",
"aether_boss": "Aether President",
"skull_boss": "Team Skull Boss",
"macro_boss": "Macro Cosmos President",
"rocket_admin": "Team Rocket Admin",
"rocket_admin_female": "Team Rocket Admin",
"magma_admin": "Team Magma Admin",
@ -27,5 +31,8 @@
"plasma_sage": "Team Plasma Sage",
"plasma_admin": "Team Plasma Admin",
"flare_admin": "Team Flare Admin",
"flare_admin_female": "Team Flare Admin"
"flare_admin_female": "Team Flare Admin",
"aether_admin": "Aether Foundation Admin",
"skull_admin": "Team Skull Admin",
"macro_admin": "Macro Cosmos"
}

View File

@ -36,7 +36,7 @@
"learnMoveNotLearned": "{{pokemonName}} no ha aprendido {{moveName}}.",
"learnMoveForgetQuestion": "¿Qué movimiento quieres que olvide?",
"learnMoveForgetSuccess": "{{pokemonName}} ha olvidado cómo utilizar {{moveName}}.",
"countdownPoof": "@d{32}1, @d{15}2, @d{15}y@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}¡Puf!",
"countdownPoof": "@d{32}1, @d{15}2, @d{15}y@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}¡Puf!",
"learnMoveAnd": "Y…",
"levelCapUp": "¡Se ha incrementado el\nnivel máximo a {{levelCap}}!",
"moveNotImplemented": "{{moveName}} aún no está implementado y no se puede seleccionar.",

View File

@ -78,11 +78,18 @@
"battle_galactic_grunt": "BDSP Team Galactic Battle",
"battle_plasma_grunt": "BW - ¡Vs Equipo Plasma!",
"battle_flare_grunt": "XY Team Flare Battle",
"battle_aether_grunt": "SM Aether Foundation Battle",
"battle_skull_grunt": "SM Team Skull Battle",
"battle_macro_grunt": "SWSH Trainer Battle",
"battle_galactic_admin": "BDSP Team Galactic Admin Battle",
"battle_skull_admin": "SM Team Skull Admin Battle",
"battle_oleana": "SWSH Oleana Battle",
"battle_rocket_boss": "USUM Giovanni Battle",
"battle_aqua_magma_boss": "ORAS Archie & Maxie Battle",
"battle_galactic_boss": "BDSP Cyrus Battle",
"battle_plasma_boss": "B2W2 Ghetsis Battle",
"battle_flare_boss": "XY Lysandre Battle",
"abyss": "PMD EoS - Cráter Oscuro",
"badlands": "PMD EoS - Valle Desolado",
"beach": "PMD EoS - Risco Calado",

View File

@ -1 +1,52 @@
{}
{
"aether_grunt": {
"encounter": {
"1": "¡Lucharé con toda mi fuerza para detenerte!",
"2": "Me da igual que seas un crío. Eres una amenaza y debes irte.",
"3": "Me dijeron que mandara a todos los entrenadores por donde venían, ¡sin excepciones!",
"4": "¡Te mostraré el poder del Paraíso Æther!",
"5": "Ahora que conoces la oscuridad en lo profundo del Paraíso Æther, es hora de que vayas desapareciendo..."
},
"victory": {
"1": "¡Vaya! Demuestras habilidad.",
"2": "¿Qué quiere decir esto? ¿Eh?",
"3": "¡Vaya! Con esa fuerza, ¡no creo que pueda detenerte!",
"4": "Vaya... parece que puede que haya perdido.",
"5": "¡Mira, te hago una mueca!: ¡Aiyee!"
}
},
"faba": {
"encounter": {
"1": "¡Yo, Subdirector Fabio, te mostraré la cruda realidad del mundo!",
"2": "¿Yo, la última línea de defensa de Æther, battallando a un mero crío?",
"3": "Yo, Fabio, soy el Subdirector de la Fundación Æther. Soy el único en el mundo, soy irremplazable."
},
"victory": {
"1": "¡Aaaah!",
"2": "¿C-c-cómo puede ser? Eres tan solo un niño...",
"3": "Este... este es el motivo por el que odio a los niños."
}
},
"aether_boss_lusamine_1": {
"encounter": {
"1": "¡Vas a asustar a mi pobre criatura! Parece que tendré que silenciarte cuanto antes."
},
"victory": {
"1": "¿Cómo?¿Cómo puedes ser tan terrible?"
},
"defeat": {
"1": "Buff."
}
},
"aether_boss_lusamine_2": {
"encounter": {
"1": "¡¿Por qué me sigues molestando?! Estoy cansada de ti. ¡Hasta las narices!\n$Se acabó esta charla innecesaria. Este es el poder de Nihilego, ¡te demostraré cuánto te equivocas al venir aquí!"
},
"victory": {
"1": "¡¡¡Aaauuuggghhhhhhhhh!!!"
},
"defeat": {
"1": "¡Todo lo que quiero es a esta preciosa criatura! ¡Los demás no me importáis!"
}
}
}

View File

@ -1 +1,52 @@
{}
{
"aether_grunt": {
"encounter": {
"1": "¡Lucharé con toda mi fuerza para detenerte!",
"2": "Me da igual que seas un crío. Eres una amenaza y debes irte.",
"3": "Me dijeron que mandara a todos los entrenadores por donde venían, ¡sin excepciones!",
"4": "¡Te mostraré el poder del Paraíso Æther!",
"5": "Ahora que conoces la oscuridad en lo profundo del Paraíso Æther, es hora de que vayas desapareciendo..."
},
"victory": {
"1": "¡Vaya! Demuestras habilidad.",
"2": "¿Qué quiere decir esto? ¿Eh?",
"3": "¡Vaya! Con esa fuerza, ¡no creo que pueda detenerte!",
"4": "Vaya... parece que puede que haya perdido.",
"5": "¡Mira, te hago una mueca!: ¡Aiyee!"
}
},
"faba": {
"encounter": {
"1": "¡Yo, Subdirector Fabio, te mostraré la cruda realidad del mundo!",
"2": "¿Yo, la última línea de defensa de Æther, battallando a un mero crío?",
"3": "Yo, Fabio, soy el Subdirector de la Fundación Æther. Soy el único en el mundo, soy irremplazable."
},
"victory": {
"1": "¡Aaaah!",
"2": "¿C-c-cómo puede ser? Eres tan solo un niño...",
"3": "Este... este es el motivo por el que odio a los niños."
}
},
"aether_boss_lusamine_1": {
"encounter": {
"1": "¡Vas a asustar a mi pobre criatura! Parece que tendré que silenciarte cuanto antes."
},
"victory": {
"1": "¿Cómo?¿Cómo puedes ser tan terrible?"
},
"defeat": {
"1": "Buff."
}
},
"aether_boss_lusamine_2": {
"encounter": {
"1": "¡¿Por qué me sigues molestando?! Estoy cansada de ti. ¡Hasta las narices!\n$Se acabó esta charla innecesaria. Este es el poder de Nihilego, ¡te demostraré cuánto te equivocas al venir aquí!"
},
"victory": {
"1": "¡¡¡Aaauuuggghhhhhhhhh!!!"
},
"defeat": {
"1": "¡Todo lo que quiero es a esta preciosa criatura! ¡Los demás no me importáis!"
}
}
}

View File

@ -2,6 +2,106 @@
"boy": "Chico",
"girl": "Chica",
"general": "General",
"display": "Pantalla",
"audio": "Audio",
"shopOverlayOpacity": "Opacidad de la fase de compra"
"gamepad": "Mando",
"keyboard": "Teclado",
"gameSpeed": "Veloc. del juego",
"hpBarSpeed": "Veloc. barra PS",
"expGainsSpeed": "Veloc. de EXP",
"expPartyDisplay": "Mostrar EXP del Equipo",
"skipSeenDialogues": "Saltar diálogos leídos",
"battleStyle": "Estilo de lucha",
"enableRetries": "Activar reintento",
"hideIvs": "Ocultar escáner de IVs",
"tutorials": "Tutoriales",
"touchControls": "Control táctil",
"vibrations": "Vibración",
"normal": "Normal",
"fast": "+1",
"faster": "+2",
"skip": "Saltar",
"levelUpNotifications": "Aumentos de nivel",
"on": "Sí",
"off": "No",
"switch": "Cambiar",
"set": "Mantener",
"auto": "Auto.",
"disabled": "Desact.",
"language": "Idioma",
"change": "Cambiar",
"uiTheme": "Color UI",
"default": "Predet.",
"legacy": "Clásico",
"windowType": "Ventana",
"moneyFormat": "Formato dinero",
"damageNumbers": "Cifras de daño",
"simple": "Simple",
"fancy": "Elegante",
"abbreviated": "Abreviado",
"moveAnimations": "Animación de movs.",
"showStatsOnLevelUp": "Estadísticas al aum. nivel",
"candyUpgradeNotification": "Aviso de caramelos",
"passivesOnly": "Solo pasivas",
"candyUpgradeDisplay": "Muestra de caramelos",
"icon": "Icono",
"animation": "Animación",
"moveInfo": "Info. de movimientos",
"showMovesetFlyout": "Descripción de movimientos",
"showArenaFlyout": "Descripción de escenarios",
"showTimeOfDayWidget": "Mostrar hora del día",
"timeOfDayAnimation": "Animación hora del día",
"bounce": "Rebote",
"timeOfDay_back": "Vuelta",
"spriteSet": "Set de sprites",
"consistent": "Consistente",
"mixedAnimated": "Mixto",
"fusionPaletteSwaps": "Colores de fusión",
"playerGender": "Género del jugador",
"typeHints": "Pistas de tipos",
"masterVolume": "Volumen total",
"bgmVolume": "Volumen música",
"fieldVolume": "Volumen escenario",
"seVolume": "Volumen efectos",
"uiVolume": "Volumen sistema",
"musicPreference": "Preferencia musical",
"mixed": "Mixta",
"gamepadPleasePlug": "Conecta un mando o pulsa un botón",
"delete": "Eliminar",
"keyboardPleasePress": "Pulsa una tecla de tu teclado",
"reset": "Restablecer",
"requireReload": "Requiere reinicio",
"action": "Acción",
"back": "Atrás",
"pressToBind": "Pulsa para vincular",
"pressButton": "Pulsa un botón...",
"buttonUp": "Arriba",
"buttonDown": "Abajo",
"buttonLeft": "Izquierda",
"buttonRight": "Derecha",
"buttonAction": "Acción",
"buttonMenu": "Menú",
"buttonSubmit": "Confirmar",
"buttonCancel": "Cancelar",
"buttonStats": "Estadísticas",
"buttonCycleForm": "Cambiar forma",
"buttonCycleShiny": "Cambiar shiny",
"buttonCycleGender": "Cambiar género",
"buttonCycleAbility": "Cambiar habilidad",
"buttonCycleNature": "Cambiar naturaleza",
"buttonCycleVariant": "Cambiar variante",
"buttonSpeedUp": "Acelerar",
"buttonSlowDown": "Ralentizar",
"alt": " (Alt.)",
"mute": "Silenciar",
"controller": "Mando",
"gamepadSupport": "Soporte de mando",
"showBgmBar": "Mostrar título de canción",
"moveTouchControls": "Controles táctiles",
"shopOverlayOpacity": "Opacidad de la fase de compra",
"shopCursorTarget": "Cursor de la tienda",
"items": "Objetos",
"reroll": "Actualizar",
"shop": "Tienda",
"checkTeam": "Ver equipo"
}

View File

@ -95,5 +95,8 @@
"worker": "Operario",
"worker_female": "Operaria",
"workers": "Operarios",
"youngster": "Joven"
"youngster": "Joven",
"aether_grunt": "Empleado de la Fundación Æther",
"aether_grunt_female": "Empleada de la Fundación Æther",
"aether_grunts": "Empleados de la Fundación Æther"
}

View File

@ -138,11 +138,15 @@
"rood": "Rood",
"xerosic": "Xerosic",
"bryony": "Bryony",
"faba": "Fabio",
"maxie": "Maxie",
"archie": "Archie",
"cyrus": "Cyrus",
"ghetsis": "Ghetsis",
"lysandre": "Lysandre",
"lusamine": "Samina",
"blue_red_double": "Azul y Rojo",
"red_blue_double": "Rojo y Azul",
"tate_liza_double": "Vito y Leti",

View File

@ -16,6 +16,8 @@
"galactic_boss": "Team Galactic Boss",
"plasma_boss": "Team Plasma Boss",
"flare_boss": "Team Flare Boss",
"aether_boss": "Presidente Æther",
"rocket_admin": "Team Rocket Admin",
"rocket_admin_female": "Team Rocket Admin",
"magma_admin": "Team Magma Admin",
@ -27,5 +29,6 @@
"plasma_sage": "Team Plasma Sage",
"plasma_admin": "Team Plasma Admin",
"flare_admin": "Team Flare Admin",
"flare_admin_female": "Team Flare Admin"
"flare_admin_female": "Team Flare Admin",
"aether_admin": "Director de la Fundación Æther"
}

View File

@ -38,7 +38,7 @@
"learnMoveNotLearned": "{{pokemonName}} na pas appris\n{{moveName}}.",
"learnMoveForgetQuestion": "Quelle capacité doit être oubliée ?",
"learnMoveForgetSuccess": "{{pokemonName}} oublie comment\nutiliser {{moveName}}.",
"countdownPoof": "@d{32}1, @d{15}2, @d{15}et@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}Tadaaa !",
"countdownPoof": "@d{32}1, @d{15}2, @d{15}et@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}Tadaaa !",
"learnMoveAnd": "Et…",
"levelCapUp": "La limite de niveau\na été augmentée à {{levelCap}} !",
"moveNotImplemented": "{{moveName}} nest pas encore implémenté et ne peut pas être sélectionné.",

View File

@ -80,11 +80,21 @@
"battle_galactic_grunt": "DÉPS Vs. Team Galaxie",
"battle_plasma_grunt": "NB - Vs. Team Plasma",
"battle_flare_grunt": "XY - Vs. Team Flare",
"battle_aether_grunt": "SL - Vs. Fondation Æther",
"battle_skull_grunt": "SL - Vs. Team Skull",
"battle_macro_grunt": "ÉB - Vs. Macro Cosmos",
"battle_galactic_admin": "DÉPS - Vs. Admin Team Galaxie",
"battle_skull_admin": "SL - Vs. Admin Team Skull",
"battle_oleana": "ÉB - Vs. Liv",
"battle_rocket_boss": "USUL - Vs. Giovanni",
"battle_aqua_magma_boss": "ROSA - Vs. Arthur/Max",
"battle_galactic_boss": "DÉPS - Vs. Hélio",
"battle_plasma_boss": "N2B2 - Vs. Ghetis",
"battle_flare_boss": "XY - Vs. Lysandre",
"battle_aether_boss": "SL - Vs. Elsa-Mina",
"battle_skull_boss": "SL - Vs. Guzma",
"battle_macro_boss": "ÉB - Vs. Shehroz",
"abyss": "PDM EdC - Cratère Obscur",
"badlands": "PDM EdC - Vallée Stérile",
"beach": "PDM EdC - Falaise Trempée",

View File

@ -117,5 +117,13 @@
"plasma_grunts": "Sbires de la Team Plasma",
"flare_grunt": "Sbire de la Team Flare",
"flare_grunt_female": "Sbire de la Team Flare",
"flare_grunts": "Sbires de la Team Flare"
"flare_grunts": "Sbires de la Team Flare",
"aether_grunt": "Employé de la Fondation Æther",
"aether_grunt_female": "Employée de la Fondation Æther",
"aether_grunts": "Employés de la Fondation Æther",
"skull_grunt": "Sbire de la Team Skull",
"skull_grunt_female": "Sbire de la Team Skull",
"macro_grunt": "Employé de Macro Cosmos",
"macro_grunt_female": "Employée de Macro Cosmos",
"macro_grunts": "Employés de Macro Cosmos"
}

View File

@ -138,11 +138,19 @@
"rood": "Carmine",
"xerosic": "Xanthin",
"bryony": "Brasénie",
"faba": "Saubohne",
"plumeria": "Apocyne",
"oleana": "Liv",
"maxie": "Max",
"archie": "Arthur",
"cyrus": "Hélio",
"ghetsis": "Ghetis",
"lysandre": "Lysandre",
"lusamine": "Elsa-Mina",
"guzma": "Guzma",
"rose": "Shehroz",
"blue_red_double": "Blue & Red",
"red_blue_double": "Red & Blue",
"tate_liza_double": "Lévy & Tatia",

View File

@ -16,6 +16,10 @@
"galactic_boss": "Leader de la Team Galaxie",
"plasma_boss": "Leader de la Team Plasma",
"flare_boss": "Leader de la Team Flare",
"aether_boss": "Présidente dÆther",
"skull_boss": "Boss de la Team Skull",
"macro_boss": "Président de Macro Cosmos",
"rocket_admin": "Admin Team Rocket",
"rocket_admin_female": "Admin Team Rocket",
"magma_admin": "Admin Team Magma",
@ -27,5 +31,8 @@
"plasma_sage": "Sage Plasma",
"plasma_admin": "Admin Team Plasma",
"flare_admin": "Manager de la Team Flare",
"flare_admin_female": "Manageuse de la Team Flare"
"flare_admin_female": "Manageuse de la Team Flare",
"aether_admin": "Directeur dÆther",
"skull_admin": "Admin Team Skull",
"macro_admin": "Macro Cosmos"
}

View File

@ -38,7 +38,7 @@
"learnMoveNotLearned": "{{pokemonName}} non ha imparato\n{{moveName}}.",
"learnMoveForgetQuestion": "Quale mossa deve dimenticare?",
"learnMoveForgetSuccess": "{{pokemonName}} ha dimenticato la mossa\n{{moveName}}.",
"countdownPoof": "@d{32}1, @d{15}2, @d{15}e@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}ta-daaaa!",
"countdownPoof": "@d{32}1, @d{15}2, @d{15}e@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}ta-daaaa!",
"learnMoveAnd": "E…",
"levelCapUp": "Il livello massimo\nè aumentato a {{levelCap}}!",
"moveNotImplemented": "{{moveName}} non è ancora implementata e non può essere selezionata.",

View File

@ -117,5 +117,14 @@
"plasma_grunts": "Seguaci Plasma",
"flare_grunt": "Recluta Team Flare",
"flare_grunt_female": "Recluta Team Flare",
"flare_grunts": "Reclute Team Flare"
"flare_grunts": "Reclute Team Flare",
"aether_grunt": "Dipendente (Fondazione Æther)",
"aether_grunt_female": "Dipendente (Fondazione Æther)",
"aether_grunts": "Dipendenti (Fondazione Æther)",
"skull_grunt": "Recluta Team Skull",
"skull_grunt_female": "Recluta Team Skull",
"skull_grunts": "Reclute Team Skull",
"macro_grunt": "Impiegato Macro Cosmos",
"macro_grunt_female": "Impiegata Macro Cosmos",
"macro_grunts": "Impiegati Macro Cosmos"
}

View File

@ -138,11 +138,15 @@
"rood": "Ross",
"xerosic": "Xante",
"bryony": "Bromelia",
"faba": "Vicio",
"maxie": "Max",
"archie": "Ivan",
"cyrus": "Cyrus",
"ghetsis": "Ghecis",
"lysandre": "Elisio",
"lusamine": "Samina",
"guzma": "Guzman",
"blue_red_double": "Blu & Rosso",
"red_blue_double": "Rosso & Blu",
"tate_liza_double": "Tell & Pat",

View File

@ -16,6 +16,10 @@
"galactic_boss": "Capo Galassia",
"plasma_boss": "Capo Plasma",
"flare_boss": "Capo Flare",
"aether_boss": "Direttrice Æther",
"skull_boss": "Capo Team Skull",
"macro_boss": "Presidente Macro Cosmos",
"rocket_admin": "Tenente Team Rocket",
"rocket_admin_female": "Tenente Team Rocket",
"magma_admin": "Magmatenente",
@ -27,5 +31,9 @@
"plasma_sage": "Saggio Team Plasma",
"plasma_admin": "Tenente Team Plasma",
"flare_admin": "Ufficiale Team Flare",
"flare_admin_female": "Ufficiale Team Flare"
"flare_admin_female": "Ufficiale Team Flare",
"aether_admin": "Capo Filiale Æther",
"skull_admin": "Ufficiale Team Skull",
"macro_admin": "Vicepresidente Macro Cosmos"
}

View File

@ -38,7 +38,7 @@
"learnMoveNotLearned": "{{pokemonName}}は {{moveName}}を\n覚えずに 終わった",
"learnMoveForgetQuestion": "どの 技を\n忘れさせたい",
"learnMoveForgetSuccess": "{{pokemonName}}は {{moveName}}の\n使い方を きれいに 忘れた",
"countdownPoof": "@d{32}1 @d{15}2の @d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}ポカン!",
"countdownPoof": "@d{32}1 @d{15}2の @d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}ポカン!",
"learnMoveAnd": "そして…",
"levelCapUp": "レベルキャップの\n{{levelCap}}に 上がった!",
"moveNotImplemented": "{{moveName}}は まだ 実装されておらず 選択できません。",

View File

@ -38,7 +38,7 @@
"learnMoveNotLearned": "{{pokemonName}}[[는]] {{moveName}}[[를]]\n결국 배우지 않았다!",
"learnMoveForgetQuestion": "어느 기술을 잊게 하고싶은가?",
"learnMoveForgetSuccess": "{{pokemonName}}[[는]] {{moveName}}[[를]] 깨끗이 잊었다!",
"countdownPoof": "@d{32}1, @d{15}2, @d{15}… @d{15}… @d{30}@s{pb_bounce_1}짠!",
"countdownPoof": "@d{32}1, @d{15}2, @d{15}… @d{15}… @d{30}@s{se/pb_bounce_1}짠!",
"learnMoveAnd": "그리고…",
"levelCapUp": "레벨의 최대치가\n{{levelCap}}까지 상승했다!",
"moveNotImplemented": "{{moveName}}[[는]] 아직 구현되지 않아 사용할 수 없다…",

View File

@ -80,11 +80,20 @@
"battle_galactic_grunt": "BDSP 갤럭시단 배틀",
"battle_plasma_grunt": "BW 플라스마단 배틀",
"battle_flare_grunt": "XY 플레어단 배틀",
"battle_aether_grunt": "SM 에테르재단 배틀",
"battle_skull_grunt": "SM 스컬단 배틀",
"battle_macro_grunt": "SWSH 트레이너 배틀",
"battle_galactic_admin": "BDSP 갤럭시단 간부 배틀",
"battle_skull_admin": "SM 스컬단 간부 배틀",
"battle_oleana": "SWSH 올리브 배틀",
"battle_rocket_boss": "USUM 비주기 배틀",
"battle_aqua_magma_boss": "ORAS 아강 & 마적 배틀",
"battle_galactic_boss": "BDSP 태홍 배틀",
"battle_plasma_boss": "B2W2 게치스 배틀",
"battle_flare_boss": "XY 플라드리 배틀",
"battle_aether_boss": "SM 루자미네 배틀",
"battle_skull_boss": "SM 구즈마 배틀",
"battle_macro_boss": "SWSH 로즈 배틀",
"abyss": "불가사의 던전 하늘의 탐험대 어둠의 화구",
"badlands": "불가사의 던전 하늘의 탐험대 불모의 계곡",
"beach": "불가사의 던전 하늘의 탐험대 축축한 암반",

View File

@ -655,6 +655,86 @@
"5": "네가 이긴 것 같네. 그렇지만 졌어도, 난 우아하게 퇴장할 거니까!"
}
},
"aether_grunt": {
"encounter": {
"1": "죽을 각오로 퇴치하겠습니다!",
"2": "소중한 연구라고! 애라도 가만두지 않겠어!",
"3": "어떤 트레이너든 물리치라고 들었다고!",
"4": "에테르파라다이스의 파워를 보여드리겠습니다!",
"5": "에테르파라다이스 중심의 어둠을 알아내다니. 이제 사라져 주셔야겠습니다!"
},
"victory": {
"1": "흥! 실력이 대단하시군요.",
"2": "이게 뭐하는 상황이지? 무슨 결과냐고!",
"3": "이런! 넌 너무 강해서 물리칠 방법도 없다고!",
"4": "으음… 제가 진 것처럼 보이네요.",
"5": "이 느낌을 한마디로 하면. 게에이~힝!!"
}
},
"faba": {
"encounter": {
"1": "나, 에테르재단의 자우보! 꼬맹이 녀석에게 현실을 보여주겠어요!",
"2": "에테르파라다이스 마지막 보루라고 불리는, 이 자우보에게 애를 상대하라고요?",
"3": "에테르재단의 지부장이라면 세계에 단 한 명… 이 자우보뿐입니다."
},
"victory": {
"1": "게에이~힝!!",
"2": "뭐 뭐뭐뭐 뭐가 어떻게 된 거죠? 내가 애를 상대로…",
"3": "이래서 애는… 좋아할 수가 없어요."
}
},
"skull_grunt": {
"encounter": {
"1": "나쁜 짓 안해-그냥 사는 게 힘들 뿐스컬!",
"2": "껌 하나 드실? 이게 우리가 인사하는 방식YO! 만나서 반갑스컬!",
"3": "우린 그냥 다른 사람의 포켓몬에 관심이 많을 뿐임다!",
"4": "어이 어이! 잘난 체하는 녀석한테 무시당하고 있잖스컬!!",
"5": "우리는 리프리젠트 땡땡이 스컬-! 집세는 못 내겠지만-! 정말 즐거웠지만, 청춘을 날려YO!"
},
"victory": {
"1": "엥? 벌써 끝났슴까?",
"2": "미는 엑시트! 유는 피쓰풀!",
"3": "꼬마 녀석의 이상한 포켓몬엔 관심 없어!",
"4": "뭐야-?! 너무 강해서 뼈도 못 추리겠어!",
"5": "우리가 포켓몬보다 아래야!? 소중히 대해주면 안 돼? 으응!?"
}
},
"plumeria": {
"encounter": {
"1": "…아무것도 느껴지지 않는 평~범한 애로 보이는데!",
"2": "워낙 애들 상대로 우물쭈물 하길래 오래 걸릴 줄 알았지…",
"3": "누구라도 스컬단 또 방해하면, 정말로 혼내줄 테니까!"
},
"victory": {
"1": "흥! 대단하군.",
"2": "흐음, 너 참 대단하군. 애들을 상대로 질질 끈 이유가 이해될 정도로 강해.",
"3": "흠. 이 손실은 그냥 안고 가야겠어."
}
},
"macro_grunt": {
"encounter": {
"1": "당신은 여기서 끝날 것 같네요!",
"2": "당신은 트레이너 맞죠? 하지만 우리를 방해하는 건 용납 못 합니다!",
"3": "매크로코스모스 생명입니다! 가입하신 실비보험은 있으신가요?"
},
"victory": {
"1": "순순히 물러나는 것 말고는 선택지가 없군요.",
"2": "용돈을 뺏기다니… 패배는 적자로 이어지는구나…",
"3": "매크로코스모스 생명에 관한 일이라면 누구에게도 지지 않을 텐데…"
}
},
"oleana": {
"encounter": {
"1": "로즈님을 방해하는 것은 절대로 용서할 수 없으니까요!",
"2": "저의 지시를 따르는 특별한 스태프들을 아무렇지도 않게 쓰러뜨리다니. …더 기대되는 것도 없네요.",
"3": "로즈님을 위해서라면! 질 수 없습니다!"
},
"victory": {
"1": "아아… 이기지 못하다니… 올리브… 넌 정말 구제 불능이구나.",
"2": "하아아…! 이런 실수를 하다니… 승리를 거듭한 트레이너의 실력을 너무 얕잡아봤던 모양이네요.",
"3": "아아… 이 올리브님 조금 지쳤어…"
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "그래서! 여기까지 오다니, 감탄이 절로 나오는군!"
@ -787,6 +867,72 @@
"1": "우매한 자들이 이 아름다운 세상을 계속 더럽히고 있군."
}
},
"aether_boss_lusamine_1": {
"encounter": {
"1": "비스트가 놀라잖아! …우선은 너를 조용히 시켜야겠어."
},
"victory": {
"1": "……너무해!"
},
"defeat": {
"1": "흐음…"
}
},
"aether_boss_lusamine_2": {
"encounter": {
"1": "그렇게 말했는데도! …왜 이리 끈질긴 거야! 정말 진절머리가 나.\n$더 말해봐야 소용 없겠지… 텅비드의 힘으로 네가 여기까지 온 걸 후회하게 해줄게!"
},
"victory": {
"1": "………아아아웃!!"
},
"defeat": {
"1": "나는 비스트만 있으면 돼! 너희가 어떻게 되든 상관없어!"
}
},
"skull_boss_guzma_1": {
"encounter": {
"1": "박살 내고 박살 내도 절대 봐주지 않아…\n$모두가 싫어하는 구즈마가 여기 있다!"
},
"victory": {
"1": "쯧. 너는 내가 박살 내주겠어!"
},
"defeat": {
"1": "겨우 그걸 위해서 일부러 온 거야?"
}
},
"skull_boss_guzma_2": {
"encounter": {
"1": "누구든지 박살 낸다!\n$그것이 구즈마님의 아이덴티티!!"
},
"victory": {
"1": "구즈마!!! 뭐 하고 있는 거야?!"
},
"defeat": {
"1": "너희들 바보군!"
}
},
"macro_boss_rose_1": {
"encounter": {
"1": "내게는 모든 사람이 영원히 마음을 놓고 발전할 수 있도록…\n$무한한 에너지를 가져다 줘야 한다는 신념과 사명이 있단다!"
},
"victory": {
"1": "아직 무르군… 트레이너.\n$역사는 바뀔 것이네! 이 나의 손에 의해서 말이지"
},
"defeat": {
"1": "자네는 여전히 깨닫지 못했군!"
}
},
"macro_boss_rose_2": {
"encounter": {
"1": "나는 가라르를 포함한— 전 세계의 에너지 문제를 해결하기 위해 최선을 다하고 있어.\n$매크로코스모스를 성공으로 이끈 경험과 성과는 내 방식이 효율적이라는 증거란다.\n$생각을 바꿀 마음은 없어. 내가 지더라도."
},
"victory": {
"1": "포켓몬 승부는 좋군! 오랜만에 싸워보니 만족스러워…\n$제법 괜찮군. 패배를 인정하지."
},
"defeat": {
"1": "너희가 보기에는 내가 끔찍한 짓을 벌이고 있는 것처럼 보이겠지? 조금도 이해가 가지 않을 거야.\n$하지만 난 가라르지방의 영원한 번영을 위해서 무한한 에너지를 가져다줘야 해."
}
},
"brock": {
"encounter": {
"1": "내 전문인 바위 타입 포켓몬으로 널 쓰러뜨려줄게! 덤벼!",

View File

@ -655,6 +655,86 @@
"5": "네가 이긴 것 같네. 그렇지만 졌어도, 난 우아하게 퇴장할 거니까!"
}
},
"aether_grunt": {
"encounter": {
"1": "죽을 각오로 퇴치하겠습니다!",
"2": "소중한 연구라고! 애라도 가만두지 않겠어!",
"3": "어떤 트레이너든 물리치라고 들었다고!",
"4": "에테르파라다이스의 파워를 보여드리겠습니다!",
"5": "에테르파라다이스 중심의 어둠을 알아내다니. 이제 사라져 주셔야겠습니다!"
},
"victory": {
"1": "흥! 실력이 대단하시군요.",
"2": "이게 뭐하는 상황이지? 무슨 결과냐고!",
"3": "이런! 넌 너무 강해서 물리칠 방법도 없다고!",
"4": "으음… 제가 진 것처럼 보이네요.",
"5": "이 느낌을 한마디로 하면. 게에이~힝!!"
}
},
"faba": {
"encounter": {
"1": "나, 에테르재단의 자우보! 꼬맹이 녀석에게 현실을 보여주겠어요!",
"2": "에테르파라다이스 마지막 보루라고 불리는, 이 자우보에게 애를 상대하라고요?",
"3": "에테르재단의 지부장이라면 세계에 단 한 명… 이 자우보뿐입니다."
},
"victory": {
"1": "게에이~힝!!",
"2": "뭐 뭐뭐뭐 뭐가 어떻게 된 거죠? 내가 애를 상대로…",
"3": "이래서 애는… 좋아할 수가 없어요."
}
},
"skull_grunt": {
"encounter": {
"1": "나쁜 짓 안해-그냥 사는 게 힘들 뿐스컬!",
"2": "껌 하나 드실? 이게 우리가 인사하는 방식YO! 만나서 반갑스컬!",
"3": "우린 그냥 다른 사람의 포켓몬에 관심이 많을 뿐임다!",
"4": "어이 어이! 잘난 체하는 녀석한테 무시당하고 있잖스컬!!",
"5": "우리는 리프리젠트 땡땡이 스컬-! 집세는 못 내겠지만-! 정말 즐거웠지만, 청춘을 날려YO!"
},
"victory": {
"1": "엥? 벌써 끝났슴까?",
"2": "미는 엑시트! 유는 피쓰풀!",
"3": "꼬마 녀석의 이상한 포켓몬엔 관심 없어!",
"4": "뭐야-?! 너무 강해서 뼈도 못 추리겠어!",
"5": "우리가 포켓몬보다 아래야!? 소중히 대해주면 안 돼? 으응!?"
}
},
"plumeria": {
"encounter": {
"1": "…아무것도 느껴지지 않는 평~범한 애로 보이는데!",
"2": "워낙 애들 상대로 우물쭈물 하길래 오래 걸릴 줄 알았지…",
"3": "누구라도 스컬단 또 방해하면, 정말로 혼내줄 테니까!"
},
"victory": {
"1": "흥! 대단하군.",
"2": "흐음, 너 참 대단하군. 애들을 상대로 질질 끈 이유가 이해될 정도로 강해.",
"3": "흠. 이 손실은 그냥 안고 가야겠어."
}
},
"macro_grunt": {
"encounter": {
"1": "당신은 여기서 끝날 것 같네요!",
"2": "당신은 트레이너 맞죠? 하지만 우리를 방해하는 건 용납 못 합니다!",
"3": "매크로코스모스 생명입니다! 가입하신 실비보험은 있으신가요?"
},
"victory": {
"1": "순순히 물러나는 것 말고는 선택지가 없군요.",
"2": "용돈을 뺏기다니… 패배는 적자로 이어지는구나…",
"3": "매크로코스모스 생명에 관한 일이라면 누구에게도 지지 않을 텐데…"
}
},
"oleana": {
"encounter": {
"1": "로즈님을 방해하는 것은 절대로 용서할 수 없으니까요!",
"2": "저의 지시를 따르는 특별한 스태프들을 아무렇지도 않게 쓰러뜨리다니. …더 기대되는 것도 없네요.",
"3": "로즈님을 위해서라면! 질 수 없습니다!"
},
"victory": {
"1": "아아… 이기지 못하다니… 올리브… 넌 정말 구제 불능이구나.",
"2": "하아아…! 이런 실수를 하다니… 승리를 거듭한 트레이너의 실력을 너무 얕잡아봤던 모양이네요.",
"3": "아아… 이 올리브님 조금 지쳤어…"
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "그래서! 여기까지 오다니, 감탄이 절로 나오는군!"
@ -787,6 +867,72 @@
"1": "우매한 자들이 이 아름다운 세상을 계속 더럽히고 있군."
}
},
"aether_boss_lusamine_1": {
"encounter": {
"1": "비스트가 놀라잖아! …우선은 너를 조용히 시켜야겠어."
},
"victory": {
"1": "……너무해!"
},
"defeat": {
"1": "흐음…"
}
},
"aether_boss_lusamine_2": {
"encounter": {
"1": "그렇게 말했는데도! …왜 이리 끈질긴 거야! 정말 진절머리가 나.\n$더 말해봐야 소용 없겠지… 텅비드의 힘으로 네가 여기까지 온 걸 후회하게 해줄게!"
},
"victory": {
"1": "………아아아웃!!"
},
"defeat": {
"1": "나는 비스트만 있으면 돼! 너희가 어떻게 되든 상관없어!"
}
},
"skull_boss_guzma_1": {
"encounter": {
"1": "박살 내고 박살 내도 절대 봐주지 않아…\n$모두가 싫어하는 구즈마가 여기 있다!"
},
"victory": {
"1": "쯧. 너는 내가 박살 내주겠어!"
},
"defeat": {
"1": "겨우 그걸 위해서 일부러 온 거야?"
}
},
"skull_boss_guzma_2": {
"encounter": {
"1": "누구든지 박살 낸다!\n$그것이 구즈마님의 아이덴티티!!"
},
"victory": {
"1": "구즈마!!! 뭐 하고 있는 거야?!"
},
"defeat": {
"1": "너희들 바보군!"
}
},
"macro_boss_rose_1": {
"encounter": {
"1": "내게는 모든 사람이 영원히 마음을 놓고 발전할 수 있도록…\n$무한한 에너지를 가져다 줘야 한다는 신념과 사명이 있단다!"
},
"victory": {
"1": "아직 무르군… 트레이너.\n$역사는 바뀔 것이네! 이 나의 손에 의해서 말이지"
},
"defeat": {
"1": "자네는 여전히 깨닫지 못했군!"
}
},
"macro_boss_rose_2": {
"encounter": {
"1": "나는 가라르를 포함한— 전 세계의 에너지 문제를 해결하기 위해 최선을 다하고 있어.\n$매크로코스모스를 성공으로 이끈 경험과 성과는 내 방식이 효율적이라는 증거란다.\n$생각을 바꿀 마음은 없어. 내가 지더라도."
},
"victory": {
"1": "포켓몬 승부는 좋군! 오랜만에 싸워보니 만족스러워…\n$제법 괜찮군. 패배를 인정하지."
},
"defeat": {
"1": "너희가 보기에는 내가 끔찍한 짓을 벌이고 있는 것처럼 보이겠지? 조금도 이해가 가지 않을 거야.\n$하지만 난 가라르지방의 영원한 번영을 위해서 무한한 에너지를 가져다줘야 해."
}
},
"brock": {
"encounter": {
"1": "내 전문인 바위 타입 포켓몬으로 널 쓰러뜨려줄게! 덤벼!",

View File

@ -13,5 +13,32 @@
"metFragment": {
"normal": "{{biome}}에서\n레벨 {{level}}일 때 만났다.",
"apparently": "{{biome}}에서\n레벨 {{level}}일 때 만난 것 같다."
},
"natureFragment": {
"Hardy": "{{nature}}하는 성격",
"Lonely": "{{nature}}을 타는 성격",
"Brave": "{{nature}}한 성격",
"Adamant": "{{nature}}스러운 성격",
"Naughty": "{{nature}}같은 성격",
"Bold": "{{nature}}한 성격",
"Docile": "{{nature}}한 성격",
"Relaxed": "{{nature}}한 성격",
"Impish": "{{nature}}같은 성격",
"Lax": "{{nature}}거리는 성격",
"Timid": "{{nature}}같은 성격",
"Hasty": "{{nature}}한 성격",
"Serious": "{{nature}}한 성격",
"Jolly": "{{nature}}한 성격",
"Naive": "{{nature}}한 성격",
"Modest": "{{nature}}스러운 성격",
"Mild": "{{nature}}한 성격",
"Quiet": "{{nature}}한 성격",
"Bashful": "{{nature}}을 타는 성격",
"Rash": "{{nature}}거리는 성격",
"Calm": "{{nature}}한 성격",
"Gentle": "{{nature}}한 성격",
"Sassy": "{{nature}}진 성격",
"Careful": "{{nature}}한 성격",
"Quirky": "{{nature}}스러운 성격"
}
}

View File

@ -59,10 +59,11 @@
"fusionPaletteSwaps": "셰이더 적용",
"playerGender": "플레이어 성별",
"typeHints": "상성 힌트",
"masterVolume": "전체 볼륨",
"bgmVolume": "배경음악 볼륨",
"masterVolume": "마스터 볼륨",
"bgmVolume": "BGM 볼륨",
"fieldVolume": "전투효과 볼륨",
"seVolume": "조작 볼륨",
"seVolume": "SE 볼륨",
"uiVolume": "UI 볼륨",
"musicPreference": "음악 설정",
"mixed": "믹스",
"gamepadPleasePlug": "게임패드를 연결하거나 버튼을 입력하세요",

View File

@ -117,5 +117,14 @@
"plasma_grunts": "플라스마단 조무래기들",
"flare_grunt": "플레어단 조무래기",
"flare_grunt_female": "플레어단 조무래기",
"flare_grunts": "플레어단 조무래기들"
"flare_grunts": "플레어단 조무래기들",
"aether_grunt": "에테르재단 직원",
"aether_grunt_female": "에테르재단 직원",
"aether_grunts": "에테르재단 직원들",
"skull_grunt": "스컬단 조무래기",
"skull_grunt_female": "스컬단 조무래기",
"skull_grunts": "스컬단 조무래기들",
"macro_grunt": "매크로코스모스 직원",
"macro_grunt_female": "매크로코스모스 직원",
"macro_grunts": "매크로코스모스 직원들"
}

View File

@ -138,11 +138,19 @@
"rood": "로트",
"xerosic": "크세로시키",
"bryony": "바라",
"faba": "자우보",
"plumeria": "플루메리",
"oleana": "올리브",
"maxie": "마적",
"archie": "아강",
"cyrus": "태홍",
"ghetsis": "게치스",
"lysandre": "플라드리",
"lusamine": "루자미네",
"guzma": "구즈마",
"rose": "로즈",
"blue_red_double": "그린 & 레드",
"red_blue_double": "레드 & 그린",
"tate_liza_double": "풍 & 란",

View File

@ -16,6 +16,10 @@
"galactic_boss": "갤럭시단 보스",
"plasma_boss": "플라스마단 보스",
"flare_boss": "플레어단 보스",
"aether_boss": "에테르재단 대표",
"skull_boss": "스컬단 보스",
"macro_boss": "매크로코스모스 사장",
"rocket_admin": "로켓단 간부",
"rocket_admin_female": "로켓단 간부",
"magma_admin": "마그마단 간부",
@ -27,5 +31,8 @@
"plasma_sage": "플라스마단 현인",
"plasma_admin": "플라스마단 간부",
"flare_admin": "플레어단 간부",
"flare_admin_female": "플레어단 간부"
"flare_admin_female": "플레어단 간부",
"aether_admin": "에테르재단 지부장",
"skull_admin": "스컬단 간부",
"macro_admin": "매크로코스모스 간부"
}

View File

@ -38,7 +38,7 @@
"learnMoveNotLearned": "{{pokemonName}} não aprendeu {{moveName}}.",
"learnMoveForgetQuestion": "Qual movimento quer esquecer?",
"learnMoveForgetSuccess": "{{pokemonName}} esqueceu como usar {{moveName}}.",
"countdownPoof": "@d{32}1, @d{15}2, @d{15}e@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}Puf!",
"countdownPoof": "@d{32}1, @d{15}2, @d{15}e@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}Puf!",
"learnMoveAnd": "E…",
"levelCapUp": "O nível máximo aumentou\npara {{levelCap}}!",
"moveNotImplemented": "{{moveName}} ainda não foi implementado e não pode ser usado.",

View File

@ -80,11 +80,21 @@
"battle_galactic_grunt": "BDSP Batalha da Equipe Galáctica",
"battle_plasma_grunt": "BW Batalha da Equipe Plasma",
"battle_flare_grunt": "XY Batalha da Equipe Flare",
"battle_aether_grunt": "SM Batalha da Fundação Aether",
"battle_skull_grunt": "SM Batalha da Equipe Skull",
"battle_macro_grunt": "SWSH Batalha de Treinador",
"battle_galactic_admin": "BDSP Batalha com Admin da Equipe Galáctica",
"battle_skull_admin": "SM Batalha com Admin da Euipe Skull",
"battle_oleana": "SWSH Batalha da Oleana",
"battle_rocket_boss": "USUM Batalha do Giovanni",
"battle_aqua_magma_boss": "ORAS Batalha do Maxie & Archie",
"battle_galactic_boss": "BDSP Batalha do Cyrus",
"battle_plasma_boss": "B2W2 Batalha do Ghetsis",
"battle_flare_boss": "XY Batalha do Lysandre",
"battle_aether_boss": "SM Batalha da Lusamine",
"battle_skull_boss": "SM Batalha do Guzma",
"battle_macro_boss": "SWSH Batalha do Rose",
"abyss": "PMD EoS Dark Crater",
"badlands": "PMD EoS Barren Valley",
"beach": "PMD EoS Drenched Bluff",

View File

@ -655,6 +655,86 @@
"5": "Você pode ter me vencido, mas quando eu perco, eu saio com estilo!"
}
},
"aether_grunt": {
"encounter": {
"1": "Eu vou lutar com tudo o que tenho para te eliminar!",
"2": "Eu não me importo se você é uma criança ou o que. Eu vou te mandar voando se você nos ameaçar!",
"3": "Me mandaram afastar Treinadores, não importa quem sejam!",
"4": "Eu vou te mostrar o poder do Paraíso Aether!",
"5": "Agora que você descobriu a escuridão no coração do Paraíso Aether, precisamos que você desapareça convenientemente!"
},
"victory": {
"1": "Aff! Você parece ter muita habilidade.",
"2": "O que isso significa? O que isso significa!",
"3": "Ei! Você é tão forte que não há como eu te afastar!",
"4": "Hmm... Parece que eu posso ter perdido.",
"5": "Aqui está uma resposta para você: Aiyee!"
}
},
"faba": {
"encounter": {
"1": "Eu, o Chefe de Ramo Faba, vou te mostrar a dureza do mundo real!",
"2": "O homem chamado de última linha de defesa do Paraíso Aether vai batalhar com uma mera criança?",
"3": "Eu, Faba, sou o Chefe de Ramo do Paraíso Aether. O único no mundo, eu sou insubstituível."
},
"victory": {
"1": "Aiyee!",
"2": "C-c-como assim?! Como uma criança...",
"3": "Isso é por que... Isso é por que eu não consigo gostar de crianças."
}
},
"skull_grunt": {
"encounter": {
"1": "Nós não somos maus, somos apenas durões!",
"2": "Quer um pouco de nós? É assim que dizemos olá! Prazer em conhecê-los, otários!",
"3": "Somos só um bando de caras e minas com um grande interesse nos Pokémon dos outros!",
"4": "Por que você está tentando agir durão quando já somos durões como ossos aqui fora, mano?",
"5": "Equipe Skull na área! Não podemos pagar o aluguel! Nos divertimos muito, mas nossa juventude foi desperdiçada!"
},
"victory": {
"1": "Ahn? Já acabou?",
"2": "Hora de dar o fora, mano! Vamos ter que dizer tchau, mano!",
"3": "Nem precisamos dos seus Pokémon fracotes mesmo!",
"4": "Que?! Esse muleque é muito forte! Não tem como negar!",
"5": "Então, o que? Eu sou pior que um Pokémon?! Eu já tenho problemas de autoestima, cara."
}
},
"plumeria": {
"encounter": {
"1": " ...Hmph. Você não parece nada especial para mim.",
"2": "Esses Capangas gastam muito tempo tentando lidar com crianças como você...",
"3": "Mexe com qualquer um da Equipe Skull, e eu vou te mostrar o quão séria eu posso ficar."
},
"victory": {
"1": "Aff! Você é bem forte. Tenho que admitir.",
"2": "Aff! Você é bem forte. Agora eu entendi por que meus Capangas gastam tanto tempo batalhando com crianças.",
"3": "Aff! Acho que eu só tenho que aceitar essa derrota."
}
},
"macro_grunt": {
"encounter": {
"1": "Parece que aqui é o fim da linha para você!",
"2": "Você é um treinador, não é? Temo que isso não lhe dê o direito de interferir em nosso trabalho.",
"3": "Sou da Macro Cosmos Seguros! Já tem um seguro de vida?"
},
"victory": {
"1": "Eu não tenho muita escolha a não ser recuar respeitosamente.",
"2": "Ter que desistir do meu dinheiro... Perder significa que estou de volta no vermelho...",
"3": "Ninguém pode vencer a Macro Cosmos quando se trata de nossa dedicação ao trabalho!"
}
},
"oleana": {
"encounter": {
"1": "Eu não vou deixar ninguém interferir no plano do Sr. Rose!",
"2": "Então, você passou por todo o pessoal especial que eu ordenei para te parar. Eu não esperaria nada menos.",
"3": "Pelo presidente! Eu não vou perder!"
},
"victory": {
"1": "*suspiro* Eu não consegui vencer... Oleana... você realmente é uma mulher sem esperança.",
"2": "Aff! Isso é inaceitável... O que eu estava pensando... Qualquer treinador que chega tão longe não seria um fracote...",
"3": "*suspiro* Eu sou uma Oleana cansada..."
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "Tenho que admitir, estou impressionado que tenha chegado até aqui!"
@ -787,6 +867,72 @@
"1": "Tolos sem visão continuarão a poluir este belo mundo."
}
},
"aether_boss_lusamine_1": {
"encounter": {
"1": "Você vai assustar minha fera querida! Parece que eu vou precisar te silenciar primeiro."
},
"victory": {
"1": "Como... como você pode ser tão terrível!"
},
"defeat": {
"1": "Aff..."
}
},
"aether_boss_lusamine_2": {
"encounter": {
"1": "Por que você continua a me incomodar?! Estou cansada de você. Cansada até a alma!\n$Chega de papo furado... Com o poder de Nihilego, vou mostrar o quão errado você estava em vir aqui!"
},
"victory": {
"1": "Aaauuuggghhhhhhhhh!!!"
},
"defeat": {
"1": "Tudo o que eu quero é minha fera preciosa! Eu não me importo com nenhum de vocês!"
}
},
"skull_boss_guzma_1": {
"encounter": {
"1": "O odiado chefe que te bate e te bate e nunca para...\n$É. O grande e mau Guzma está aqui!"
},
"victory": {
"1": "Tss. Eu vou te bater um dia desses!"
},
"defeat": {
"1": "E você veio até aqui só pra isso, né?"
}
},
"skull_boss_guzma_2": {
"encounter": {
"1": "Não importa contra quem eu esteja, eu vou derrotá-los!\n$Isso é o que o grande e mau Guzma é!"
},
"victory": {
"1": "Guzma!!! O que há de errado com você?!"
},
"defeat": {
"1": "Vocês são tudo uns idiotas!"
}
},
"macro_boss_rose_1": {
"encounter": {
"1": "Devo fornecer energia ilimitada para garantir a prosperidade eterna para todos...\n$É meu propósito, meu dever, meu destino!"
},
"victory": {
"1": "Você ainda não entendeu, treinador...\n$Nós... Não, eu vou mudar o rumo da história!"
},
"defeat": {
"1": "Você ainda não entende nada!"
}
},
"macro_boss_rose_2": {
"encounter": {
"1": "Estou comprometido em resolver o problema de energia na região de Galar e, claro, em todo o mundo.\n$Minha experiência e conquistas que fizeram da Macro Cosmos um sucesso são a prova de que meus métodos funcionam.\n$Não pretendo mudar de ideia, mesmo que eu perca."
},
"victory": {
"1": "Eu esqueci o quão incríveis são as batalhas Pokémon! Faz tanto tempo desde que eu batalhei...\n$Isso foi realmente satisfatório, eu aceito a derrota para esta batalha."
},
"defeat": {
"1": "Eu suponho que deve parecer que estou fazendo algo terrível. Eu não espero que você entenda.\n$Mas eu devo fornecer à região de Galar energia ilimitada para garantir prosperidade eterna."
}
},
"brock": {
"encounter": {
"1": "Minha especialidade em Pokémon do tipo Pedra vai te derrubar! Vamos lá!",

View File

@ -655,6 +655,86 @@
"5": "Você pode ter me vencido, mas quando eu perco, eu saio com estilo!"
}
},
"aether_grunt": {
"encounter": {
"1": "Eu vou lutar com tudo o que tenho para te eliminar!",
"2": "Eu não me importo se você é uma criança ou o que. Eu vou te mandar voando se você nos ameaçar!",
"3": "Me mandaram afastar Treinadores, não importa quem sejam!",
"4": "Eu vou te mostrar o poder do Paraíso Aether!",
"5": "Agora que você descobriu a escuridão no coração do Paraíso Aether, precisamos que você desapareça convenientemente!"
},
"victory": {
"1": "Aff! Você parece ter muita habilidade.",
"2": "O que isso significa? O que isso significa!",
"3": "Ei! Você é tão forte que não há como eu te afastar!",
"4": "Hmm... Parece que eu posso ter perdido.",
"5": "Aqui está uma resposta para você: Aiyee!"
}
},
"faba": {
"encounter": {
"1": "Eu, o Chefe de Ramo Faba, vou te mostrar a dureza do mundo real!",
"2": "O homem chamado de última linha de defesa do Paraíso Aether vai batalhar com uma mera criança?",
"3": "Eu, Faba, sou o Chefe de Ramo do Paraíso Aether. O único no mundo, eu sou insubstituível."
},
"victory": {
"1": "Aiyee!",
"2": "C-c-como assim?! Como uma criança...",
"3": "Isso é por que... Isso é por que eu não consigo gostar de crianças."
}
},
"skull_grunt": {
"encounter": {
"1": "Nós não somos maus, somos apenas durões!",
"2": "Quer um pouco de nós? É assim que dizemos olá! Prazer em conhecê-los, otários!",
"3": "Somos só um bando de caras e minas com um grande interesse nos Pokémon dos outros!",
"4": "Por que você está tentando agir durão quando já somos durões como ossos aqui fora, mano?",
"5": "Equipe Skull na área! Não podemos pagar o aluguel! Nos divertimos muito, mas nossa juventude foi desperdiçada!"
},
"victory": {
"1": "Ahn? Já acabou?",
"2": "Hora de dar o fora, mano! Vamos ter que dizer tchau, mano!",
"3": "Nem precisamos dos seus Pokémon fracotes mesmo!",
"4": "Que?! Esse muleque é muito forte! Não tem como negar!",
"5": "Então, o que? Eu sou pior que um Pokémon?! Eu já tenho problemas de autoestima, cara."
}
},
"plumeria": {
"encounter": {
"1": " ...Hmph. Você não parece nada especial para mim.",
"2": "Esses Capangas gastam muito tempo tentando lidar com crianças como você...",
"3": "Mexe com qualquer um da Equipe Skull, e eu vou te mostrar o quão séria eu posso ficar."
},
"victory": {
"1": "Aff! Você é bem forte. Tenho que admitir.",
"2": "Aff! Você é bem forte. Agora eu entendi por que meus Capangas gastam tanto tempo batalhando com crianças.",
"3": "Aff! Acho que eu só tenho que aceitar essa derrota."
}
},
"macro_grunt": {
"encounter": {
"1": "Parece que aqui é o fim da linha para você!",
"2": "Você é um treinador, não é? Temo que isso não lhe dê o direito de interferir em nosso trabalho.",
"3": "Sou da Macro Cosmos Seguros! Já tem um seguro de vida?"
},
"victory": {
"1": "Eu não tenho muita escolha a não ser recuar respeitosamente.",
"2": "Ter que desistir do meu dinheiro... Perder significa que estou de volta no vermelho...",
"3": "Ninguém pode vencer a Macro Cosmos quando se trata de nossa dedicação ao trabalho!"
}
},
"oleana": {
"encounter": {
"1": "Eu não vou deixar ninguém interferir no plano do Sr. Rose!",
"2": "Então, você passou por todo o pessoal especial que eu ordenei para te parar. Eu não esperaria nada menos.",
"3": "Pelo presidente! Eu não vou perder!"
},
"victory": {
"1": "*suspiro* Eu não consegui vencer... Oleana... você realmente é uma mulher sem esperança.",
"2": "Aff! Isso é inaceitável... O que eu estava pensando... Qualquer treinador que chega tão longe não seria um fracote...",
"3": "*suspiro* Eu sou uma Oleana cansada..."
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "Tenho que admitir, estou impressionado que tenha chegado até aqui!"
@ -787,6 +867,72 @@
"1": "Tolos sem visão continuarão a poluir este belo mundo."
}
},
"aether_boss_lusamine_1": {
"encounter": {
"1": "Você vai assustar minha fera querida! Parece que eu vou precisar te silenciar primeiro."
},
"victory": {
"1": "Como... como você pode ser tão terrível!"
},
"defeat": {
"1": "Aff..."
}
},
"aether_boss_lusamine_2": {
"encounter": {
"1": "Por que você continua a me incomodar?! Estou cansada de você. Cansada até a alma!\n$Chega de papo furado... Com o poder de Nihilego, vou mostrar o quão errado você estava em vir aqui!"
},
"victory": {
"1": "Aaauuuggghhhhhhhhh!!!"
},
"defeat": {
"1": "Tudo o que eu quero é minha fera preciosa! Eu não me importo com nenhum de vocês!"
}
},
"skull_boss_guzma_1": {
"encounter": {
"1": "O odiado chefe que te bate e te bate e nunca para...\n$É. O grande e mau Guzma está aqui!"
},
"victory": {
"1": "Tss. Eu vou te bater um dia desses!"
},
"defeat": {
"1": "E você veio até aqui só pra isso, né?"
}
},
"skull_boss_guzma_2": {
"encounter": {
"1": "Não importa contra quem eu esteja, eu vou derrotá-los!\n$Isso é o que o grande e mau Guzma é!"
},
"victory": {
"1": "Guzma!!! O que há de errado com você?!"
},
"defeat": {
"1": "Vocês são tudo uns idiotas!"
}
},
"macro_boss_rose_1": {
"encounter": {
"1": "Devo fornecer energia ilimitada para garantir a prosperidade eterna para todos...\n$É meu propósito, meu dever, meu destino!"
},
"victory": {
"1": "Você ainda não entendeu, treinador...\n$Nós... Não, eu vou mudar o rumo da história!"
},
"defeat": {
"1": "Você ainda não entende nada!"
}
},
"macro_boss_rose_2": {
"encounter": {
"1": "Estou comprometido em resolver o problema de energia na região de Galar e, claro, em todo o mundo.\n$Minha experiência e conquistas que fizeram da Macro Cosmos um sucesso são a prova de que meus métodos funcionam.\n$Não pretendo mudar de ideia, mesmo que eu perca."
},
"victory": {
"1": "Eu esqueci o quão incríveis são as batalhas Pokémon! Faz tanto tempo desde que eu batalhei...\n$Isso foi realmente satisfatório, eu aceito a derrota para esta batalha."
},
"defeat": {
"1": "Eu suponho que deve parecer que estou fazendo algo terrível. Eu não espero que você entenda.\n$Mas eu devo fornecer à região de Galar energia ilimitada para garantir prosperidade eterna."
}
},
"brock": {
"encounter": {
"1": "Minha especialidade em Pokémon do tipo Pedra vai te derrubar! Vamos lá!",

View File

@ -117,5 +117,15 @@
"plasma_grunts": "Capangas da Equipe Plasma",
"flare_grunt": "Capanga da Equipe Flare",
"flare_grunt_female": "Capanga da Equipe Flare",
"flare_grunts": "Capangas da Equipe Flare"
"flare_grunts": "Capangas da Equipe Flare",
"aether_grunt": "Funcionário da Fundação Aether",
"aether_grunt_female": "Funcionária da Fundação Aether",
"aether_grunts": "Funcionários da Fundação Aether",
"skull_grunt": "Capanga da Equipe Skull",
"skull_grunt_female": "Capanga da Equipe Skull",
"skull_grunts": "Capangas da Equipe Skull",
"macro_grunt": "Treinador da Macro Cosmos",
"macro_grunt_female": "Treinadora da Macro Cosmos",
"macro_grunts": "Treinadores da Macro Cosmos"
}

View File

@ -138,11 +138,17 @@
"rood": "Rood",
"xerosic": "Xerosic",
"bryony": "Bryony",
"faba": "Faba",
"plumeria": "Plumeria",
"oleana": "Oleana",
"maxie": "Maxie",
"archie": "Archie",
"cyrus": "Cyrus",
"ghetsis": "Ghetsis",
"lysandre": "Lysandre",
"lusamine": "Lusamine",
"guzma": "Guzma",
"rose": "Rose",
"blue_red_double": "Blue & Red",
"red_blue_double": "Red & Blue",
"tate_liza_double": "Tate & Liza",

View File

@ -16,6 +16,10 @@
"galactic_boss": "Chefe da Equipe Galáctica",
"plasma_boss": "Chefe da Equipe Plasma",
"flare_boss": "Chefe da Equipe Flare",
"aether_boss": "Presidente Aether",
"skull_boss": "Chefe da Equipe Skull",
"macro_boss": "Presidente da Macro Cosmos",
"rocket_admin": "Admin da Equipe Rocket",
"rocket_admin_female": "Admin da Equipe Rocket",
"magma_admin": "Admin da Equipe Magma",
@ -27,5 +31,8 @@
"plasma_sage": "Sábio da Equipe Plasma",
"plasma_admin": "Admin da Equipe Plasma",
"flare_admin": "Admin da Equipe Flare",
"flare_admin_female": "Admin da Equipe Flare"
"flare_admin_female": "Admin da Equipe Flare",
"aether_admin": "Admin da Fundação Aether",
"skull_admin": "Admin da Equipe Skull",
"macro_admin": "Macro Cosmos"
}

View File

@ -38,7 +38,7 @@
"learnMoveNotLearned": "{{pokemonName}}没有学会{{moveName}}。",
"learnMoveForgetQuestion": "要忘记哪个技能?",
"learnMoveForgetSuccess": "{{pokemonName}}忘记了\n如何使用{{moveName}}。",
"countdownPoof": "@d{32}1, @d{15}2 @d{15}… @d{15}… @d{15}@s{pb_bounce_1}空!",
"countdownPoof": "@d{32}1, @d{15}2 @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}空!",
"learnMoveAnd": "然后……",
"levelCapUp": "等级上限提升到{{levelCap}}",
"moveNotImplemented": "{{moveName}}尚未实装,无法选择。",

View File

@ -78,11 +78,21 @@
"battle_galactic_grunt": "晶灿钻石·明亮珍珠「战斗!银河队」",
"battle_plasma_grunt": "黑白「战斗!等离子团」",
"battle_flare_grunt": "XY「战斗闪焰队」",
"battle_aether_grunt": "日月「战斗!以太基金会」",
"battle_skull_grunt": "日月「战斗!骷髅队」",
"battle_macro_grunt": "剑盾「战斗!马洛科蒙集团」",
"battle_galactic_admin": "晶灿钻石·明亮珍珠「战斗!银河队干部」",
"battle_skull_admin": "日月「战斗!骷髅队干部」",
"battle_oleana": "剑盾「战斗!奥利薇」",
"battle_rocket_boss": "究极日月「战斗!坂木」",
"battle_aqua_magma_boss": "Ω红宝石α蓝宝石「战斗!水梧桐・赤焰松」",
"battle_galactic_boss": "晶灿钻石·明亮珍珠「战斗!赤日」",
"battle_plasma_boss": "黑2白2「战斗魁奇思」",
"battle_flare_boss": "XY「战斗弗拉达利」",
"battle_aether_boss": "日月「战斗!露莎米奈」",
"battle_skull_boss": "日月「战斗!古兹马」",
"battle_macro_boss": "剑盾「战斗!洛兹」",
"abyss": "空之探险队「黑暗小丘」",
"badlands": "空之探险队「枯竭之谷」",
"beach": "空之探险队「潮湿岩地」",

View File

@ -655,6 +655,86 @@
"5": "你虽然打败了我,但是我输的也这么潇洒!"
}
},
"aether_grunt": {
"encounter": {
"1": "我会用尽全力消灭你!",
"2": "我才不管你是不是小孩!\n只要和我们作对我就把你打飞",
"3": "上头要我拦下所有训练师,无论是谁!",
"4": "给你展现一下以太乐园的力量!",
"5": "既然你已经触达到了以太基金会的黑暗,\n那我要请你就此消失了。"
},
"victory": {
"1": "哼!看来你有点实力。",
"2": "这什么情况!什么情况!",
"3": "啊!你怎么这么强!我这下可没法阻止你!",
"4": "嗯……看来我输了……",
"5": "我惊掉大牙了……"
}
},
"faba": {
"encounter": {
"1": "我,分部长扎奥博, \n给你见识下现实世界的残酷吧",
"2": "堂堂以太乐园的最后防线,\n我扎奥博竟然要跟个毛头小子对战。",
"3": "我,扎奥博,以太基金会分部长。\n世上唯一无可替代"
},
"victory": {
"1": "哎咿呀!",
"2": "怎……怎么可能!这孩子!",
"3": "这就是……这就是为啥我讨厌小孩子!"
}
},
"skull_grunt": {
"encounter": {
"1": "我们并不坏YO我们是硬汉",
"2": "YO咋样我们就这样打招呼\n混个脸熟呗崽子",
"3": "咱们就是一帮对别人的宝可梦\n比较感兴趣的哥们和姐们",
"4": "别装B了你有我们拽吗老弟",
"5": "骷髅队在此!没钱住房子!\n天天找乐子青春混到死"
},
"victory": {
"1": "哈?这就完了?",
"2": "该逃跑了YO闪一边去YO",
"3": "你这种弱鸡宝可梦反正我们也不要!",
"4": "啥!? 这小屁孩也太牛B了",
"5": "MAN我能说什么\n我的人生比宝可梦还烂。"
}
},
"plumeria": {
"encounter": {
"1": " …哼嗯,你看起来也没啥特别的。",
"2": "这帮呆子对付你也花了太长时间了吧……",
"3": "要是惹了骷髅队的人!我就不和你开玩笑了!"
},
"victory": {
"1": "哼嗯!你很强,我承认。",
"2": "哼,你是挺强的。现在我知道\n为啥那帮手下要花那么久对付一个小孩了。",
"3": "哼嗯!看来我得承认我输了。"
}
},
"macro_grunt": {
"encounter": {
"1": "你的对战生涯到此为止了。",
"2": "你是一名训练师吧\n你没有干涉我们工作的权力",
"3": "我是马洛科蒙集团的,要买马洛科蒙人寿保险吗。"
},
"victory": {
"1": "除了礼貌地撤退我似乎别无选择…",
"2": "没法留住我的零花钱了,我又要财政赤字了…",
"3": "没人能比马洛科蒙集团的我们工作更卷!"
}
},
"oleana": {
"encounter": {
"1": "我不会让你方案洛兹先生的计划!",
"2": "看来你打倒了所有我安排的训练师,本身也没对他们有啥期待…",
"3": "为了总裁!我不会输的!"
},
"victory": {
"1": "*叹气*我赢不了。\n奥利薇你真是个没用的女人",
"2": "呃啊!不可饶恕...我在想什么。\n走到这里的训练师果然不会轻易屈服",
"3": "*叹气*奥利薇累累了……"
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "我不得不说,能来到这里,你的确很不简单!"
@ -787,6 +867,72 @@
"1": "没有远见的蠢货会继续玷污这个美丽的世界。"
}
},
"aether_boss_lusamine_1": {
"encounter": {
"1": "你吓到我可爱的异兽了!我要让你先闭嘴!"
},
"victory": {
"1": "你…你怎么这么不听话!"
},
"defeat": {
"1": "哼嗯…"
}
},
"aether_boss_lusamine_2": {
"encounter": {
"1": "为什么你要一直妨碍我!\n我受够你了完完全全受够了 \n$不用说废话了…有了虚吾伊德的力量。\n我会让你明白你来这里是有多么错误"
},
"victory": {
"1": "呃呃啊啊啊啊呜呜呜啊啊!"
},
"defeat": {
"1": "我只要和我可爱的异兽在一起就好了!你们怎么样都无所谓了!"
}
},
"skull_boss_guzma_1": {
"encounter": {
"1": "摧毁,摧毁,\n不管摧毁几次也从不手软\n$惹人厌的古兹马大爷在此。"
},
"victory": {
"1": "切,我一定要找时间干掉你!"
},
"defeat": {
"1": "大老远跑来就这,昂?"
}
},
"skull_boss_guzma_2": {
"encounter": {
"1": "不管谁与我作对,我都会干掉他们!\n$这就是大坏蛋古兹马的全部!"
},
"victory": {
"1": "古兹马!!你在干什么啊!!!"
},
"defeat": {
"1": "你们真够蠢的!"
}
},
"macro_boss_rose_1": {
"encounter": {
"1": "我必须为所有人提供无限的能源,实现繁荣。$这是我的目的,我的责任,我的使命!"
},
"victory": {
"1": "你还是没有明白,训练师\n$我们…不,我要推动历史的进程啊!"
},
"defeat": {
"1": "你完全不理解!"
}
},
"macro_boss_rose_2": {
"encounter": {
"1": "我致力于解决伽勒尔的能源问题\n——当然也是全世界的能源问题。\n$我的经验与成果,造就了马洛科蒙集团,证明了我的正确与成功!\n$就算输了,我也不会改变主意的……"
},
"victory": {
"1": "我都忘记宝可梦对战的魅力了!我太久没有着手对战了…\n$这的确让人很满足,我接受我的失败!"
},
"defeat": {
"1": "我承认我做的事情非常渗人,我也不指望你能理解。\n$但我必须为伽勒尔地区提供无限的能源,确保永久的繁荣。"
}
},
"brock": {
"encounter": {
"1": "我对岩石属性宝可梦的专精会击败你!来吧!",

View File

@ -655,6 +655,86 @@
"5": "你虽然打败了我,但是我输的也这么潇洒!"
}
},
"aether_grunt": {
"encounter": {
"1": "我会用尽全力消灭你!",
"2": "我才不管你是不是小孩!\n只要和我们作对我就把你打飞",
"3": "上头要我拦下所有训练师,无论是谁!",
"4": "给你展现一下以太乐园的力量!",
"5": "既然你已经触达到了以太基金会的黑暗,\n那我要请你就此消失了。"
},
"victory": {
"1": "哼!看来你有点实力。",
"2": "这什么情况!什么情况!",
"3": "啊!你怎么这么强!我这下可没法阻止你!",
"4": "嗯……看来我输了……",
"5": "我惊掉大牙了……"
}
},
"faba": {
"encounter": {
"1": "我,分部长扎奥博, \n给你见识下现实世界的残酷吧",
"2": "堂堂以太乐园的最后防线,\n我扎奥博竟然要跟个毛头小子对战。",
"3": "我,扎奥博,以太基金会分部长。\n世上唯一无可替代"
},
"victory": {
"1": "哎咿呀!",
"2": "怎……怎么可能!这孩子!",
"3": "这就是……这就是为啥我讨厌小孩子!"
}
},
"skull_grunt": {
"encounter": {
"1": "我们并不坏YO我们是硬汉",
"2": "YO咋样我们就这样打招呼\n混个脸熟呗崽子",
"3": "咱们就是一帮对别人的宝可梦\n比较感兴趣的哥们和姐们",
"4": "别装B了你有我们拽吗老弟",
"5": "骷髅队在此!没钱住房子!\n天天找乐子青春混到死"
},
"victory": {
"1": "哈?这就完了?",
"2": "该逃跑了YO闪一边去YO",
"3": "你这种弱鸡宝可梦反正我们也不要!",
"4": "啥!? 这小屁孩也太牛B了",
"5": "MAN我能说什么\n我的人生比宝可梦还烂。"
}
},
"plumeria": {
"encounter": {
"1": " …哼嗯,你看起来也没啥特别的。",
"2": "这帮呆子对付你也花了太长时间了吧……",
"3": "要是惹了骷髅队的人!我就不和你开玩笑了!"
},
"victory": {
"1": "哼嗯!你很强,我承认。",
"2": "哼,你是挺强的。现在我知道\n为啥那帮手下要花那么久对付一个小孩了。",
"3": "哼嗯!看来我得承认我输了。"
}
},
"macro_grunt": {
"encounter": {
"1": "你的对战生涯到此为止了。",
"2": "你是一名训练师吧\n你没有干涉我们工作的权力",
"3": "我是马洛科蒙集团的,要买马洛科蒙人寿保险吗。"
},
"victory": {
"1": "除了礼貌地撤退我似乎别无选择…",
"2": "没法留住我的零花钱了,我又要财政赤字了…",
"3": "没人能比马洛科蒙集团的我们工作更卷!"
}
},
"oleana": {
"encounter": {
"1": "我不会让你方案洛兹先生的计划!",
"2": "看来你打倒了所有我安排的训练师,本身也没对他们有啥期待…",
"3": "为了总裁!我不会输的!"
},
"victory": {
"1": "*叹气*我赢不了。\n奥利薇你真是个没用的女人",
"2": "呃啊!不可饶恕...我在想什么。\n走到这里的训练师果然不会轻易屈服",
"3": "*叹气*奥利薇累累了……"
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "我不得不说,能来到这里,你的确很不简单!"
@ -787,6 +867,72 @@
"1": "没有远见的蠢货会继续玷污这个美丽的世界。"
}
},
"aether_boss_lusamine_1": {
"encounter": {
"1": "你吓到我可爱的异兽了!我要让你先闭嘴!"
},
"victory": {
"1": "你…你怎么这么不听话!"
},
"defeat": {
"1": "哼嗯…"
}
},
"aether_boss_lusamine_2": {
"encounter": {
"1": "为什么你要一直妨碍我!\n我受够你了完完全全受够了 \n$不用说废话了…有了虚吾伊德的力量。\n我会让你明白你来这里是有多么错误"
},
"victory": {
"1": "呃呃啊啊啊啊呜呜呜啊啊!"
},
"defeat": {
"1": "我只要和我可爱的异兽在一起就好了!你们怎么样都无所谓了!"
}
},
"skull_boss_guzma_1": {
"encounter": {
"1": "摧毁,摧毁,\n不管摧毁几次也从不手软\n$惹人厌的古兹马大爷在此。"
},
"victory": {
"1": "切,我一定要找时间干掉你!"
},
"defeat": {
"1": "大老远跑来就这,昂?"
}
},
"skull_boss_guzma_2": {
"encounter": {
"1": "不管谁与我作对,我都会干掉他们!\n$这就是大坏蛋古兹马的全部!"
},
"victory": {
"1": "古兹马!!你在干什么啊!!!"
},
"defeat": {
"1": "你们真够蠢的!"
}
},
"macro_boss_rose_1": {
"encounter": {
"1": "我必须为所有人提供无限的能源,实现繁荣。$这是我的目的,我的责任,我的使命!"
},
"victory": {
"1": "你还是没有明白,训练师\n$我们…不,我要推动历史的进程啊!"
},
"defeat": {
"1": "你完全不理解!"
}
},
"macro_boss_rose_2": {
"encounter": {
"1": "我致力于解决伽勒尔的能源问题\n——当然也是全世界的能源问题。\n$我的经验与成果,造就了马洛科蒙集团,证明了我的正确与成功!\n$就算输了,我也不会改变主意的……"
},
"victory": {
"1": "我都忘记宝可梦对战的魅力了!我太久没有着手对战了…\n$这的确让人很满足,我接受我的失败!"
},
"defeat": {
"1": "我承认我做的事情非常渗人,我也不指望你能理解。\n$但我必须为伽勒尔地区提供无限的能源,确保永久的繁荣。"
}
},
"brock": {
"encounter": {
"1": "我对岩石属性宝可梦的专精会击败你!来吧!",

View File

@ -117,5 +117,14 @@
"plasma_grunts": "等离子队手下们",
"flare_grunt": "闪焰队手下",
"flare_grunt_female": "闪焰队手下",
"flare_grunts": "闪焰队手下们"
"flare_grunts": "闪焰队手下们",
"aether_grunt": "以太基金会职员",
"aether_grunt_female": "以太基金会职员",
"aether_grunts": "以太基金会职员",
"skull_grunt": "骷髅队手下",
"skull_grunt_female": "骷髅队手下",
"skull_grunts": "骷髅队手下",
"macro_grunt": "马洛科蒙训练师",
"macro_grunt_female": "马洛科蒙训练师",
"macro_grunts": "马洛科蒙训练师"
}

Some files were not shown because too many files have changed in this diff Show More