IV: Fix Ninetales (Alola) evolution property in pokemon.json

Also fixed PokemonTextField.tsx

Author: nitoyon

scripts/sync.js

@@ -197,7 +197,12 @@ async function syncPokemon() {
     const en2ja = jaJson.translation.pokemons;
     const enNames = Object.keys(jaJson.translation.pokemons);
     for (const enname of Object.keys(jaJson.translation.pokemons)) {
-        ja2en[jaJson.translation.pokemons[enname]] = enname;
+        const nameJa = jaJson.translation.pokemons[enname];
+        const nameJa2 = nameJa
+            .replace(" ", "")
+            .replace("(アローラ)", "(アローラのすがた)");
+        ja2en[nameJa] = enname;
+        ja2en[nameJa2] = enname;
     }
 
     // Update each Pokemon

src/data/pokemon.json

@@ -748,8 +748,9 @@
         "frequency": 5600,
         "ingRatio": 23,
         "skillRatio": 2.8,
-        "evolutionCount": -1,
-        "evolutionLeft": 2,
+        "ancestor": 37,
+        "evolutionCount": 0,
+        "evolutionLeft": 1,
         "isFullyEvolved": false,
         "carryLimit": 10,
         "ing1": {
@@ -813,9 +814,10 @@
         "frequency": 2900,
         "ingRatio": 23.1,
         "skillRatio": 2.8,
-        "evolutionCount": -1,
-        "evolutionLeft": 2,
-        "isFullyEvolved": false,
+        "ancestor": 37,
+        "evolutionCount": 1,
+        "evolutionLeft": 0,
+        "isFullyEvolved": true,
         "carryLimit": 20,
         "ing1": {
             "name": "soy",

src/ui/IvCalc/PokemonTextField.tsx

@@ -16,6 +16,7 @@ import { MainSkillName } from '../../util/MainSkill';
 export interface PokemonOption {
     id: number;
     idForm: number;
+    form?: string;
     name: string;
     localName: string;
     sleepType: SleepType;
@@ -42,6 +43,7 @@ const PokemonTextField = React.memo(({value, fixMode, onChange}: {
             .map((pokemon) => ({
                 id: pokemon.id,
                 idForm: new PokemonIv(pokemon.name).idForm,
+                form: pokemon.form,
                 name: pokemon.name,
                 localName: t(`pokemons.${pokemon.name}`),
                 sleepType: pokemon.sleepType,
@@ -76,7 +78,7 @@ const PokemonTextField = React.memo(({value, fixMode, onChange}: {
 
     return (<div>
         {fixMode ? <>{selectedOption.localName}</> :
-        <TextLikeButton onClick={onInputClick} style={{width: '8rem', fontSize: '0.9rem'}}
+        <TextLikeButton onClick={onInputClick} style={{width: '10.2rem', fontSize: '0.9rem'}}
             className={open ? 'focused' : ''}>
             {selectedOption.localName}
         </TextLikeButton>}
@@ -116,7 +118,9 @@ const EvolveButton = React.memo(({selectedOption, onChange}: {
     // setup menu item
     const evolveMenuItems = [];
     const pokemonsInEvoLine = pokemons
-        .filter(x => x.ancestor === selectedOption.ancestor)
+        .filter(x => x.ancestor === selectedOption.ancestor &&
+            x.form === selectedOption.form
+        )
         .sort((a, b) => a.id === selectedOption.ancestor ? -1 : a.id - b.id);
     for (const p of pokemonsInEvoLine) {
         evolveMenuItems.push(<MenuItem key={p.id} value={p.name}