Merge bd13ae542f into fe69bd2b55
This commit is contained in:
Jannik Tappert
GitHub
commit
430ac2316b
|
|
@ -40,9 +40,14 @@
|
|||
"castformRainy": "Rainy",
|
||||
"castformSnowy": "Snowy",
|
||||
"deoxysNormal": "Normal",
|
||||
"deoxysAttack": "Attack",
|
||||
"deoxysDefense": "Defense",
|
||||
"deoxysSpeed": "Speed",
|
||||
"burmyPlant": "Plant",
|
||||
"burmySandy": "Sandy",
|
||||
"burmyTrash": "Trash",
|
||||
"cheribiOvercast": "Overcast",
|
||||
"cheribiSunshine": "Sunshine",
|
||||
"shellosEast": "East",
|
||||
"shellosWest": "West",
|
||||
"rotomHeat": "Heat",
|
||||
|
|
@ -50,21 +55,36 @@
|
|||
"rotomFrost": "Frost",
|
||||
"rotomFan": "Fan",
|
||||
"rotomMow": "Mow",
|
||||
"dialgaOrigin": "Origin",
|
||||
"palkiaOrigin": "Origin",
|
||||
"giratinaAltered": "Altered",
|
||||
"giratinaOrigin": "Origin",
|
||||
"shayminLand": "Land",
|
||||
"shayminSky": "Sky",
|
||||
"basculinRedStriped": "Red Striped",
|
||||
"basculinBlueStriped": "Blue Striped",
|
||||
"basculinWhiteStriped": "White Striped",
|
||||
"darumakaZen": "Zen",
|
||||
"deerlingSpring": "Spring",
|
||||
"deerlingSummer": "Summer",
|
||||
"deerlingAutumn": "Autumn",
|
||||
"deerlingWinter": "Winter",
|
||||
"tornadusIncarnate": "Incarnate",
|
||||
"tornadusTherian": "Therian",
|
||||
"thundurusIncarnate": "Incarnate",
|
||||
"thundurusTherian": "Therian",
|
||||
"landorusIncarnate": "Incarnate",
|
||||
"landorusTherian": "Therian",
|
||||
"kyuremBlack": "Black",
|
||||
"kyuremWhite": "White",
|
||||
"keldeoOrdinary": "Ordinary",
|
||||
"keldeoResolute": "Resolute",
|
||||
"meloettaAria": "Aria",
|
||||
"meloettaPirouette": "Pirouette",
|
||||
"genesectShock": "Shock Drive",
|
||||
"genesectBurn": "Burn Drive",
|
||||
"genesectChill": "Chill Drive",
|
||||
"genesectDouse": "Douse Drive",
|
||||
"froakieBattleBond": "Battle Bond",
|
||||
"scatterbugMeadow": "Meadow",
|
||||
"scatterbugIcySnow": "Icy Snow",
|
||||
|
|
@ -100,6 +120,10 @@
|
|||
"furfrouLaReine": "La Reine",
|
||||
"furfrouKabuki": "Kabuki",
|
||||
"furfrouPharaoh": "Pharaoh",
|
||||
"espurrMale": "Male",
|
||||
"espurrFemale": "Female",
|
||||
"honedgeShiled": "Shield",
|
||||
"honedgeBlade": "Blade",
|
||||
"pumpkabooSmall": "Small",
|
||||
"pumpkabooLarge": "Large",
|
||||
"pumpkabooSuper": "Super",
|
||||
|
|
@ -110,11 +134,34 @@
|
|||
"zygarde50Pc": "50% Forme Power Construct",
|
||||
"zygarde10Pc": "10% Forme Power Construct",
|
||||
"zygardeComplete": "Complete Forme",
|
||||
"hoopaUnbound": "Unbound",
|
||||
"oricorioBaile": "Baile",
|
||||
"oricorioPompom": "Pom-Pom",
|
||||
"oricorioPau": "Pau",
|
||||
"oricorioSensu": "Sensu",
|
||||
"rockruffOwnTempo": "Own Tempo",
|
||||
"rockruffMidday": "Midday",
|
||||
"rockruffMidnight": "Midnight",
|
||||
"rockruffMidnight": "Dusk",
|
||||
"wishiwashiSchool": "School",
|
||||
"typeNullNormal": "Type: Normal",
|
||||
"typeNullFighting": "Type: Fighting",
|
||||
"typeNullFlying": "Type: Flying",
|
||||
"typeNullPoison": "Type: Poison",
|
||||
"typeNullGround": "Type: Ground",
|
||||
"typeNullRock": "Type: Rock",
|
||||
"typeNullBug": "Type: Bug",
|
||||
"typeNullGhost": "Type: Ghost",
|
||||
"typeNullSteel": "Type: Steel",
|
||||
"typeNullFire": "Type: Fire",
|
||||
"typeNullWater": "Type: Water",
|
||||
"typeNullGrass": "Type: Grass",
|
||||
"typeNullElectric": "Type: Electric",
|
||||
"typeNullPsychic": "Type: Psychic",
|
||||
"typeNullIce": "Type: Ice",
|
||||
"typeNullDragon": "Type: Dragon",
|
||||
"typeNullDark": "Type: Dark",
|
||||
"typeNullFairy": "Type: Fairy",
|
||||
"miniorRedMeteor": "Red Meteor",
|
||||
"miniorOrangeMeteor": "Orange Meteor",
|
||||
"miniorYellowMeteor": "Yellow Meteor",
|
||||
|
|
@ -131,25 +178,55 @@
|
|||
"miniorViolet": "Violet",
|
||||
"mimikyuDisguised": "Disguised",
|
||||
"mimikyuBusted": "Busted",
|
||||
"necrozmaDuskMane": "Dusk Mane",
|
||||
"necrozmaDawnWings": "Dawn Wings",
|
||||
"necrozmaUltra": "Ultra",
|
||||
"magearnaOriginal": "Original",
|
||||
"marshadowZenith": "Zenith",
|
||||
"sinisteaPhony": "Phony",
|
||||
"sinisteaAntique": "Antique",
|
||||
"milceryVanillaCream": "Vanilla Cream",
|
||||
"milceryRubyCream": "Ruby Cream",
|
||||
"milceryMatchaCream": "Matcha Cream",
|
||||
"milceryMintCream": "Mint Cream",
|
||||
"milceryLemonCream": "Lemon Cream",
|
||||
"milcerySaltedCream": "Salted Cream",
|
||||
"milceryRubySwirl": "Ruby Swirl",
|
||||
"milceryCaramelSwirl": "Caramel Swirl",
|
||||
"milceryRainbowSwirl": "Rainbow Swirl",
|
||||
"eiscueNoIce": "No Ice",
|
||||
"indeedeeMale": "Male",
|
||||
"indeedeeFemale": "Female",
|
||||
"morpekoFullBelly": "Full Belly",
|
||||
"morpekoHangry": "Hangry",
|
||||
"zacianHeroOfManyBattles": "Hero Of Many Battles",
|
||||
"zacianCrowned": "Crowned",
|
||||
"zamazentaHeroOfManyBattles": "Hero Of Many Battles",
|
||||
"zamazentaCrowned": "Crowned",
|
||||
"kubfuSingleStrike": "Single Strike",
|
||||
"kubfuRapidStrike": "Rapid Strike",
|
||||
"zarudeDada": "Dada",
|
||||
"calyrexIce": "Ice Rider",
|
||||
"calyrexShadow": "Shadow Rider",
|
||||
"basculinMale": "Male",
|
||||
"basculinFemale": "Female",
|
||||
"enamorusIncarnate": "Incarnate",
|
||||
"enamorusTherian": "Therian",
|
||||
"lechonkMale": "Male",
|
||||
"lechonkFemale": "Female",
|
||||
"tandemausFour": "Family of Four",
|
||||
"tandemausThree": "Family of Three",
|
||||
"squawkabillyGreenPlumage": "Green Plumage",
|
||||
"squawkabillyBluePlumage": "Blue Plumage",
|
||||
"squawkabillyYellowPlumage": "Yellow Plumage",
|
||||
"squawkabillyWhitePlumage": "White Plumage",
|
||||
"finizenZero": "Zero",
|
||||
"finizenZero": "Hero",
|
||||
"tatsugiriCurly": "Curly",
|
||||
"tatsugiriDroopy": "Droopy",
|
||||
"tatsugiriStretchy": "Stretchy",
|
||||
"dunsparceTwo": "Two-Segment",
|
||||
"dunsparceThree": "Three-Segment",
|
||||
"gimmighoulChest": "Chest",
|
||||
"gimmighoulRoaming": "Roaming",
|
||||
"koraidonApexBuild": "Apex Build",
|
||||
|
|
@ -164,7 +241,20 @@
|
|||
"miraidonGlideMode": "Glide Mode",
|
||||
"poltchageistCounterfeit": "Counterfeit",
|
||||
"poltchageistArtisan": "Artisan",
|
||||
"poltchageistUnremarkable": "Unremarkable",
|
||||
"poltchageistMasterpiece": "Masterpiece",
|
||||
"ogerponTealMask": "Teal Mask",
|
||||
"ogerponTealMaskTera": "Teal Mask Terastallized",
|
||||
"ogerponWellspringMask": "Wellspring Mask",
|
||||
"ogerponWellspringMaskTera": "Wellspring Mask Terastallized",
|
||||
"ogerponHearthflameMask": "Hearthflame Mask",
|
||||
"ogerponHearthflameMaskTera": "Hearthflame Mask Terastallized",
|
||||
"ogerponCornerstoneMask": "Cornerstone Mask",
|
||||
"ogerponCornerstoneMaskTera": "Cornerstone Mask Terastallized",
|
||||
"terpagosTerastal": "Terastal",
|
||||
"terpagosStellar": "Stellar",
|
||||
"galarDarumakaZen": "Zen",
|
||||
"paldeaTaurosCombat": "Combat",
|
||||
"paldeaTaurosBlaze": "Blaze",
|
||||
"paldeaTaurosAqua": "Aqua"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,9 +40,14 @@
|
|||
"castformRainy": "Eau de Pluie",
|
||||
"castformSnowy": "Blizzard",
|
||||
"deoxysNormal": "Normal",
|
||||
"deoxysAttack": "Attaque",
|
||||
"deoxysDefense": "Défense",
|
||||
"deoxysSpeed": "Vitesse",
|
||||
"burmyPlant": "Plante",
|
||||
"burmySandy": "Sable",
|
||||
"burmyTrash": "Déchet",
|
||||
"cheribiOvercast": "Couvert",
|
||||
"cheribiSunshine": "Ensoleillé",
|
||||
"shellosEast": "Orient",
|
||||
"shellosWest": "Occident",
|
||||
"rotomHeat": "Chaleur",
|
||||
|
|
@ -50,21 +55,36 @@
|
|||
"rotomFrost": "Froid",
|
||||
"rotomFan": "Hélice",
|
||||
"rotomMow": "Tonte",
|
||||
"dialgaOrigin": "Originel",
|
||||
"palkiaOrigin": "Originel",
|
||||
"giratinaAltered": "Alternatif",
|
||||
"giratinaOrigin": "Originel",
|
||||
"shayminLand": "Terrestre",
|
||||
"shayminSky": "Céleste",
|
||||
"basculinRedStriped": "Motif Rouge",
|
||||
"basculinBlueStriped": "Motif Bleu",
|
||||
"basculinWhiteStriped": "Motif Blanc",
|
||||
"darumakaZen": "Zen",
|
||||
"deerlingSpring": "Printemps",
|
||||
"deerlingSummer": "Été",
|
||||
"deerlingAutumn": "Automne",
|
||||
"deerlingWinter": "Hiver",
|
||||
"tornadusIncarnate": "Avatar",
|
||||
"tornadusTherian": "Totémique",
|
||||
"thundurusIncarnate": "Avatar",
|
||||
"thundurusTherian": "Totémique",
|
||||
"landorusIncarnate": "Avatar",
|
||||
"landorusTherian": "Totémique",
|
||||
"kyuremBlack": "Noir",
|
||||
"kyuremWhite": "Blanc",
|
||||
"keldeoOrdinary": "Normal",
|
||||
"keldeoResolute": "Décidé",
|
||||
"meloettaAria": "Chant",
|
||||
"meloettaPirouette": "Danse",
|
||||
"genesectShock": "Module Choc",
|
||||
"genesectBurn": "Module Pyro",
|
||||
"genesectChill": "Module Cryo",
|
||||
"genesectDouse": "Module Aqua",
|
||||
"froakieBattleBond": "Synergie",
|
||||
"scatterbugMeadow": "Floraison",
|
||||
"scatterbugIcySnow": "Blizzard",
|
||||
|
|
@ -100,6 +120,10 @@
|
|||
"furfrouLaReine": "Reine",
|
||||
"furfrouKabuki": "Kabuki",
|
||||
"furfrouPharaoh": "Pharaon",
|
||||
"espurrMale": "Mâle",
|
||||
"espurrFemale": "Femelle",
|
||||
"honedgeShiled": "Parade",
|
||||
"honedgeBlade": "Assaut",
|
||||
"pumpkabooSmall": "Mini",
|
||||
"pumpkabooLarge": "Maxi",
|
||||
"pumpkabooSuper": "Ultra",
|
||||
|
|
@ -109,12 +133,35 @@
|
|||
"zygarde10": "Forme 10%",
|
||||
"zygarde50Pc": "Rassemblement Forme 50%",
|
||||
"zygarde10Pc": "Rassemblement Forme 10%",
|
||||
"hoopaUnbound": "Déchainé",
|
||||
"zygardeComplete": "Parfait",
|
||||
"oricorioBaile": "Flamenco",
|
||||
"oricorioPompom": "Pom-Pom",
|
||||
"oricorioPau": "Hula",
|
||||
"oricorioSensu": "Buyō",
|
||||
"rockruffOwnTempo": "Tempo Perso",
|
||||
"rockruffMidday": "Diurne",
|
||||
"rockruffMidnight": "Nocturne",
|
||||
"rockruffMidnight": "Crépusculaire",
|
||||
"wishiwashiSchool": "Banc",
|
||||
"typeNullNormal": "Type: Normal",
|
||||
"typeNullFighting": "Type: Combat",
|
||||
"typeNullFlying": "Type: Vol",
|
||||
"typeNullPoison": "Type: Poison",
|
||||
"typeNullGround": "Type: Sol",
|
||||
"typeNullRock": "Type: Roche",
|
||||
"typeNullBug": "Type: Insecte",
|
||||
"typeNullGhost": "Type: Spectre",
|
||||
"typeNullSteel": "Type: Acier",
|
||||
"typeNullFire": "Type: Feu",
|
||||
"typeNullWater": "Type: Eau",
|
||||
"typeNullGrass": "Type: Plante",
|
||||
"typeNullElectric": "Type: Électrik",
|
||||
"typeNullPsychic": "Type: Psy",
|
||||
"typeNullIce": "Type: Glace",
|
||||
"typeNullDragon": "Type: Dragon",
|
||||
"typeNullDark": "Type: Ténèbres",
|
||||
"typeNullFairy": "Type: Fée",
|
||||
"miniorRedMeteor": "Météore Rouge",
|
||||
"miniorOrangeMeteor": "Météore Orange",
|
||||
"miniorYellowMeteor": "Météore Jaune",
|
||||
|
|
@ -131,25 +178,55 @@
|
|||
"miniorViolet": "Violet",
|
||||
"mimikyuDisguised": "Déguisé",
|
||||
"mimikyuBusted": "Démasqué",
|
||||
"necrozmaDuskMane": "Crinière du Couchant",
|
||||
"necrozmaDawnWings": "Ailes de l’Aurore",
|
||||
"necrozmaUltra": "Ultra",
|
||||
"magearnaOriginal": "Couleur du Passé",
|
||||
"marshadowZenith": "Zénith",
|
||||
"sinisteaPhony": "Contrefaçon",
|
||||
"sinisteaAntique": "Authentique",
|
||||
"milceryVanillaCream": "Lait Vanille",
|
||||
"milceryRubyCream": "Lait Ruby",
|
||||
"milceryMatchaCream": "Lait Matcha",
|
||||
"milceryMintCream": "Lait Menthe",
|
||||
"milceryLemonCream": "Lait Citron",
|
||||
"milcerySaltedCream": "Lait Salé",
|
||||
"milceryRubySwirl": "Mélange Ruby",
|
||||
"milceryCaramelSwirl": "Mélange Caramel",
|
||||
"milceryRainbowSwirl": "Mélange Tricolore",
|
||||
"eiscueNoIce": "Tête Dégel",
|
||||
"indeedeeMale": "Mâle",
|
||||
"indeedeeFemale": "Femelle",
|
||||
"morpekoFullBelly": "Rassasié",
|
||||
"morpekoHangry": "Affamé",
|
||||
"zacianHeroOfManyBattles": "Héros Aguerri",
|
||||
"zacianCrowned": "Épée Suprême",
|
||||
"zamazentaHeroOfManyBattles": "Héros Aguerri",
|
||||
"zamazentaCrowned": "Bouclier Suprême",
|
||||
"kubfuSingleStrike": "Poing Final",
|
||||
"kubfuRapidStrike": "Mille Poings",
|
||||
"zarudeDada": "Papa",
|
||||
"calyrexIce": "Cavalier du Froid",
|
||||
"calyrexShadow": "Cavalier d’Effroi",
|
||||
"basculinMale": "Mâle",
|
||||
"basculinFemale": "Femelle",
|
||||
"enamorusIncarnate": "Avatar",
|
||||
"enamorusTherian": "Totémique",
|
||||
"lechonkMale": "Mâle",
|
||||
"lechonkFemale": "Femelle",
|
||||
"tandemausFour": "Famille de Quatre",
|
||||
"tandemausThree": "Famille de Trois",
|
||||
"squawkabillyGreenPlumage": "Plumage Vert",
|
||||
"squawkabillyBluePlumage": "Plumage Bleu",
|
||||
"squawkabillyYellowPlumage": "Plumage Jaune",
|
||||
"squawkabillyWhitePlumage": "Plumage Blanc",
|
||||
"finizenZero": "Ordinaire",
|
||||
"finizenZero": "Super",
|
||||
"tatsugiriCurly": "Courbé",
|
||||
"tatsugiriDroopy": "Affalé",
|
||||
"tatsugiriStretchy": "Raide",
|
||||
"dunsparceTwo": "Double",
|
||||
"dunsparceThree": "Triple",
|
||||
"gimmighoulChest": "Coffre",
|
||||
"gimmighoulRoaming": "Marche",
|
||||
"koraidonApexBuild": "Final",
|
||||
|
|
@ -164,7 +241,20 @@
|
|||
"miraidonGlideMode": "Aérien",
|
||||
"poltchageistCounterfeit": "Imitation",
|
||||
"poltchageistArtisan": "Onéreux",
|
||||
"poltchageistUnremarkable": "Médiocre",
|
||||
"poltchageistMasterpiece": "Exceptionnelle",
|
||||
"ogerponTealMaskTera": "Masque Turquoise",
|
||||
"ogerponTealMask": "Masque Turquoise Téracristal",
|
||||
"ogerponWellspringMask": "Masque du Puits",
|
||||
"ogerponWellspringMaskTera": "Masque du Puits Téracristal",
|
||||
"ogerponHearthflameMask": "Masque du Fourneau",
|
||||
"ogerponHearthflameMaskTera": "Masque du Fourneau Téracristal",
|
||||
"ogerponCornerstoneMask": "Masque de la Pierre",
|
||||
"ogerponCornerstoneMaskTera": "Masque de la Pierre Téracristal",
|
||||
"terpagosTerastal": "Téracristal",
|
||||
"terpagosStellar": "Stellaire",
|
||||
"galarDarumakaZen": "Zen",
|
||||
"paldeaTaurosCombat": "Combatif",
|
||||
"paldeaTaurosBlaze": "Flamboyant",
|
||||
"paldeaTaurosAqua": "Aquatique"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import ConfirmUiHandler from "./confirm-ui-handler";
|
|||
import { StatsContainer } from "./stats-container";
|
||||
import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text";
|
||||
import { addWindow } from "./ui-theme";
|
||||
import { Species } from "#enums/species";
|
||||
|
||||
interface LanguageSetting {
|
||||
infoContainerTextSize: string;
|
||||
|
|
@ -234,7 +235,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
|
|||
this.pokemonGenderText.setVisible(false);
|
||||
}
|
||||
|
||||
if (pokemon.species.forms?.[pokemon.formIndex]?.formName) {
|
||||
if (pokemon.species.forms?.[pokemon.formIndex]?.formName && pokemon.species.forms?.[pokemon.formIndex]?.formName !== "Normal") {
|
||||
this.pokemonFormLabelText.setVisible(true);
|
||||
this.pokemonFormText.setVisible(true);
|
||||
const newForm = BigInt(1 << pokemon.formIndex) * DexAttr.DEFAULT_FORM;
|
||||
|
|
@ -247,14 +248,26 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
|
|||
this.pokemonFormLabelText.setShadowColor(getTextColor(TextStyle.WINDOW, true, this.scene.uiTheme));
|
||||
}
|
||||
|
||||
const formName = pokemon.species.forms?.[pokemon.formIndex]?.formName;
|
||||
this.pokemonFormText.setText(formName.length > this.numCharsBeforeCutoff ? formName.substring(0, this.numCharsBeforeCutoff - 3) + "..." : formName);
|
||||
if (formName.length > this.numCharsBeforeCutoff) {
|
||||
this.pokemonFormText.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.pokemonFormText.width, this.pokemonFormText.height), Phaser.Geom.Rectangle.Contains);
|
||||
this.pokemonFormText.on("pointerover", () => (this.scene as BattleScene).ui.showTooltip("", pokemon.species.forms?.[pokemon.formIndex]?.formName, true));
|
||||
this.pokemonFormText.on("pointerout", () => (this.scene as BattleScene).ui.hideTooltip());
|
||||
} else {
|
||||
this.pokemonFormText.disableInteractive();
|
||||
const pokemonForm = (pokemon.species?.forms?.[pokemon.formIndex!]?.formKey) || "";
|
||||
let formName = "";
|
||||
if (pokemonForm !== "") {
|
||||
const formText = Utils.capitalizeString(pokemonForm, "-", false, false);
|
||||
|
||||
const speciesName = Utils.capitalizeString(Species[pokemon.species.getRootSpeciesId()], "_", true, false);
|
||||
if (pokemon.species.speciesId === Species.ARCEUS) {
|
||||
formName = i18next.t(`pokemonInfo:Type.${formText?.toUpperCase()}`);
|
||||
} else {
|
||||
formName = formText ? i18next.t(`pokemonForm:${speciesName}${formText}`) : "";
|
||||
}
|
||||
|
||||
this.pokemonFormText.setText(formName.length > this.numCharsBeforeCutoff ? formName.substring(0, this.numCharsBeforeCutoff - 3) + "..." : formName);
|
||||
if (formName.length > this.numCharsBeforeCutoff) {
|
||||
this.pokemonFormText.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.pokemonFormText.width, this.pokemonFormText.height), Phaser.Geom.Rectangle.Contains);
|
||||
this.pokemonFormText.on("pointerover", () => (this.scene as BattleScene).ui.showTooltip("", formName, true));
|
||||
this.pokemonFormText.on("pointerout", () => (this.scene as BattleScene).ui.hideTooltip());
|
||||
} else {
|
||||
this.pokemonFormText.disableInteractive();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
this.pokemonFormLabelText.setVisible(false);
|
||||
|
|
|
|||
Loading…
Reference in New Issue