From fa55ab6d26c75dfe073362c37bb44a856042aeba Mon Sep 17 00:00:00 2001 From: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com> Date: Wed, 25 Sep 2024 04:08:46 -0400 Subject: [PATCH 1/5] [Beta/Bug] Fix Breeders ME Dialogue Token Issue (#4411) * revert styled dialogue * revert styled dialogue * revert styled dialogue --------- Co-authored-by: ImperialSympathizer --- .../mystery-encounters/the-expert-pokemon-breeder-dialogue.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en/mystery-encounters/the-expert-pokemon-breeder-dialogue.json b/src/locales/en/mystery-encounters/the-expert-pokemon-breeder-dialogue.json index 5f1eece528b..3c74c7b2726 100644 --- a/src/locales/en/mystery-encounters/the-expert-pokemon-breeder-dialogue.json +++ b/src/locales/en/mystery-encounters/the-expert-pokemon-breeder-dialogue.json @@ -25,7 +25,7 @@ "outro": "Look how happy your {{chosenPokemon}} is now!$Here, you can have these as well.", "outro_failed": "How disappointing...$It looks like you still have a long way\nto go to earn your Pokémon's trust!", "gained_eggs": "@s{item_fanfare}You received {{numEggs}}!", - "eggs_tooltip": "\n(+) Earn @[TOOLTIP_TITLE]{{{eggs}}}", + "eggs_tooltip": "\n(+) Earn {{eggs}}", "numEggs_one": "{{count}} {{rarity}} Egg", "numEggs_other": "{{count}} {{rarity}} Eggs" } \ No newline at end of file From ed10152fb45ab866b3cbea506c534287b4598f74 Mon Sep 17 00:00:00 2001 From: damocleas Date: Wed, 25 Sep 2024 10:13:22 -0400 Subject: [PATCH 2/5] [Enhancement] Add New Splash Text (#4358) * Splash Text Changes 1 * fix some commas, adjust two halloween texts * adjustments * Capitalization / Grammar from English * fixes * Update splash-messages.ts to match --------- Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/data/splash-messages.ts | 107 ++++++++++++++++++++++-- src/locales/en/splash-messages.json | 124 ++++++++++++++++++++++++---- 2 files changed, 209 insertions(+), 22 deletions(-) diff --git a/src/data/splash-messages.ts b/src/data/splash-messages.ts index b8069f77737..a257b748734 100644 --- a/src/data/splash-messages.ts +++ b/src/data/splash-messages.ts @@ -54,7 +54,7 @@ const commonSplashMessages = [ ...Array(BATTLES_WON_WEIGHT_MULTIPLIER).fill("battlesWon"), "joinTheDiscord", "infiniteLevels", - "everythingStacks", + "everythingIsStackable", "optionalSaveScumming", "biomes", "openSource", @@ -66,9 +66,9 @@ const commonSplashMessages = [ "infiniteFusionAtHome", "brokenEggMoves", "magnificent", - "mubstitute", + "doPeopleReadThis", "thatsCrazy", - "oranceJuice", + "gottaCatchEmAll", "questionableBalancing", "coolShaders", "aiFree", @@ -77,14 +77,105 @@ const commonSplashMessages = [ "moreAddictiveThanIntended", "mostlyConsistentSeeds", "achievementPointsDontDoAnything", - "youDoNotStartAtLevel", - "dontTalkAboutTheManaphyEggIncident", + "nothingBeatsAJellyFilledDonut", + "dontTalkAboutTheTinkatonIncident", "alsoTryPokengine", "alsoTryEmeraldRogue", "alsoTryRadicalRed", "eeveeExpo", - "ynoproject", + "checkOutYnoproject", "breedersInSpace", + "alsoTryPokemonUnbound", + "tryTheJohtoDragonChallenge", + "basicReadingAbilityRecommended", + "shoutoutsToTheArtists", + "gamblingNotEncouraged", + "dontForgetToTakeABreak", + "wEvent", + "ifItsNotAccurateItsAccurate", + "everyLossIsProgressMade", + "liveWoChienReaction", + "itsAFeatureNotABug", + "theEggsAreNotForEating", + "7.8outOf10TooManyWaterBiomes", + "butNothingHappened", + "thePowerOfScienceIsAmazing", + "freeToPlay", + "theresATimeAndPlaceForEverything", + "nowWithShinierShinies", + "smilesGoForMiles", + "certainlyNotDragonFree", + "haveANiceDay", + "redacted", + "hi", + "transRights", + "shinyOddsHigherThanYouThink", + "noFalseTrades", + "notForProfit", + "timeForYourDailyRun", + "moreEggsThanADaycare", + "disclaimerHarshSunDoesNotGiveVitaminD", + "whoNeedsAMap", + "luxrayIsNotADarkType", + "selfDestructiveEncounters", + "mostOptionsAreViable", + "pokerogueMorse", + "smiley", + "beAwareOfPassives", + "asSeenOnTheWorldWideWeb", + "vaultinVeluzas", + "tooManyStarters", + "checkTheWiki", + "winWithYourFavorites", + "alsoTryPokerogueWait", + "theWayISeeItKyogreIsSurrounded", + "tryOutHoneyGather", + "notForTheFaintOfHeart", + "p", + "flipYourDeviceToEvolveInkay", + "inArceusWeTrust", + "whyDidTheTorchicCrossTheRoad", + "goodLuck", + "fuseWisely", + "compensation", + "prepareForTroubleAndMakeItDouble", + "anEggForYourTroubles", + "regirock", + "hereForAGoodTime", + "getGoodOrDont", + "checkTheSubreddit", + "betterNerfGreninja", + "inCaseOfUpdateClearYourCache", + "insertTextHere", + "endingEndlessNotFound", + "iLikeMyEggsVouchered", + "YOU", + "noAddedSugar", + "notSponsored", + "notRated", + "justOneMoreWaveMom", + "saltCured", + "onlyOnPokerogueNet", + "pixelPerfection", + "openSource", + "probablyGood", + "itsAMonsterHouse", + "dontForgetYourPassword", + "tripleTripleTripleAxel", + "questionExclamation", + "clownEncounters", + "fullOfBerries", + "limitsAreMeantToBeBrokenSometimes", + "keepItCasual", + "serversProbablyWorking", + "mew", + "makeItRainAndYourProblemsGoAway", + "customMusicTracks", + "youAreValid", + "number591IsLookingOff", + "timeForYourDeliDelivery", + "goodFirstImpression", + "iPreferRarerCandies", ]; //#region Seasonal Messages @@ -94,13 +185,13 @@ const seasonalSplashMessages: Season[] = [ name: "Halloween", start: "09-15", end: "10-31", - messages: ["halloween.pumpkaboosAbout", "halloween.mayContainSpiders", "halloween.spookyScaryDuskulls"], + messages: ["halloween.pumpkabooAbout", "halloween.mayContainSpiders", "halloween.spookyScarySkeledirge", "halloween.gourgeistUsedTrickOrTreat", "halloween.letsSnuggleForever"], }, { name: "XMAS", start: "12-01", end: "12-26", - messages: ["xmas.happyHolidays", "xmas.delibirdSeason"], + messages: ["xmas.happyHolidays", "xmas.unaffilicatedWithDelibirdServices", "xmas.delibirdSeason", "xmas.diamondsFromTheSky", "xmas.holidayStylePikachuNotIncluded"], }, { name: "New Year's", diff --git a/src/locales/en/splash-messages.json b/src/locales/en/splash-messages.json index 168974525f8..b7f7c737344 100644 --- a/src/locales/en/splash-messages.json +++ b/src/locales/en/splash-messages.json @@ -1,10 +1,10 @@ { - "battlesWon": "{{count, number}} Battles Won!", + "battlesWon": "Battles Won!", "joinTheDiscord": "Join the Discord!", "infiniteLevels": "Infinite Levels!", - "everythingStacks": "Everything Stacks!", + "everythingIsStackable": "Everything Is Stackable*!", "optionalSaveScumming": "Optional Save Scumming!", - "biomes": "35 Biomes!", + "biomes": "38 Biomes!", "openSource": "Open Source!", "playWithSpeed": "Play with 5x Speed!", "liveBugTesting": "Live Bug Testing!", @@ -14,9 +14,9 @@ "infiniteFusionAtHome": "Infinite Fusion at Home!", "brokenEggMoves": "Broken Egg Moves!", "magnificent": "Magnificent!", - "mubstitute": "Mubstitute!", + "doPeopleReadThis": "Do People Read This?", "thatsCrazy": "That's Crazy!", - "oranceJuice": "Orance Juice!", + "gottaCatchEmAll": "Gotta Catch 'Em All!", "questionableBalancing": "Questionable Balancing!", "coolShaders": "Cool Shaders!", "aiFree": "AI-Free!", @@ -25,24 +25,120 @@ "moreAddictiveThanIntended": "More Addictive than Intended!", "mostlyConsistentSeeds": "Mostly Consistent Seeds!", "achievementPointsDontDoAnything": "Achievement Points Don't Do Anything!", - "youDoNotStartAtLevel": "You Do Not Start at Level 2000!", - "dontTalkAboutTheManaphyEggIncident": "Don't Talk About the Manaphy Egg Incident!", + "nothingBeatsAJellyFilledDonut": "Nothing Beats a Jelly-Filled Donut!", + "dontTalkAboutTheTinkatonIncident": "Don't Talk About the Tinkaton Incident!", "alsoTryPokengine": "Also Try Pokéngine!", "alsoTryEmeraldRogue": "Also Try Emerald Rogue!", "alsoTryRadicalRed": "Also Try Radical Red!", "eeveeExpo": "Eevee Expo!", - "ynoproject": "YNOproject!", - "breedersInSpace": "Breeders in space!", + "checkOutYnoproject": "Check out YNOproject!", + "breedersInSpace": "Breeders in Space!", + "alsoTryPokemonUnbound": "Also Try Pokemon Unbound!", + "tryTheJohtoDragonChallenge": "Try the Johto Dragon Challenge!", + "basicReadingAbilityRecommended": "Basic Reading Ability Recommended!", + "shoutoutsToTheArtists": "Shoutouts to the Artists!", + "gamblingNotEncouraged": "Gambling Not Encouraged!", + "dontForgetToTakeABreak": "Don't Forget To Take a Break!", + "wEvent": "W Event", + "ifItsNotAccurateItsAccurate": "If It's Not 100% Accurate, It's 50%.", + "everyLossIsProgressMade": "Every Loss Is Progress Made!", + "liveWoChienReaction": "Live Wo-Chien Reaction:", + "itsAFeatureNotABug": "It's a Feature, Not a Bug!", + "theEggsAreNotForEating": "The Eggs Are Not for Eating!", + "7.8outOf10TooManyWaterBiomes": "7.8 out of 10, Too Many Water Biomes.", + "butNothingHappened": "But Nothing Happened!", + "thePowerOfScienceIsAmazing": "The Power of Science Is Amazing!", + "freeToPlay": "Free To Play!", + "theresATimeAndPlaceForEverything": "There's a Time and Place for Everything!", + "nowWithShinierShinies": "Now With Shinier Shinies!", + "smilesGoForMiles": "Smiles Go for Miles!", + "certainlyNotDragonFree": "Certainly Not Dragon Free!", + "haveANiceDay": "Have a Nice Day!", + "redacted": "[REDACTED]", + "hi": "hi", + "transRights": "Trans Rights!", + "shinyOddsHigherThanYouThink": "Shiny Odds Higher Than You Think!", + "noFalseTrades": "No False Trades!", + "notForProfit": "Not for Profit!", + "timeForYourDailyRun": "Time for Your Daily Run!", + "moreEggsThanADaycare": "More Eggs Than a Daycare!", + "disclaimerHarshSunDoesNotGiveVitaminD": "Disclaimer: Harsh Sun Does NOT Give Vitamin D!", + "whoNeedsAMap": "Who Needs a Map?", + "luxrayIsNotADarkType": "Luxray Is Not a Dark-Type!", + "selfDestructiveEncounters": "Self-Destructive Encounters!", + "mostOptionsAreViable": "Most Options Are Viable!", + "pokerogueMorse": ".--. --- -.- . .-. --- --. ..- .", + "smiley": ":)", + "beAwareOfPassives": "Be Aware of Passives!", + "asSeenOnTheWorldWideWeb": "As Seen on the World-Wide Web!", + "vaultinVeluzas": "Vaultin' Veluza!", + "tooManyStarters": "Too Many Starters!", + "checkTheWiki": "Check the Wiki!", + "winWithYourFavorites": "Win With Your Favorites!", + "alsoTryPokerogueWait": "Also Try PokéRogue! Wait...", + "theWayISeeItKyogreIsSurrounded": "The Way I See It, Kyogre Is Surrounded...", + "tryOutHoneyGather": "Try out Honey Gather!", + "notForTheFaintOfHeart": "Not for the Faint of Heart!", + "p": "(P)", + "flipYourDeviceToEvolveInkay": "Flip Your Device To Evolve Inkay!", + "inArceusWeTrust": "In Arceus We Trust", + "whyDidTheTorchicCrossTheRoad": "Why Did the Torchic Cross the Road?", + "goodLuck": "Good Luck!", + "fuseWisely": "Fuse Wisely!", + "compensation": "Compensation?", + "prepareForTroubleAndMakeItDouble": "Prepare for Trouble! And Make It Double!", + "anEggForYourTroubles": "An Egg for Your Troubles?", + "regirock": "ÜN ÜN ÜN", + "hereForAGoodTime": "Here for a Good Time!", + "getGoodOrDont": "Get Good! Or Don't!", + "checkTheSubreddit": "Check out the Subreddit!", + "betterNerfGreninja": "Better Nerf Greninja!", + "inCaseOfUpdateClearYourCache": "In Case of Update, Clear Your Cache!", + "insertTextHere": "insert text here", + "endingEndlessNotFound": "ending_endless not found", + "iLikeMyEggsVouchered": "I Like My Eggs Vouchered!", + "YOU": "YOU!", + "noAddedSugar": "No Added Sugar!", + "notSponsored": "Not Sponsored!", + "notRated": "Not Rated!", + "justOneMoreWaveMom": "Just One More Wave, Mom!", + "saltCured": "Salt Cured!", + "onlyOnPokerogueNet": "Only on pokerogue.net!", + "pixelPerfection": "Pixel Perfection!", + "openSource": "Open Source!", + "probablyGood": "Probably Good!", + "itsAMonsterHouse": "It's a Monster House!", + "dontForgetYourPassword": "Don't Forget Your Password!", + "tripleTripleTripleAxel": "Triple- Triple- Triple Axel!", + "questionExclamation": "?!", + "clownEncounters": "Clown Encounters!", + "fullOfBerries": "Full of Berries!", + "limitsAreMeantToBeBrokenSometimes": "Limits Are Meant To Be Broken, Sometimes!", + "keepItCasual": "Keep It Casual!", + "serversProbablyWorking": "Servers Probably Working!", + "mew": "Mew Probably Not Under a Truck!", + "makeItRainAndYourProblemsGoAway": "Make it Rain and your problems go away!", + "customMusicTracks": "Custom Music Tracks!", + "youAreValid": "You Are Valid!", + "number591IsLookingOff": "Number 591 Is Looking a Bit...", + "timeForYourDeliDelivery": "Time for Your Deli-Delivery!", + "goodFirstImpression": "Hope We Left a Good First Impression!", + "iPreferRarerCandies": "I Prefer Rarer Candies!", "halloween": { - "pumpkaboosAbout": "Pumpkaboos about!", - "mayContainSpiders": "May contain spiders!", - "spookyScaryDuskulls": "Spooky, Scary Duskulls!" + "pumpkabooAbout": "Pumpkaboo About!", + "mayContainSpiders": "May Contain Spiders!", + "spookyScarySkeledirge": "Spooky, Scary Skeledirge!", + "gourgeistUsedTrickOrTreat": "Gourgeist Used Trick-or-Treat!", + "letsSnuggleForever": "Let's Snuggle Forever!" }, "xmas": { "happyHolidays": "Happy Holidays!", - "delibirdSeason": "Delibird Season!" + "delibirdSeason": "Delibird Season!", + "unaffilicatedWithDelibirdServices": "Unaffiliated With Delibird Services!", + "diamondsFromTheSky": "Diamonds From the Sky!", + "holidayStylePikachuNotIncluded": "Holiday Style Pikachu Not Included!" }, "newYears": { "happyNewYear": "Happy New Year!" } -} \ No newline at end of file +} From e53e175813c6b8a5d22dfda8ad009c49edc1a0c9 Mon Sep 17 00:00:00 2001 From: Chapybara-jp Date: Wed, 25 Sep 2024 16:13:51 +0200 Subject: [PATCH 3/5] [Localisation] [JA] Minor corrections to settings, achv, tutorial; added necessary possessive particle to all trainer-classes (#4415) * Update ability-trigger.json * Update ability.json * Update arena-flyout.json * Update arena-tag.json * Update battle.json * Update fight-ui-handler.json * Update berry.json * Update menu.json * Update party-ui-handler.json * Update starter-select-ui-handler.json * Update tutorial.json * Update move.json * Update battle.json * Update arena-flyout.json * Update arena-flyout.json * Update arena-tag.json * Update party-ui-handler.json * Update settings.json * Update move-trigger.json * Translate modifier-type.json * Update modifier-type.json * Translated modifier-type.json * Update move-trigger.json * Update move-trigger.json * Update move-trigger.json * Update modifier-type.json * Update dialogue.json * Update dialogue.json * Update dialogue.json * Update dialogue-misc.json * Update dialogue.json * Update dialogue-misc.json * Update dialogue-misc.json * Update dialogue.json * Update dialogue.json * Update dialogue.json * Update dialogue.json Archers and Arianas dialog taken from Pokemon Stadium 2, HGSS, LGP/LGE, FRLG * Update dialogue.json * Update dialogue.json * Update dialogue.json * Update menu.json * Update dialogue.json * dialogue.json * Update dialogue-final-boss.json * Update dialogue.json * Update dialogue.json * Update dialogue.json * Update settings.json * Update tutorial.json * Update tutorial.json * Update trainer-classes.json * Update achv.json --- src/locales/ja/achv.json | 20 +-- src/locales/ja/settings.json | 2 +- src/locales/ja/trainer-classes.json | 202 ++++++++++++++-------------- src/locales/ja/tutorial.json | 8 +- 4 files changed, 116 insertions(+), 116 deletions(-) diff --git a/src/locales/ja/achv.json b/src/locales/ja/achv.json index ad85e8aeb05..12f0a15dd43 100644 --- a/src/locales/ja/achv.json +++ b/src/locales/ja/achv.json @@ -37,7 +37,7 @@ "name_female": "ワンパンウーマン" }, "HealAchv": { - "description": "一つの　技や　特性や　持たせたアイテムで\n{{HP}}{{healAmount}}を　一気に　回復する" + "description": "１つの　技や　特性や　持たせたアイテムで\n{{HP}}{{healAmount}}を　一気に　回復する" }, "250_HEAL": { "name": "回復発見者" @@ -52,7 +52,7 @@ "name": "ジョーイさん" }, "LevelAchv": { - "description": "一つの　ポケモンを　Lv.{{level}}まで　上げる" + "description": "１匹の　ポケモンを　Lv.{{level}}まで　上げる" }, "LV_100": { "name": "まだまだだよ" @@ -83,27 +83,27 @@ }, "TRANSFER_MAX_STAT_STAGE": { "name": "連係プレー", - "description": "少なくとも　一つの　能力を　最大まで　あげて\n他の　手持ちポケモンに　バトンタッチする" + "description": "少なくとも　１つの　能力を　最大まで　あげて\n他の　手持ちポケモンに　バトンタッチする" }, "MAX_FRIENDSHIP": { "name": "マブ達", - "description": "一つの　手持ちポケモンの　仲良し度を　最大に　上げる" + "description": "１匹の　手持ちポケモンの　仲良し度を　最大に　上げる" }, "MEGA_EVOLVE": { "name": "ザ・アブソリュート", - "description": "一つの　手持ちポケモンを　メガシンカさせる" + "description": "１匹の　手持ちポケモンを　メガシンカさせる" }, "GIGANTAMAX": { "name": "太ーくて堪らない", - "description": "一つの　手持ちポケモンを　キョダイマックスさせる" + "description": "１匹の　手持ちポケモンを　キョダイマックスさせる" }, "TERASTALLIZE": { "name": "一致好き", - "description": "一つの　手持ちポケモンを　テラスタルさせる" + "description": "１匹の　手持ちポケモンを　テラスタルさせる" }, "STELLAR_TERASTALLIZE": { "name": "隠れたタイプ", - "description": "一つの　手持ちポケモンを　ステラ・テラスタルさせる" + "description": "１匹の　手持ちポケモンを　ステラ・テラスタルさせる" }, "SPLICE": { "name": "インフィニット・フュージョン", @@ -155,7 +155,7 @@ }, "PERFECT_IVS": { "name": "個体値の賞状", - "description": "一つの　ポケモンの　個体値を　すべて　最大に　する" + "description": "１匹の　ポケモンの　個体値を　すべて　最大に　する" }, "CLASSIC_VICTORY": { "name": "無双", @@ -163,7 +163,7 @@ }, "UNEVOLVED_CLASSIC_VICTORY": { "name": "はじめてのおつかい", - "description": "少なくとも　一つの　進化していない　手持ちポケモンで\nクラシックモードを　クリアする" + "description": "少なくとも　１匹の　進化していない　手持ちポケモンで\nクラシックモードを　クリアする" }, "MONO_GEN_ONE": { "name": "原始", diff --git a/src/locales/ja/settings.json b/src/locales/ja/settings.json index afb2f94a047..7bdc9b59fc9 100644 --- a/src/locales/ja/settings.json +++ b/src/locales/ja/settings.json @@ -10,7 +10,7 @@ "hpBarSpeed": "HPバー増減の速さ", "expGainsSpeed": "経験値バー増加の速さ", "expPartyDisplay": "手持ちの経験値取得表示", - "skipSeenDialogues": "もう見た話をスキップ", + "skipSeenDialogues": "もう見た話を飛ばす", "battleStyle": "試合のルール", "enableRetries": "再挑戦を有効にする", "hideIvs": "個体値スキャナーを隠す", diff --git a/src/locales/ja/trainer-classes.json b/src/locales/ja/trainer-classes.json index a104e4e827e..e9c14c0af87 100644 --- a/src/locales/ja/trainer-classes.json +++ b/src/locales/ja/trainer-classes.json @@ -1,105 +1,105 @@ { - "ace_trainer": "エリートトレーナー", - "ace_trainer_female": "エリートトレーナー", - "ace_duo": "エリートコンビ", - "artist": "芸術家", - "artist_female": "芸術家", - "backers": "ファンクラブ", - "backpacker": "バックパッカー", - "backpacker_female": "バックパッカー", - "backpackers": "バックパッカーズ", - "baker": "ベーカリー", - "battle_girl": "バトルガール", - "beauty": "大人のおねえさん", - "beginners": "初心者", - "biker": "暴走族", - "black_belt": "カラテ王", - "breeder": "ポケモンブリーダー", - "breeder_female": "ポケモンブリーダー", - "breeders": "ブリーダーコンビ", - "clerk": "ビジネスマン", - "clerk_female": "ＯＬ", - "colleagues": "ビジネスパートナー", - "crush_kin": "格闘兄妹", - "cyclist": "サイクリング", - "cyclist_female": "サイクリング", - "cyclists": "サイクリングチーム", - "dancer": "ダンサー", - "dancer_female": "ダンサー", - "depot_agent": "鉄道員", - "doctor": "ドクター", - "doctor_female": "ドクター", - "firebreather": "火吹きやろう", - "fisherman": "釣り人", - "fisherman_female": "釣り人", - "gentleman": "ジェントルマン", - "guitarist": "ギタリスト", - "guitarist_female": "ギタリスト", - "harlequin": "クラウン", - "hiker": "山男", - "hooligans": "バッドチーム", - "hoopster": "バスケ選手", - "infielder": "野球選手", - "janitor": "清掃員", - "lady": "お嬢さま", - "lass": "ミニスカート", - "linebacker": "フットボーラー", - "maid": "メイド", - "madame": "マダム", - "medical_team": "医療チーム", - "musician": "ミュージシャン", - "hex_maniac": "オカルトマニア", - "nurse": "ナース", - "nursery_aide": "保育士", - "officer": "お巡りさん", - "parasol_lady": "パラソルおねえさん", - "pilot": "パイロット", - "pokéfan": "大好きクラブ", - "pokéfan_female": "大好きクラブ", - "pokéfan_family": "大好き夫婦", - "preschooler": "園児", - "preschooler_female": "園児", - "preschoolers": "園児たち", - "psychic": "サイキッカー", - "psychic_female": "サイキッカー", - "psychics": "サイキッ家", - "pokémon_ranger": "ポケモンレンジャー", - "pokémon_ranger_female": "ポケモンレンジャー", - "pokémon_rangers": "レンジャーズ", - "ranger": "レンジャー", - "restaurant_staff": "レストランスタッフ", - "rich": "お金持ち", - "rich_female": "お金持ち", - "rich_boy": "お坊っちゃま", - "rich_couple": "お二人さま", - "rich_kid": "ブルジョワ男子", - "rich_kid_female": "ブルジョワ女子", - "rich_kids": "ブルジョワ子達", - "roughneck": "スキンヘッズ", - "sailor": "船乗り", - "scientist": "研究員", - "scientist_female": "研究員", - "scientists": "研究チーム", - "smasher": "テニスプレイヤー", - "snow_worker": "冷凍作業員", - "snow_worker_female": "冷凍作業員", - "striker": "サッカー選手", - "school_kid": "塾帰り", - "school_kid_female": "塾帰り", - "school_kids": "塾生たち", - "swimmer": "海パンやろう", - "swimmer_female": "ビキニのおねえさん", - "swimmers": "水着カップル", - "twins": "双子ちゃん", - "veteran": "ベテラントレーナー", - "veteran_female": "ベテラントレーナー", - "veteran_duo": "ベテランコンビ", - "waiter": "ウエーター", - "waitress": "ウエートレス", - "worker": "作業員", - "worker_female": "作業員", - "workers": "作業班", - "youngster": "短パン小僧", + "ace_trainer": "エリートトレーナーの　", + "ace_trainer_female": "エリートトレーナーの　", + "ace_duo": "エリートコンビの　", + "artist": "芸術家の　", + "artist_female": "芸術家の　", + "backers": "ファンクラブの　", + "backpacker": "バックパッカーの　", + "backpacker_female": "バックパッカーの　", + "backpackers": "バックパッカーズの　", + "baker": "ベーカリーの　", + "battle_girl": "バトルガールの　", + "beauty": "大人のおねえさんの　", + "beginners": "初心者の　", + "biker": "暴走族の　", + "black_belt": "カラテ王の　", + "breeder": "ポケモンブリーダーの　", + "breeder_female": "ポケモンブリーダーの　", + "breeders": "ブリーダーコンビの　", + "clerk": "ビジネスマンの　", + "clerk_female": "ＯＬの　", + "colleagues": "ビジネスパートナーの　", + "crush_kin": "格闘兄妹の　", + "cyclist": "サイクリングの　", + "cyclist_female": "サイクリングの　", + "cyclists": "サイクリングチームの　", + "dancer": "ダンサーの　", + "dancer_female": "ダンサーの　", + "depot_agent": "鉄道員の　", + "doctor": "ドクターの　", + "doctor_female": "ドクターの　", + "firebreather": "火吹きやろうの　", + "fisherman": "釣り人の　", + "fisherman_female": "釣り人の　", + "gentleman": "ジェントルマンの　", + "guitarist": "ギタリストの　", + "guitarist_female": "ギタリストの　", + "harlequin": "クラウンの　", + "hiker": "山男の　", + "hooligans": "バッドチームの　", + "hoopster": "バスケ選手の　", + "infielder": "野球選手の　", + "janitor": "清掃員の　", + "lady": "お嬢さまの　", + "lass": "ミニスカートの　", + "linebacker": "フットボーラーの　", + "maid": "メイドの　", + "madame": "マダムの　", + "medical_team": "医療チームの　", + "musician": "ミュージシャンの　", + "hex_maniac": "オカルトマニアの　", + "nurse": "ナースの　", + "nursery_aide": "保育士の　", + "officer": "お巡りさんの　", + "parasol_lady": "パラソルおねえさんの　", + "pilot": "パイロットの　", + "pokéfan": "大好きクラブの　", + "pokéfan_female": "大好きクラブの　", + "pokéfan_family": "大好き夫婦の　", + "preschooler": "園児の　", + "preschooler_female": "園児の　", + "preschoolers": "園児たちの　", + "psychic": "サイキッカーの　", + "psychic_female": "サイキッカーの　", + "psychics": "サイキッ家の　", + "pokémon_ranger": "ポケモンレンジャーの　", + "pokémon_ranger_female": "ポケモンレンジャーの　", + "pokémon_rangers": "レンジャーズの　", + "ranger": "レンジャーの　", + "restaurant_staff": "レストランスタッフの　", + "rich": "お金持ちの　", + "rich_female": "お金持ちの　", + "rich_boy": "お坊っちゃまの　", + "rich_couple": "お二人さまの　", + "rich_kid": "ブルジョワ男子の　", + "rich_kid_female": "ブルジョワ女子の　", + "rich_kids": "ブルジョワ子達の　", + "roughneck": "スキンヘッズの　", + "sailor": "船乗りの　", + "scientist": "研究員の　", + "scientist_female": "研究員の　", + "scientists": "研究チームの　", + "smasher": "テニスプレイヤーの　", + "snow_worker": "冷凍作業員の　", + "snow_worker_female": "冷凍作業員の　", + "striker": "サッカー選手の　", + "school_kid": "塾帰りの　", + "school_kid_female": "塾帰りの　", + "school_kids": "塾生たちの　", + "swimmer": "海パンやろうの　", + "swimmer_female": "ビキニのおねえさんの　", + "swimmers": "水着カップルの　", + "twins": "双子ちゃんの　", + "veteran": "ベテラントレーナーの　", + "veteran_female": "ベテラントレーナーの　", + "veteran_duo": "ベテランコンビの　", + "waiter": "ウエーターの　", + "waitress": "ウエートレスの　", + "worker": "作業員の　", + "worker_female": "作業員の　", + "workers": "作業班の　", + "youngster": "短パン小僧の　", "rocket_grunt": "ロケット団の下っ端", "rocket_grunts": " ロケット団の下っ端", "rocket_grunt_female": "ロケット団の下っ端", diff --git a/src/locales/ja/tutorial.json b/src/locales/ja/tutorial.json index 99019b03f7f..a9018a53144 100644 --- a/src/locales/ja/tutorial.json +++ b/src/locales/ja/tutorial.json @@ -2,9 +2,9 @@ "intro": "PokéRogueへ　ようこそ！　ローグライク要素が\n加わった　バトル中心の　ポケモンファンゲームです。\n$このゲームは　収益を上げず、Pokémonおよび　使用される\n著作権資産に　対する所有権を　主張しません。\n$ゲームは　まだ開発中ですが、完全に　プレイすることが　できます。\nバグ報告は　ディスコードコミュニティを　ご利用ください。\n$ゲームが　遅い場合は、ブラウザ設定で「ハードウェア\nアクセラレーション」が　オンになっている　ことを　確認してください。", "accessMenu": "メニューを開くには　入力待ちの間に　Mキー／Escを　押してください。\nメニューには　設定や　様々な機能が　含まれています。", "menu": "このメニューから　設定が　開けます。\n$設定では、ゲームの速さや　ウィンドウタイプなどの　オプションを　変更できます。\n$ここには　様々な機能が　ありますので、\nぜひ　確認してみてください！", - "starterSelect": "この画面では　Zキー／空白キーを押して　ポケモンが　選択できます。\n選んだポケモンは　最初の手持ちに　なります。\n$各ポケモンは　ポイントが　ある。最大6つを　選べますが\nポケモンのポイントが　合計10を超えては　いけません。\n$ポケモンを　捕まえたり　タマゴからふかしたり　することで\n選択できる　性別、特性、フォルムなどの　幅を広げられます。\n$個体値も　徐々に　累積して　高くなるので、\n同じポケモンを　たくさん　捕まえて　みてください！", + "starterSelect": "この画面では　Zキー／空白キーを押して　ポケモンが　選択できます。\n選んだポケモンは　最初の手持ちに　なります。\n$各ポケモンは　ポイントが　ある。最大6つを　選べますが\nポケモンのポイントが　合計10を超えては　いけません。\n$ポケモンを　捕まえたり　タマゴからふかしたり　することで\n選択できる　性別、特性、フォルムなどの　幅を広げられます。\n$個体値も　徐々に　累積して　高くなるから\n同じポケモンを　たくさん　捕まえて　みてください！", "pokerus": "毎日、無作為に　スターターの\n3種類には　紫色の枠が　表示されます。\n$登録された　スターターの 中に　いれば、\n手持ちに加えて　強さを　確認してみましょう！", - "statChange": "ポケモンを　入れ替えない限り、\n次のバトルでも　能力変化は　なくなりません。\n$その代わりに、トレーナーバトルや　新しいバイオームに\n入る直前に　自動的に　能力変化は　元に戻ります。\n$Cキー／Shiftキーを　押し続けると、\n場にいるポケモンの　能力変化を　確認できます。\n$Vキーを押すと、\n相手が出した技も　確認できます。\n$ただし、現在のバトルでの　相手ポケモンが\nすでに使った　技のみが　表示されます。", - "selectItem": "バトルが　終わるたびには、「ショップ」という\n画面で　3つのご褒美から　1つが選べます。\n$種類は　消耗品、ポケモンの持ち物や道具、\n永続的な　パッシブアイテムなど　様々です。\n$ほとんどの　消耗しない　道具は\n効果が　累積されます。\n$例えば　進化アイテムなどの　ご褒美は\n使用できる　場合にのみ　登場します。\n$持ち物や道具が\n手持ちポケモン間に　移動できる\n$持ち物や道具が　あれば、ショップ画面の\n右下に「アイテム移行」が　表示されます。\n$ショップ画面で　お金で　消耗品を　買えます。\nラウンドが　進むにつれて　買えるアイテムが　増えます。\n$ご褒美を　選択すると　次のラウンドに\n進むから、まず　消耗品を　買ってください。", - "eggGacha": "この画面では、「タマゴクーポン」で\nポケモンのタマゴを　取得できます。\n$タマゴは　ラウンドが進めるうちに　ふかします。\nタマゴのふかは　レア度によって　時間が　かかります。\n$ふかしたポケモンは　手持ちに　加えられず、\nスターターに　登録されます。\n$ふかしたポケモンは　一般的に\n野生ポケモンよりも　高い個体値があります。\n$あるポケモンは　タマゴからしか　手に入りません。\n$各ガチャマシンは　個性的なボーナスが　あるますから、\n好きな方から　引いてみてください！," + "statChange": "ポケモンを　入れ替えない限り、\n次のバトルでも　能力変化は　なくなりません。\n$その代わりに、トレーナーバトルや　新しいバイオームに\n入る直前に　能力変化は　自動的に　元に戻ります。\n$Cキー／Shiftキーを　押し続けると、\n場にいるポケモンの　能力変化を　確認できます。\n$Vキーを　押し続けると、\n相手が出した技と　場の効果を　確認できます。\n$ただし　現在のバトルでの　相手ポケモンが\nすでに　使った　技のみ　表示されます。", + "selectItem": "バトルが　終わるたびには、「ショップ」という\n画面で　3つのご褒美から　1つが選べます。\n$種類は　消耗品、ポケモンの持ち物や道具、\n永続的な　パッシブアイテムなど　様々です。\n$ほとんどの　消耗しない　道具は\n効果が　累積されます。\n$例えば　進化アイテムなどの　ご褒美は\n使用できる　場合のみに　登場します。\n$持ち物や　道具が\n手持ちポケモン画面に　移動できます。\n$持ち物や　道具が　あれば、　ショップ画面の\n右下に「アイテム移行」が　表示されます。\n$ショップ画面で　お金で　消耗品を　買えます。\nラウンドが進むにつれて　買えるアイテムが　増えます。\n$ご褒美を　選択すると　次の　ラウンドに　進むから\nまずは　金で買える　消耗品を　買ってください。", + "eggGacha": "この画面では、「タマゴクーポン」で\nポケモンのタマゴを　取得できます。\n$タマゴは　ラウンドが進めるうちに　ふかします。\nタマゴのふかは　レア度によって　時間が　かかります。\n$ふかしたポケモンは　手持ちに　加えられずに\nスターターに　登録されます。\n$ふかしたポケモンは　一般的に\n野生ポケモンよりも　高い個体値が　あります。\n$あるポケモンは　タマゴからしか　手に入りません。\n$各ガチャマシンは　個性的な　ボーナスが　あるから\n好きな方から　引いてみてください！," } From 43879b4751b6f01b0babf4888a377376d60b49ff Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Wed, 25 Sep 2024 07:16:03 -0700 Subject: [PATCH 4/5] [Item] Eviolite no longer spawns for GMax pokemon (#4409) --- src/modifier/modifier-type.ts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 6503aaafbc5..8ba3599e72b 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -1720,7 +1720,8 @@ const modifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.AMULET_COIN, skipInLastClassicWaveOrDefault(3)), new WeightedModifierType(modifierTypes.EVIOLITE, (party: Pokemon[]) => { if (!party[0].scene.gameMode.isFreshStartChallenge() && party[0].scene.gameData.unlocks[Unlockables.EVIOLITE]) { - return party.some(p => ((p.getSpeciesForm(true).speciesId in pokemonEvolutions) || (p.isFusion() && (p.getFusionSpeciesForm(true).speciesId in pokemonEvolutions))) && !p.getHeldItems().some(i => i instanceof Modifiers.EvolutionStatBoosterModifier)) ? 10 : 0; + return party.some(p => ((p.getSpeciesForm(true).speciesId in pokemonEvolutions) || (p.isFusion() && (p.getFusionSpeciesForm(true).speciesId in pokemonEvolutions))) + && !p.getHeldItems().some(i => i instanceof Modifiers.EvolutionStatBoosterModifier) && !p.isMax()) ? 10 : 0; } return 0; }), @@ -1728,19 +1729,24 @@ const modifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.LEEK, (party: Pokemon[]) => { const checkedSpecies = [ Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD ]; // If a party member doesn't already have a Leek and is one of the relevant species, Leek can appear - return party.some(p => !p.getHeldItems().some(i => i instanceof Modifiers.SpeciesCritBoosterModifier) && (checkedSpecies.includes(p.getSpeciesForm(true).speciesId) || (p.isFusion() && checkedSpecies.includes(p.getFusionSpeciesForm(true).speciesId)))) ? 12 : 0; + return party.some(p => !p.getHeldItems().some(i => i instanceof Modifiers.SpeciesCritBoosterModifier) + && (checkedSpecies.includes(p.getSpeciesForm(true).speciesId) + || (p.isFusion() && checkedSpecies.includes(p.getFusionSpeciesForm(true).speciesId)))) ? 12 : 0; }, 12), new WeightedModifierType(modifierTypes.TOXIC_ORB, (party: Pokemon[]) => { const checkedAbilities = [Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.TOXIC_BOOST, Abilities.POISON_HEAL, Abilities.MAGIC_GUARD]; const checkedMoves = [Moves.FACADE, Moves.TRICK, Moves.FLING, Moves.SWITCHEROO, Moves.PSYCHO_SHIFT]; // If a party member doesn't already have one of these two orbs and has one of the above moves or abilities, the orb can appear - return party.some(p => !p.getHeldItems().some(i => i instanceof Modifiers.TurnStatusEffectModifier) && (checkedAbilities.some(a => p.hasAbility(a, false, true)) || p.getMoveset(true).some(m => m && checkedMoves.includes(m.moveId)))) ? 10 : 0; + return party.some(p => !p.getHeldItems().some(i => i instanceof Modifiers.TurnStatusEffectModifier) + && (checkedAbilities.some(a => p.hasAbility(a, false, true)) + || p.getMoveset(true).some(m => m && checkedMoves.includes(m.moveId)))) ? 10 : 0; }, 10), new WeightedModifierType(modifierTypes.FLAME_ORB, (party: Pokemon[]) => { const checkedAbilities = [Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.FLARE_BOOST, Abilities.MAGIC_GUARD]; const checkedMoves = [Moves.FACADE, Moves.TRICK, Moves.FLING, Moves.SWITCHEROO, Moves.PSYCHO_SHIFT]; // If a party member doesn't already have one of these two orbs and has one of the above moves or abilities, the orb can appear - return party.some(p => !p.getHeldItems().some(i => i instanceof Modifiers.TurnStatusEffectModifier) && (checkedAbilities.some(a => p.hasAbility(a, false, true)) || p.getMoveset(true).some(m => m && checkedMoves.includes(m.moveId)))) ? 10 : 0; + return party.some(p => !p.getHeldItems().some(i => i instanceof Modifiers.TurnStatusEffectModifier) + && (checkedAbilities.some(a => p.hasAbility(a, false, true)) || p.getMoveset(true).some(m => m && checkedMoves.includes(m.moveId)))) ? 10 : 0; }, 10), new WeightedModifierType(modifierTypes.WHITE_HERB, (party: Pokemon[]) => { const checkedAbilities = [Abilities.WEAK_ARMOR, Abilities.CONTRARY, Abilities.MOODY, Abilities.ANGER_SHELL, Abilities.COMPETITIVE, Abilities.DEFIANT]; @@ -1795,7 +1801,8 @@ const modifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.SHINY_CHARM, 14), new WeightedModifierType(modifierTypes.HEALING_CHARM, 18), new WeightedModifierType(modifierTypes.MULTI_LENS, 18), - new WeightedModifierType(modifierTypes.VOUCHER_PREMIUM, (party: Pokemon[], rerollCount: integer) => !party[0].scene.gameMode.isDaily && !party[0].scene.gameMode.isEndless && !party[0].scene.gameMode.isSplicedOnly ? Math.max(5 - rerollCount * 2, 0) : 0, 5), + new WeightedModifierType(modifierTypes.VOUCHER_PREMIUM, (party: Pokemon[], rerollCount: integer) => + !party[0].scene.gameMode.isDaily && !party[0].scene.gameMode.isEndless && !party[0].scene.gameMode.isSplicedOnly ? Math.max(5 - rerollCount * 2, 0) : 0, 5), new WeightedModifierType(modifierTypes.DNA_SPLICERS, (party: Pokemon[]) => !party[0].scene.gameMode.isSplicedOnly && party.filter(p => !p.fusionSpecies).length > 1 ? 24 : 0, 24), new WeightedModifierType(modifierTypes.MINI_BLACK_HOLE, (party: Pokemon[]) => (!party[0].scene.gameMode.isFreshStartChallenge() && party[0].scene.gameData.unlocks[Unlockables.MINI_BLACK_HOLE]) ? 1 : 0, 1), ].map(m => { From 03bedac28359b870982fe210156707f368fd89b1 Mon Sep 17 00:00:00 2001 From: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:20:33 +0200 Subject: [PATCH 5/5] [P3 Bug] Fix form name not always showing in starter select (#4406) Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/ui/starter-select-ui-handler.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 5ef26d1ba88..03defdbdb5c 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -260,6 +260,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { private pokemonCandyCountText: Phaser.GameObjects.Text; private pokemonCaughtHatchedContainer: Phaser.GameObjects.Container; private pokemonCaughtCountText: Phaser.GameObjects.Text; + private pokemonFormText: Phaser.GameObjects.Text; private pokemonHatchedIcon : Phaser.GameObjects.Sprite; private pokemonHatchedCountText: Phaser.GameObjects.Text; private pokemonShinyIcon: Phaser.GameObjects.Sprite; @@ -287,7 +288,6 @@ export default class StarterSelectUiHandler extends MessageUiHandler { private starterSelectMessageBox: Phaser.GameObjects.NineSlice; private starterSelectMessageBoxContainer: Phaser.GameObjects.Container; private statsContainer: StatsContainer; - private pokemonFormText: Phaser.GameObjects.Text; private moveInfoOverlay : MoveInfoOverlay; private statsMode: boolean; @@ -2288,6 +2288,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.filterInstructionRowX += 50; } } + updateInstructions(): void { this.instructionRowX = 0; this.instructionRowY = 0; @@ -2826,6 +2827,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonShinyIcon.setTint(tint); this.pokemonShinyIcon.setVisible(defaultProps.shiny); this.pokemonCaughtHatchedContainer.setVisible(true); + this.pokemonFormText.setVisible(true); + if (pokemonPrevolutions.hasOwnProperty(species.speciesId)) { this.pokemonCaughtHatchedContainer.setY(16); this.pokemonShinyIcon.setY(135); @@ -2849,7 +2852,6 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonCandyDarknessOverlay.setVisible(true); this.pokemonCandyCountText.setText(`x${this.scene.gameData.starterData[species.speciesId].candyCount}`); this.pokemonCandyCountText.setVisible(true); - this.pokemonFormText.setVisible(true); this.pokemonFormText.setY(42); this.pokemonHatchedIcon.setVisible(true); this.pokemonHatchedCountText.setVisible(true);