Skip to content

Commit

Permalink
IV: Add Mimikyu data
Browse files Browse the repository at this point in the history
  • Loading branch information
nitoyon committed Oct 27, 2024
1 parent b1ba1d3 commit 8b0fd1d
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 4 deletions.
1 change: 1 addition & 0 deletions scripts/sync.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const skills = {
"おてつだいブースト(でんき)": "Helper Boost",
"おてつだいブースト(ほのお)": "Helper Boost",
"おてつだいブースト(みず)": "Helper Boost",
"ばけのかわ(きのみバースト)": "Berry Burst (Disguise)",
};
const ingredients = {
"ふといながねぎ": "leek",
Expand Down
8 changes: 7 additions & 1 deletion src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -593,6 +598,7 @@
"Stufful": "Stufful",
"Bewear": "Bewear",
"Comfey": "Comfey",
"Mimikyu": "Mimikyu",
"Cramorant": "Cramorant",
"Sprigatito": "Sprigatito",
"Floragato": "Floragato",
Expand Down
8 changes: 7 additions & 1 deletion src/i18n/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"notice detail1": "将来の SP やエナジーを確認して、育成の計画に役立ててください!",
"notice detail2": "",
"news": {
"add mimikyu": {
"headline": "ミミッキュのデータを更新しました。",
"detail": "食材確率・スキル確率については、RP Collection の情報を参照しています。"
},
"v2.1.0": {
"headline": "デルビル、ヘルガー、ブラッキー、ピカチュウ (ハロウィン) のデータを更新しました。",
"detail": "食材確率・スキル確率については、RP Collection の情報を参照しています。"
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -584,6 +589,7 @@
"Stufful": "ヌイコグマ",
"Bewear": "キテルグマ",
"Comfey": "キュワワー",
"Mimikyu": "ミミッキュ",
"Cramorant": "ウッウ",
"Sprigatito": "ニャオハ",
"Floragato": "ニャローテ",
Expand Down
8 changes: 7 additions & 1 deletion src/i18n/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"notice detail1": "미래의 SP와 벌어들이는 에너지를 확인하고, 육성 계획에 활용하세요!",
"notice detail2": "",
"news": {
"add mimikyu": {
"headline": "따라큐의 정보를 추가했습니다.",
"detail": "재료%와 기술%은 RP Collection 값에 기반합니다."
},
"v2.1.0": {
"headline": "델빌, 헬가, 블래키, 그리고 피카츄 (핼러윈)의 데이터를 업데이트했습니다.",
"detail": "재료%와 기술%은 RP Collection 값에 기반합니다."
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -582,6 +587,7 @@
"Stufful": "포곰곰",
"Bewear": "이븐곰",
"Comfey": "큐아링",
"Mimikyu": "따라큐",
"Cramorant": "윽우지",
"Sprigatito": "나오하",
"Floragato": "나로테",
Expand Down
14 changes: 14 additions & 0 deletions src/ui/IvCalc/PokemonIconData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'},
Expand Down
7 changes: 6 additions & 1 deletion src/util/MainSkill.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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];
Expand Down
3 changes: 3 additions & 0 deletions src/util/PokemonRp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
}
Expand Down
1 change: 1 addition & 0 deletions src/util/PokemonStrength.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down

0 comments on commit 8b0fd1d

Please sign in to comment.