diff --git a/scripts/sync.js b/scripts/sync.js index 93329c6..a8d847a 100644 --- a/scripts/sync.js +++ b/scripts/sync.js @@ -65,6 +65,7 @@ const skills = { "おてつだいブースト(でんき)": "Helper Boost", "おてつだいブースト(ほのお)": "Helper Boost", "おてつだいブースト(みず)": "Helper Boost", + "ばけのかわ(きのみバースト)": "Berry Burst (Disguise)", }; const ingredients = { "ふといながねぎ": "leek", diff --git a/src/i18n/en.json b/src/i18n/en.json index f62991d..2d6979f 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -14,6 +14,10 @@ "notice detail1": "Let's check the future RP and Strength of the Pokémon.", "notice detail2": "", "news": { + "add mimikyu": { + "headline": "Mimikyu is added!!!", + "detail": "The ingredient% and skill% are based on RP Collection values." + }, "v2.1.0": { "headline": "Updated the data for Houndour, Houndoom, Umbreon, and Pikachu (Halloween).", "detail": "The ingredient% and skill% are based on RP Collection values." @@ -342,7 +346,8 @@ "Extra Helpful S": "Extra Helpful S", "Cooking Power-Up S": "Cooking Power-Up S", "Tasty Chance S": "Tasty Chance S", - "Helper Boost": "Helper Boost" + "Helper Boost": "Helper Boost", + "Berry Burst (Disguise)": "Disguise (Berry Burst)" }, "subskill": { @@ -593,6 +598,7 @@ "Stufful": "Stufful", "Bewear": "Bewear", "Comfey": "Comfey", + "Mimikyu": "Mimikyu", "Cramorant": "Cramorant", "Sprigatito": "Sprigatito", "Floragato": "Floragato", diff --git a/src/i18n/ja.json b/src/i18n/ja.json index 9f26d30..16f5c8d 100644 --- a/src/i18n/ja.json +++ b/src/i18n/ja.json @@ -14,6 +14,10 @@ "notice detail1": "将来の SP やエナジーを確認して、育成の計画に役立ててください！", "notice detail2": "", "news": { + "add mimikyu": { + "headline": "ミミッキュのデータを更新しました。", + "detail": "食材確率・スキル確率については、RP Collection の情報を参照しています。" + }, "v2.1.0": { "headline": "デルビル、ヘルガー、ブラッキー、ピカチュウ (ハロウィン) のデータを更新しました。", "detail": "食材確率・スキル確率については、RP Collection の情報を参照しています。" @@ -333,7 +337,8 @@ "Extra Helpful S": "おてつだいサポートS", "Cooking Power-Up S": "料理パワーアップS", "Tasty Chance S": "料理チャンスS", - "Helper Boost": "おてつだいブースト" + "Helper Boost": "おてつだいブースト", + "Berry Burst (Disguise)": "ばけのかわ (きのみバースト)" }, "subskill": { @@ -584,6 +589,7 @@ "Stufful": "ヌイコグマ", "Bewear": "キテルグマ", "Comfey": "キュワワー", + "Mimikyu": "ミミッキュ", "Cramorant": "ウッウ", "Sprigatito": "ニャオハ", "Floragato": "ニャローテ", diff --git a/src/i18n/ko.json b/src/i18n/ko.json index e679859..b386c87 100644 --- a/src/i18n/ko.json +++ b/src/i18n/ko.json @@ -14,6 +14,10 @@ "notice detail1": "미래의 SP와 벌어들이는 에너지를 확인하고, 육성 계획에 활용하세요!", "notice detail2": "", "news": { + "add mimikyu": { + "headline": "따라큐의 정보를 추가했습니다.", + "detail": "재료%와 기술%은 RP Collection 값에 기반합니다." + }, "v2.1.0": { "headline": "델빌, 헬가, 블래키, 그리고 피카츄 (핼러윈)의 데이터를 업데이트했습니다.", "detail": "재료%와 기술%은 RP Collection 값에 기반합니다." @@ -331,7 +335,8 @@ "Extra Helpful S": "도우미 서포트S", "Cooking Power-Up S": "요리 파워 업S", "Tasty Chance S": "요리 찬스S", - "Helper Boost": "도우미 부스트" + "Helper Boost": "도우미 부스트", + "Berry Burst (Disguise)": "탈 (나무열매 버스트)" }, "subskill": { @@ -582,6 +587,7 @@ "Stufful": "포곰곰", "Bewear": "이븐곰", "Comfey": "큐아링", + "Mimikyu": "따라큐", "Cramorant": "윽우지", "Sprigatito": "나오하", "Floragato": "나로테", diff --git a/src/ui/IvCalc/PokemonIconData.ts b/src/ui/IvCalc/PokemonIconData.ts index 92d83af..1ba03dd 100644 --- a/src/ui/IvCalc/PokemonIconData.ts +++ b/src/ui/IvCalc/PokemonIconData.ts @@ -840,6 +840,20 @@ const pokemonRectData: {[id: string]: RectElement[]} = { {x: 0.66, y: 0, w: 0.34, h: 0.34, color: '#f5d266'}, {x: 0.34, y: 0, w: 0.34, h: 0.34, color: '#feadd3'}, ], + // Mimikyu + '778': [ + {x: 0, y: 0, w: 1, h: 1, color: '#f6f0a1'}, + {x: -0.1, y: -0.15, w: 0.3, h: 0.3, r: 0.2, color: '#66662f'}, + {x: 0.79, y: -0.15, w: 0.3, h: 0.3, r: 0.2, color: '#66662f'}, + {x: 0.2, y: 0.17, w: 0.16, h: 0.18, r: 0.2, color: '#66662f'}, + {x: 0.6, y: 0.15, w: 0.16, h: 0.22, r: 0.2, color: '#66662f'}, + {x: 0.04, y: 0.3, w: 0.15, h: 0.17, r: 0.2, color: '#ff9940'}, + {x: 0.83, y: 0.3, w: 0.15, h: 0.17, r: 0.2, color: '#ff9940'}, + {x: 0.22, y: 0.4, w: 0.58, h: 0.04, r: 0.02, color: '#66662f'}, + {x: 0.4, y: 0.66, w: 0.05, h: 0.15, r: 0.2, color: '#66662f'}, + {x: 0.55, y: 0.66, w: 0.05, h: 0.15, r: 0.2, color: '#66662f'}, + {x: 0, y: 0.94, w: 1, h: 0.2, color: '#66662f'}, + ], // Cramorant '845': [ {x: 0, y: 0, w: 1, h: 1, color: '#339eff'}, diff --git a/src/util/MainSkill.ts b/src/util/MainSkill.ts index ac77abf..7424b71 100644 --- a/src/util/MainSkill.ts +++ b/src/util/MainSkill.ts @@ -14,7 +14,8 @@ export type MainSkillName = "Ingredient Magnet S" | "Extra Helpful S" | "Cooking Power-Up S" | "Tasty Chance S" | - "Helper Boost"; + "Helper Boost" | + "Berry Burst (Disguise)"; export const MainSkillNames: MainSkillName[] = [ "Charge Strength S", "Charge Strength M", @@ -97,6 +98,10 @@ export function getSkillValue(skill: MainSkillName, skillLevel: number) { if (skill === "Tasty Chance S") { return [4, 5, 6, 7, 8, 10][skillLevel - 1]; } + if (skill === "Berry Burst (Disguise)") { + // TODO + return [0, 0, 0, 0, 0, 0][skillLevel - 1]; + } if (skill === "Metronome") { // TODO return [0, 0, 0, 0, 0, 0][skillLevel - 1]; diff --git a/src/util/PokemonRp.ts b/src/util/PokemonRp.ts index a6d67c8..6ba74d5 100644 --- a/src/util/PokemonRp.ts +++ b/src/util/PokemonRp.ts @@ -363,6 +363,9 @@ class PokemonRp { if (this._pokemon.skill === "Helper Boost") { return [2800, 3902, 5273, 6975, 9317, 12438][this.skillLevel - 1]; } + if (this._pokemon.skill === "Berry Burst (Disguise)") { + return [2800, 3902, 5273, 6975, 9317, 12438][this.skillLevel - 1]; + } return [880, 1251, 1726, 2383, 3290, 4546, 5843][this.skillLevel - 1]; } } diff --git a/src/util/PokemonStrength.ts b/src/util/PokemonStrength.ts index 8c158fe..c197446 100644 --- a/src/util/PokemonStrength.ts +++ b/src/util/PokemonStrength.ts @@ -300,6 +300,7 @@ class PokemonStrength { case "Charge Strength S": case "Charge Strength S (Random)": case "Charge Strength S (Stockpile)": + case "Berry Burst (Disguise)": const strength = mainSkillValue * (1 + param.fieldBonus / 100); return [strength, strength];